diff options
Diffstat (limited to 'app-text')
740 files changed, 15594 insertions, 9152 deletions
diff --git a/app-text/NaturalDocs/Manifest b/app-text/NaturalDocs/Manifest new file mode 100644 index 000000000000..15d3dd0bf7d3 --- /dev/null +++ b/app-text/NaturalDocs/Manifest @@ -0,0 +1 @@ +DIST NaturalDocs-1.52.zip 460793 BLAKE2B d4ecd8bb8dd3fa92a8d9366077c65ddd70e9c4944519cb453e0752e2df0ed22d7fe23aa1edb1e63ffea16b0d0f56794d50a6a0520b2b91f0193a83326ac34c5b SHA512 45d79dd2bf55a8cb7356eb5321a8c99cbab9d69a4d9a97033737090df2bfd86ee7a058a03016646c7fd6f20daf6523b2d77cd2248a7503a6c5c22684f08431c1 diff --git a/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild b/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild new file mode 100644 index 000000000000..0ea22a3cf64f --- /dev/null +++ b/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +DESCRIPTION="Extensible, multi-language source code documentation generator" +HOMEPAGE="http://www.naturaldocs.org/" +SRC_URI="https://downloads.sourceforge.net/naturaldocs/${P}.zip" +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" + +BDEPEND="app-arch/unzip" + +src_install() { + insinto /usr/share/${PN} + doins -r Styles Info JavaScript + + insinto /etc/${PN} + doins -r Config/. + dosym ../../../etc/${PN} /usr/share/${PN}/Config + + perl_set_version + insinto ${VENDOR_LIB} + doins -r Modules/NaturalDocs + dodir /usr/share/${PN}/Modules + dosym ../../../..${VENDOR_LIB}/NaturalDocs /usr/share/${PN}/Modules/NaturalDocs + + exeinto /usr/share/${PN} + doexe ${PN} + + # Symlink the Perl script into /usr/bin + dodir /usr/bin + dosym ../share/${PN}/${PN} /usr/bin/${PN} + + # Documentation + dodoc -r Help/. + dosym ../doc/${PF}/html /usr/share/${PN}/Help +} + +pkg_preinst() { + if [[ -e /usr/share/${PN}/Config && ! -L /usr/share/${PN}/Config ]] ; then + mkdir -p /etc/${PN} + mv /usr/share/${PN}/Config/* /etc/${PN}/ + rm -rf /usr/share/${PN}/Config + fi +} diff --git a/app-text/NaturalDocs/metadata.xml b/app-text/NaturalDocs/metadata.xml new file mode 100644 index 000000000000..54582d69c8da --- /dev/null +++ b/app-text/NaturalDocs/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <longdescription> + Natural Docs is an open-source, extensible, multi-language + documentation generator. It extracts specially formatted comments + from source code and builds HTML documentation from it. The syntax + is transparent so that the comments in the source code read just as + easily as the generated documentation. It also focuses on automation + and high-quality generated output. + </longdescription> + <maintainer type="person"> + <email>titanofold@gentoo.org</email> + <name>Aaron W. Swenson</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">naturaldocs</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest index 7957e86901f0..1038254cb39a 100644 --- a/app-text/a2ps/Manifest +++ b/app-text/a2ps/Manifest @@ -1,3 +1,2 @@ -DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f -DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f -DIST a2ps-4.15.2.tar.gz 3600923 BLAKE2B 37d6dd76578301a629a4171e194cc34836b393ef293193191b2a4e3c5635c154b0d380f921e3862cad64e468108105a669c89e76ec8baa915587f8fff8af8aa9 SHA512 637bda87c7e8d59d923428398d0d67066c700e7e37d91cf3408bfe38f3367afdc651a8248984512fbe71e0d1cb07cb4a348816650748e1fbde52625e8e055a70 +DIST a2ps-4.15.5.tar.gz 3571724 BLAKE2B 7c352b72c537f8519cafb7993595d902e1dfeae49207936c365b0ea3813ffff973c5f5e2bb63a4cffa3c665990d95c8a8e339c87d9eac25fa24e364b8b705bae SHA512 e9953659139a46aed46e190d5485382a9e396ae8bbbe59edb78ab3110e7839a764e3cb6ff94f5f36e6e91fcaf85f6352376e0b4a0e0141f24e098fa334b5015e +DIST a2ps-4.15.6.tar.gz 3605392 BLAKE2B 64f79e26ef116836508c94f0e846f2d242fbb551e9324f339dcc2f8c8cedfad0a708bf10a74cb8e45dad14e1390f4adfb8763618b24794b9cdf77202ebfee33f SHA512 23d054a2e58c28460c5e23a1cf3f0f9c27faffc9a99781c42c11cc0693eea5bb8cfe090a97b9bae3d80cfae6b4d5b9a30dfd997a2d70be2d25988c714ad14b44 diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild deleted file mode 100644 index 58a895dd30a3..000000000000 --- a/app-text/a2ps/a2ps-4.14-r8.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools elisp-common flag-o-matic - -DESCRIPTION="Any to PostScript filter" -HOMEPAGE="https://www.gnu.org/software/a2ps/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )" -S="${WORKDIR}/${PN}-${PV:0:4}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cjk emacs latex nls static-libs vanilla" - -RESTRICT="test" - -RDEPEND="app-text/ghostscript-gpl - app-text/libpaper:= - >=app-text/psutils-1.17 - app-text/wdiff - >=sys-apps/coreutils-6.10-r1 - emacs? ( >=app-editors/emacs-23.1:* ) - latex? ( virtual/latex-base ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/gperf-2.7.2 - app-alternatives/yacc - nls? ( sys-devel/gettext )" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff - "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch - "${FILESDIR}"/${P}-psset.patch - "${FILESDIR}"/${PN}-4.13c-emacs.patch - "${FILESDIR}"/${PN}-4.13-manpage-chmod.patch - "${FILESDIR}"/${P}-check-mempcpy.patch - "${FILESDIR}"/${P}-fix-stpcpy-proto.patch - "${FILESDIR}"/${P}-ptrdiff_t.patch - "${FILESDIR}"/${P}-texinfo-5.x.patch - "${FILESDIR}"/${P}-CVE-2014-0466.patch - "${FILESDIR}"/${P}-CVE-2001-1593.patch - "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch - "${FILESDIR}"/${P}-function-decl.patch - "${FILESDIR}"/${P}-configure.ac.patch -) - -src_prepare() { - default - - use vanilla || eapply "${FILESDIR}"/${P}-stdout.patch - if use cjk; then - eapply "${WORKDIR}"/${P}-ja_nls.patch - # bug #335803 - eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch - else - eapply "${FILESDIR}"/${P}-cleanup.patch - fi - - # fix building with sys-devel/automake >= 1.12, bug 420503 - rm -f {.,ogonkify}/aclocal.m4 || die - sed -i \ - -e '/^AM_C_PROTOTYPES/d' \ - -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ - -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ - configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die - - eautoreconf -} - -src_configure() { - append-cppflags -DPROTOTYPES #420503 - - export LANG=C LC_ALL=C - - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --sysconfdir="${EPREFIX}"/etc/a2ps \ - $(use_enable nls) \ - COM_netscape=no \ - COM_acroread=no \ - $(usev !latex COM_latex=no) \ - $(usev !emacs EMACS=no) -} - -src_compile() { - # parallel make b0rked - emake -j1 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - lispdir="${EPREFIX}${SITELISP}"/${PN} \ - install - - newdoc "${ED}"/usr/share/a2ps/README README.a2ps - newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd - newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify - - rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die - - find "${ED}" -name '*.la' -delete || die - - use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} - - dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/app-text/a2ps/a2ps-4.15.5-r1.ebuild b/app-text/a2ps/a2ps-4.15.5-r1.ebuild new file mode 100644 index 000000000000..4284c506a705 --- /dev/null +++ b/app-text/a2ps/a2ps-4.15.5-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common + +DESCRIPTION="Any to PostScript filter" +HOMEPAGE="https://www.gnu.org/software/a2ps/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cjk emacs latex nls static-libs vanilla" + +# a2ps-lpr-wrapper needs bash +RDEPEND=" + app-text/ghostscript-gpl + app-text/libpaper:= + >=app-text/psutils-1.17 + app-text/wdiff + app-shells/bash:* + dev-libs/boehm-gc + >=sys-apps/coreutils-6.10-r1 + emacs? ( >=app-editors/emacs-23.1:* ) + latex? ( virtual/latex-base ) + nls? ( virtual/libintl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + >=dev-util/gperf-2.7.2 + nls? ( sys-devel/gettext ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + "${FILESDIR}"/${PN}-4.15-lpr-wrapper.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + MIN alignof static_assert +) + +src_prepare() { + default + + use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch + + eautoreconf +} + +src_configure() { + export LANG=C LC_ALL=C + + econf \ + --cache-file="${S}"/config.cache \ + --enable-shared \ + $(use_enable static-libs static) \ + --sysconfdir="${EPREFIX}"/etc/a2ps \ + $(use_enable nls) \ + COM_netscape=no \ + COM_acroread=no \ + $(usev !latex COM_latex=no) \ + $(usev !emacs EMACS=no) +} + +src_install() { + emake \ + DESTDIR="${D}" \ + lispdir="${EPREFIX}${SITELISP}"/${PN} \ + install + + newdoc "${ED}"/usr/share/a2ps/README README.a2ps + newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd + newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify + + rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die + + find "${ED}" -name '*.la' -delete || die + + use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} + + dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/app-text/a2ps/a2ps-4.15.2.ebuild b/app-text/a2ps/a2ps-4.15.6.ebuild index db63721729f2..f9ae315b9f23 100644 --- a/app-text/a2ps/a2ps-4.15.2.ebuild +++ b/app-text/a2ps/a2ps-4.15.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,11 @@ BDEPEND=" SITEFILE="50${PN}-gentoo.el" +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + MIN alignof static_assert +) + src_prepare() { default @@ -48,6 +53,7 @@ src_configure() { export LANG=C LC_ALL=C econf \ + --cache-file="${S}"/config.cache \ --enable-shared \ $(use_enable static-libs static) \ --sysconfdir="${EPREFIX}"/etc/a2ps \ @@ -64,6 +70,8 @@ src_install() { lispdir="${EPREFIX}${SITELISP}"/${PN} \ install + einstalldocs + newdoc "${ED}"/usr/share/a2ps/README README.a2ps newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify @@ -73,8 +81,6 @@ src_install() { find "${ED}" -name '*.la' -delete || die use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} - - dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO } pkg_postinst() { diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch deleted file mode 100644 index 8e8454a3ea48..000000000000 --- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix chmod error -https://bugs.gentoo.org/167670 - ---- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200 -+++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200 -@@ -20,7 +20,7 @@ - --include=$(basename $@).x \ - --include=common.x \ - $(executable) > $@-t || exit 1; \ -- chmod -w $@-t || exit 1; \ -+ chmod a-w $@-t || exit 1; \ - rm -f $@ || exit 1; \ - mv $@-t $@ || exit 1; \ - else \ diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch deleted file mode 100644 index 97099a7393d9..000000000000 --- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch +++ /dev/null @@ -1,13 +0,0 @@ -fix emacs printing -https://bugs.gentoo.org/114627 - ---- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100 -+++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100 -@@ -93,6 +93,7 @@ - (concat "--center-title=" name) - (concat "--footer=" (concat name " Emacs buffer")) - (concat "--pretty-print=" filetype) -+ (concat "-d") - ;Uncommenting the following gives a print preview (only): - ; (concat "--output=/tmp/foo.ps") - ) diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch deleted file mode 100644 index 92098541b694..000000000000 --- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch +++ /dev/null @@ -1,45 +0,0 @@ -fix fnmatch replacement -https://bugs.gentoo.org/134546 - ---- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600 -+++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500 -@@ -27,18 +27,6 @@ - #include <fnmatch.h> - #include <ctype.h> - -- --/* Comment out all this code if we are using the GNU C Library, and are not -- actually compiling the library itself. This code is part of the GNU C -- Library, but also included in many other GNU distributions. Compiling -- and linking in this code is a waste when using the GNU C library -- (especially if it is a shared library). Rather than having every GNU -- program understand `configure --with-gnu-libc' and omit the object files, -- it is simpler to just do this in the source for each such file. */ -- --#if defined _LIBC || !defined __GNU_LIBRARY__ -- -- - # if defined STDC_HEADERS || !defined isascii - # define ISASCII(c) 1 - # else -@@ -52,10 +40,13 @@ - extern int errno; - # endif - -+/* fnmatch replacement taken from the GNU C Library for systems that -+ provide a broken implementation. */ -+ - /* Match STRING against the filename pattern PATTERN, returning zero if - it matches, nonzero if not. */ - int --fnmatch (const char *pattern, const char *string, int flags) -+rpl_fnmatch (const char *pattern, const char *string, int flags) - { - register const char *p = pattern, *n = string; - register char c; -@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char - - # undef FOLD - } -- --#endif /* _LIBC or not __GNU_LIBRARY__. */ diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff deleted file mode 100644 index 0b59956ebc05..000000000000 --- a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in ---- a2ps-4.13.ORIG/config.h.in 2003-09-27 19:33:38.000000000 +0900 -+++ a2ps-4.13/config.h.in 2003-09-27 21:25:46.000000000 +0900 -@@ -181,6 +181,9 @@ - /* Define to 1 if you have the `rename' function. */ - #undef HAVE_RENAME - -+/* Define to 1 if you have the <locale.h> header file. */ -+#undef HAVE_LOCALE_H -+ - /* Define to 1 if you have the `setlocale' function. */ - #undef HAVE_SETLOCALE - -diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in ---- a2ps-4.13.ORIG/configure.in 2003-09-27 19:33:38.000000000 +0900 -+++ a2ps-4.13/configure.in 2003-09-27 21:26:05.000000000 +0900 -@@ -71,7 +71,7 @@ - AC_HEADER_DIRENT - AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h \ - math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \ -- memory.h errno.h fcntl.h stdbool.h fnmatch.h) -+ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h) - - ## --------------------- ## - ## Checks for typedefs. ## diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch deleted file mode 100644 index 06153f4858c4..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch +++ /dev/null @@ -1,82 +0,0 @@ -CVE-2001-1593: Fix insecure use of /tmp - - -Author(s): - - * Fri Jan 05 2001 Preston Brown <pbrown@redhat.com> - -followed the next month by a fix to that patch: - - * Mon Feb 12 2001 Tim Waugh <twaugh@redhat.com> - -(see https://bugzilla.redhat.com/show_bug.cgi?id=1060630#c5) - -Origin: - -http://pkgs.fedoraproject.org/cgit/a2ps.git/plain/a2ps-4.13-security.patch - ---- a/lib/routines.c -+++ b/lib/routines.c -@@ -242,3 +242,50 @@ - /* Don't complain if you can't unlink. Who cares of a tmp file? */ - unlink (filename); - } -+ -+/* -+ * Securely generate a temp file, and make sure it gets -+ * deleted upon exit. -+ */ -+static char ** tempfiles; -+static unsigned ntempfiles; -+ -+static void -+cleanup_tempfiles() -+{ -+ while (ntempfiles--) -+ unlink(tempfiles[ntempfiles]); -+} -+ -+char * -+safe_tempnam(const char *pfx) -+{ -+ char *dirname, *filename; -+ int fd; -+ -+ if (!(dirname = getenv("TMPDIR"))) -+ dirname = "/tmp"; -+ -+ tempfiles = (char **) realloc(tempfiles, -+ (ntempfiles+1) * sizeof(char *)); -+ if (tempfiles == NULL) -+ return NULL; -+ -+ filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX")); -+ if (!filename) -+ return NULL; -+ -+ sprintf(filename, "%s/%sXXXXXX", dirname, pfx); -+ -+ if ((fd = mkstemp(filename)) < 0) { -+ free(filename); -+ return NULL; -+ } -+ close(fd); -+ -+ if (ntempfiles == 0) -+ atexit(cleanup_tempfiles); -+ tempfiles[ntempfiles++] = filename; -+ -+ return filename; -+} ---- a/lib/routines.h -+++ b/lib/routines.h -@@ -255,7 +255,8 @@ - /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */ - #define tempname_ensure(Str) \ - do { \ -- (Str) = (Str) ? (Str) : tempnam (NULL, "a2_"); \ -+ (Str) = (Str) ? (Str) : safe_tempnam("a2_"); \ - } while (0) -+char * safe_tempnam(const char *); - - #endif diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch deleted file mode 100644 index 56f0b2f527a2..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch +++ /dev/null @@ -1,32 +0,0 @@ -CVE-2014-0466: fixps does not invoke gs with -dSAFER - -A malicious PostScript file could delete files with the privileges of -the invoking user. - -Author: Salvatore Bonaccorso <carnil@debian.org> -Origin: https://bugs.debian.org/742902 - -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.in a2ps/contrib/fixps.in ---- a2ps~/contrib/fixps.in 2014-03-30 12:24:50.000000000 +0200 -+++ a2ps/contrib/fixps.in 2014-03-30 12:40:36.763249218 +0200 -@@ -389,7 +389,7 @@ - eval "$command" ;; - gs) - $verbose "$program: making a full rewrite of the file ($gs)." >&2 -- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; -+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; - esac - ) - fi -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.m4 a2ps/contrib/fixps.m4 ---- a2ps~/contrib/fixps.m4 2014-03-30 12:24:50.000000000 +0200 -+++ a2ps/contrib/fixps.m4 2014-03-30 12:40:36.767249254 +0200 -@@ -307,7 +307,7 @@ - eval "$command" ;; - gs) - $verbose "$program: making a full rewrite of the file ($gs)." >&2 -- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; -+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;; - esac - ) - fi diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch deleted file mode 100644 index 62a8ab21961f..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch +++ /dev/null @@ -1,15 +0,0 @@ -add configure check for mempcpy -https://bugs.gentoo.org/216588 - ---- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200 -+++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200 -@@ -137,7 +137,8 @@ - ad_REPLACE_FUNC_STRCASECMP - ad_REPLACE_FUNC_STRNCASECMP - ad_REPLACE_FUNC_RENAME --AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale) -+AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \ -+ tempnam strsignal psignal setlocale mempcpy) - ad_FUNC_SYSTEMPAPERNAME - ad_FUNC_ATEXIT - ad_FUNC_STRFTIME diff --git a/app-text/a2ps/files/a2ps-4.14-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-cleanup.patch deleted file mode 100644 index 25187f315384..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-cleanup.patch +++ /dev/null @@ -1,106 +0,0 @@ -fix missing prototype and printf warnings - ---- a/lib/argmatch.c -+++ b/lib/argmatch.c -@@ -21,6 +21,7 @@ - #include "argmatch.h" - - #include <stdio.h> -+#include <stdlib.h> - #ifdef STDC_HEADERS - # include <string.h> - #endif ---- a/lib/encoding.c -+++ b/lib/encoding.c -@@ -790,7 +790,7 @@ dump_encoding_setup (FILE * stream, - /* Create the dictionary and fill it */ - fprintf (stream, "%% Dictionary for %s support\n", - encoding->name); -- fprintf (stream, "/%sdict %d dict begin\n", encoding->key, nb); -+ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, nb); - for (i = 0 ; i < nb ; i++) - fprintf (stream, " /f%s %sEncoding /%s reencode_font\n", - font_names [i], ---- a/lib/output.c -+++ b/lib/output.c -@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type) - static void - derivation_self_print (struct derivation * derivation, FILE * stream) - { -- fprintf (stream, "At %x: ", (int) derivation); -+ fprintf (stream, "At %p: ", derivation); - switch (derivation->type) - { - case nothing: -@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job, - expand_user_string (job, FIRST_FILE (job), - (const uchar *) "Expand: requirement", - (const uchar *) token)); -- output (dest, expansion); -+ output (dest, "%s", expansion); - continue; - } - ---- a/lib/parseppd.y -+++ b/lib/parseppd.y -@@ -154,7 +154,7 @@ font_clause : - void - yyerror (const char *msg) - { -- error_at_line (1, 0, ppdfilename, ppdlineno, msg); -+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); - } - - /* ---- a/lib/psgen.c -+++ b/lib/psgen.c -@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker) - default: - *buf = '\0'; - ps_escape_char (job, cp[i], buf); -- output (jdiv, (char *) buf); -+ output (jdiv, "%s", buf); - break; - } - } ---- a/lib/quotearg.c -+++ b/lib/quotearg.c -@@ -60,6 +60,7 @@ - - #if HAVE_MBRTOWC && HAVE_WCHAR_H - # include <wchar.h> -+# include <wctype.h> - #else - # define iswprint(wc) 1 - # define mbrtowc(pwc, s, n, ps) 1 ---- a/lib/title.c -+++ b/lib/title.c -@@ -28,6 +28,7 @@ - #endif - - #include <stdio.h> -+#include <string.h> - - #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC - # if __STDC__ ---- a/src/long-options.c -+++ b/src/long-options.c -@@ -22,6 +22,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #include <getopt.h> - #include "closeout.h" - #include "long-options.h" ---- a/src/parsessh.y -+++ b/src/parsessh.y -@@ -740,7 +740,7 @@ exception_def_opt: - void - yyerror (const char *msg) - { -- error_at_line (1, 0, sshfilename, sshlineno, msg); -+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); - } - - /* diff --git a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch deleted file mode 100644 index 58cbe4bca478..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a2ps-4.14/man/Makefile.maint -+++ a2ps-4.14/man/Makefile.maint -@@ -4,7 +4,7 @@ - HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN) - - # Depend on configure.in to get version number changes. --$(man_MANS): $(top_srcdir)/configure.in common.x -+$(man_MANS): $(top_srcdir)/configure.ac common.x - - # Depend on the source file containing the --help text. - # Filter out irregular cases. diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch deleted file mode 100644 index ed72bbad0715..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix compilation error due to invalid stpcpy() prototype -https://bugs.gentoo.org/216588 - ---- a2ps-4.14/lib/xstrrpl.c -+++ a2ps-4.14/lib/xstrrpl.c -@@ -22,8 +22,6 @@ - #include <assert.h> - #include "xstrrpl.h" - --extern char * stpcpy(); -- - /* Perform subsitutions in string. Result is malloc'd - E.g., result = xstrrrpl ("1234", subst) gives result = "112333" - where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}} diff --git a/app-text/a2ps/files/a2ps-4.14-function-decl.patch b/app-text/a2ps/files/a2ps-4.14-function-decl.patch deleted file mode 100644 index 1b330723e95b..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-function-decl.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/870763 - ---- a2ps-4.14/lib/path-concat.c -+++ a2ps-4.14/lib/path-concat.c -@@ -26,6 +26,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #if HAVE_STRING_H - # include <string.h> - #endif diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch deleted file mode 100644 index 16271b3ec674..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git lib/argmatch.c lib/argmatch.c -index f983e9d..eadc7ea 100644 ---- lib/argmatch.c -+++ lib/argmatch.c -@@ -21,6 +21,7 @@ - #include "argmatch.h" - - #include <stdio.h> -+#include <stdlib.h> - #ifdef STDC_HEADERS - # include <string.h> - #endif -diff --git lib/encoding.c lib/encoding.c -index 9bd9f2a..f554a6d 100644 ---- lib/encoding.c -+++ lib/encoding.c -@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream, - /* Create the dictionary and fill it */ - fprintf (stream, "%% Dictionary for %s support\n", - encoding->name); -- fprintf (stream, "/%sdict %d dict begin\n", encoding->key, -+ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, - (encoding->composite_flag == true)? nb+nb+ns:nb+ns); - for (i = 0 ; i < nb ; i++) - fprintf (stream, " /f%s %sEncoding /%s reencode_font\n", -diff --git lib/output.c lib/output.c -index b5fc37d..5f67676 100644 ---- lib/output.c -+++ lib/output.c -@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type) - static void - derivation_self_print (struct derivation * derivation, FILE * stream) - { -- fprintf (stream, "At %x: ", (int) derivation); -+ fprintf (stream, "At %p: ", derivation); - switch (derivation->type) - { - case nothing: -@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job, - expand_user_string (job, FIRST_FILE (job), - (const uchar *) "Expand: requirement", - (const uchar *) token)); -- output (dest, expansion); -+ output (dest, "%s", expansion); - continue; - } - -diff --git lib/parseppd.y lib/parseppd.y -index a7558ba..c89d188 100644 ---- lib/parseppd.y -+++ lib/parseppd.y -@@ -154,7 +154,7 @@ font_clause : - void - yyerror (const char *msg) - { -- error_at_line (1, 0, ppdfilename, ppdlineno, msg); -+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg); - } - - /* -diff --git lib/psgen.c lib/psgen.c -index 9eeef74..9d7a27d 100644 ---- lib/psgen.c -+++ lib/psgen.c -@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker) - default: - *buf = '\0'; - ps_escape_char (job, cp[i], buf); -- output (jdiv, (char *) buf); -+ output (jdiv, "%s", buf); - break; - } - } -diff --git lib/quotearg.c lib/quotearg.c -index 16d0b91..89db991 100644 ---- lib/quotearg.c -+++ lib/quotearg.c -@@ -60,6 +60,7 @@ - - #if HAVE_MBRTOWC && HAVE_WCHAR_H - # include <wchar.h> -+# include <wctype.h> - #else - # define iswprint(wc) 1 - # define mbrtowc(pwc, s, n, ps) 1 -diff --git lib/title.c lib/title.c -index cf4a34b..7a3e87b 100644 ---- lib/title.c -+++ lib/title.c -@@ -28,6 +28,7 @@ - #endif - - #include <stdio.h> -+#include <string.h> - - #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC - # if __STDC__ -diff --git src/long-options.c src/long-options.c -index fb40cd9..7bd77b0 100644 ---- src/long-options.c -+++ src/long-options.c -@@ -22,6 +22,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #include <getopt.h> - #include "closeout.h" - #include "long-options.h" -diff --git src/parsessh.y src/parsessh.y -index 21e9559..569fdb6 100644 ---- src/parsessh.y -+++ src/parsessh.y -@@ -740,7 +740,7 @@ exception_def_opt: - void - yyerror (const char *msg) - { -- error_at_line (1, 0, sshfilename, sshlineno, msg); -+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg); - } - - /* diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch deleted file mode 100644 index e0793bc9eb1f..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-psset.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/122026 - ---- a2ps-4.14.orig/contrib/psset.in 2007-12-29 12:29:01.000000000 +0900 -+++ a2ps-4.14/contrib/psset.in 2009-04-12 12:17:43.000000000 +0900 -@@ -219,7 +219,7 @@ - done - - pspagedevice="% Pagedevice definitions: --countdictstack -+ countdictstack - % Push our own mark, since there can be several PS marks pushed depending - % where the failure really occured. - /psset_mark -@@ -227,7 +227,7 @@ - } stopped - % My cleartomark - { /psset_mark eq { exit } if } loop --countdictstack exch sub dup 0 gt -+ countdictstack exch sub dup 0 gt - { - { end } repeat - }{ diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch deleted file mode 100644 index 7ff45cf3bc4a..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch +++ /dev/null @@ -1,16 +0,0 @@ -fix compilation error due to obstack.h issue -https://bugs.gentoo.org/269638 - ---- a2ps-4.14/lib/obstack.h 2007-12-29 09:37:59.000000000 +0800 -+++ a2ps-4.14.test/lib/obstack.h 2009-06-10 18:49:45.000000000 +0900 -@@ -138,9 +138,9 @@ - #define __need_ptrdiff_t - #endif - #endif -+#endif - - #include <stddef.h> --#endif - - #if defined (__STDC__) && __STDC__ - #define PTR_INT_TYPE ptrdiff_t diff --git a/app-text/a2ps/files/a2ps-4.14-stdout.patch b/app-text/a2ps/files/a2ps-4.14-stdout.patch deleted file mode 100644 index 5ca7649ad3e7..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-stdout.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/47691 -https://bugs.gentoo.org/47764 -https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html ---- a2ps-4.14/lib/printers.c -+++ a2ps-4.14/lib/printers.c -@@ -315,8 +315,8 @@ - res->ppd = NULL; /* Printer's ppd are not read yet */ - - /* Output */ -- /* Default is to send to default printer */ -- res->flag_output_is_printer = true; -+ /* Default is to send to stdout */ -+ res->flag_output_is_printer = false; - res->flag_output_name = NULL; - res->output_is_file = true; - res->output_name = NULL; diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch deleted file mode 100644 index baf53cfcc122..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch +++ /dev/null @@ -1,150 +0,0 @@ -fix compilation error due to texinfo 5.x -https://bugs.gentoo.org/482748 - ---- a2ps-4.14/doc/a2ps.texi.bero 2013-03-26 10:31:31.230137555 +0100 -+++ a2ps-4.14/doc/a2ps.texi 2013-03-26 11:01:01.504006086 +0100 -@@ -44,10 +44,6 @@ - @end ifnottex - - @c TeX variants --@macro LaTeX --La@TeX{} --@end macro -- - @macro PreTeX - Pre@TeX{} - @end macro -@@ -417,9 +413,9 @@ Genesis - @c Now, that's what I call humor :) - @cindex First Page - This document describes GNU @pack{} version @value{VERSION}. The latest --versions may be found on the @href{@value{WWWHOME},@pack{} home page}. --We plan to update the @href{http://www.gnu.org/software/a2ps/, GNU --@pack{} home page} in the near future, in which case the latter will be -+versions may be found on the @uref{@value{WWWHOME}, home page}. -+We plan to update the @uref{@value{WWWHOME}, GNU home page} -+in the near future, in which case the latter will be - a better source of information. - - We tried to make this document informative and pleasant. It tries to be -@@ -431,8 +427,8 @@ difficult to use. @xref{Glossary}, for - information. - - Please, send us emailcards @code{:)}. Whatever the comment is, or if you --just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel --Santana} and @email{akim@@freefriends.org, Akim Demaille}. But -+just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel Santana} -+and @email{akim@@freefriends.org, Akim Demaille}. But - @emph{never} write to either of us for asking questions, or to report - bugs. Chances are very high never to receive an answer, as we receive - too many messages. @xref{a2ps Mailing Lists}, for information on the -@@ -517,8 +513,8 @@ everybody so that mistakes get fixed as - - So, if you have a problem (configuration error, compilation error, - runtime error, documentation error or unclear), first check in the FAQ --(@pxref{FAQ}), then on the page @href{@value{WWWHOME}/bugs.html,Known --@pack{} Bugs} if the issue has not been addressed yet. If it is not the -+(@pxref{FAQ}), then on the page @uref{@value{WWWHOME}/bugs.html,Known Bugs} -+if the issue has not been addressed yet. If it is not the - case, but it appears that the version of @pack{} you have is old, - consider upgrading. - -@@ -2802,8 +2798,7 @@ Thou shalt start your PostScript DSC con - - The bad news is that some printers will reject this header. Then you - may change this header without any worry since the PostScript produced --by @pack{} is also 100% PostScript level 1@footnote{That is to say, there --are no PostScript printers that don't understand these files.}. -+by @pack{} is also 100% PostScript level 1@footnote{That is to say, there are no PostScript printers that don't understand these files.}. - - @defvr {Configuration Setting} OutputFirstLine: @var{magic-number} - @cindex @samp{OutputFirstLine:} -@@ -3971,13 +3966,13 @@ Quote @var{text} so that no special sequ - @itemx \end@{enumerate@} - @itemx \begin@{description@} - @itemx \end@{description@} --These commands are legal in @LaTeX but have no sense in @PreTeX{}. -+These commands are legal in @LaTeX{} but have no sense in @PreTeX{}. - Hence there are simply ignored and not printed (if immediately followed - by an end-of-line). - @end table - - @node Differences with LaTeX --@subsubsection Differences with @LaTeX -+@subsubsection Differences with @LaTeX{} - The following symbols, inherited from the style sheet @code{Symbol}, are - not supported by @LaTeX{}: - -@@ -4124,9 +4119,9 @@ beautiful, with any character you might - prefix part of the file name, and is alpha-numerical, lower case, and - less than 8 characters long. - --Anywhere @pack{} needs to recognize a style sheet by a name, @strong{it --uses the key} (in the @file{sheets.map} file, with the option @samp{-E}, --etc.). -+Anywhere @pack{} needs to recognize a style sheet by a name, -+@strong{it uses the key} (in the @file{sheets.map} file, with the -+option @samp{-E}, etc.). - - As an example, C++ is implemented in a file called @file{cxx.ssh}, in - which the name is declared to be @samp{C++}. -@@ -5672,7 +5667,7 @@ supporting a @samp{--help}-like option. - @subsection Invoking @code{card} - - @example --card [@var{options}] @var{applications} [-- @var{@pack{}-options}] -+card [@var{options}] @var{applications} [-- @var{-options}] - @end example - - @noindent -@@ -5680,7 +5675,7 @@ card [@var{options}] @var{applications} - @var{applications}' help message (typically by the options @samp{--help} - or @samp{-h}), and pretty prints it thanks to @pack{} (or the content of - the environment variable @samp{A2PS} if it is set). --@var{@pack{}-options} are passed to @pack{}. -+@var{-options} are passed to @pack{}. - - Supported options are: - -@@ -5874,12 +5869,12 @@ difference finder,wdiff,GNU wdiff}) to e - @subsection Invoking @code{pdiff} - - @example --pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{@pack{}-options}] -+pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{-options}] - @end example - - @noindent - make a pretty comparison between @var{file-1} and @var{file-2}. --@var{@pack{}-options} are passed to @pack{}. -+@var{-options} are passed to @pack{}. - - Supported options are: - -@@ -6222,7 +6217,7 @@ Error related questions. - @subsection Why Does it Print Nothing? - - @quotation --@i{@pack{} works OK, but the printer prints nothing.} -+@i{works OK, but the printer prints nothing.} - @end quotation - - There are two ways that printing can fail: silently, or with a -@@ -6351,7 +6346,7 @@ If it is incorrect, ask for help around - @subsection Why Does it Say my File is Binary? - - @quotation --@i{@pack{} complains that my file is binary though it is not.} -+@i{complains that my file is binary though it is not.} - @end quotation - - There are several reasons that can cause @pack{} to consider a file is -@@ -6591,7 +6586,7 @@ format you want for the date: @xref{Esca - @subsection Why Have the Options Changed? - - @quotation --@i{The options of this @pack{} are not the same as in the previous versions.} -+@i{The options of this are not the same as in the previous versions.} - @end quotation - - True. But the old scheme (up to version 4.6.1) prevented us from diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch deleted file mode 100644 index df2a60f395c5..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/695918 - -The patchs fixes build failure against texinfo-6.7+: -``` -Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb; -need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364. -Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364. -make[2]: *** [Makefile:472: a2ps.info] Error 25 -``` - -Fixed-by: Neil Bothwick ---- a/doc/a2ps.texi~ 2019-11-24 18:51:07.000000000 +0000 -+++ a/doc/a2ps.texi 2019-11-24 18:56:30.390438433 +0000 -@@ -1,5 +1,6 @@ - \input texinfo @c -*- texinfo -*- - @c %**start of header -+@documentencoding ISO-8859-1 - @setfilename a2ps.info - @settitle General Purpose PostScript Generating Utility - @c @setchapternewpage odd - ---- a/doc/regex.texi~ 2002-03-04 18:46:24.000000000 +0000 -+++ a/doc/regex.texi 2019-11-24 18:56:42.861052598 +0000 -@@ -1,5 +1,6 @@ - \input texinfo - @c %**start of header -+@documentencoding ISO-8859-1 - @setfilename regex.info - @settitle Regex - @c %**end of header - ---- a/ogonkify/doc/ogonkify.texi~ 2007-12-29 02:09:38.000000000 +0000 -+++ a/ogonkify/doc/ogonkify.texi 2019-11-24 18:57:03.173424149 +0000 -@@ -1,5 +1,6 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header -+@documentencoding ISO-8859-1 - @setfilename ogonkify.info - @settitle Ogonkify - @setchapternewpage off diff --git a/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch new file mode 100644 index 000000000000..d7b231c0b929 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch @@ -0,0 +1,23 @@ +# a2ps-lpr-wrapper exits on bogus parameter-count test +# https://bugs.gentoo.org/913751 +# https://savannah.gnu.org/bugs/?64047 +--- a/src/a2ps-lpr-wrapper ++++ b/src/a2ps-lpr-wrapper +@@ -5,7 +5,7 @@ + set -e + + usage() { +- echo "Usage: $(basename "$0") [-d printer] FILE..." >&2 ++ echo "Usage: $(basename "$0") [-d printer] [FILE...]" >&2 + exit 1 + } + +@@ -17,7 +17,6 @@ while getopts d: flag; do + esac + done + shift $((OPTIND - 1)) +-if [ $# -eq 0 ]; then usage; fi + + # If lp (from CUPS) exists, just use it. + if command -pv lp > /dev/null; then + diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild index 968ec591c6f3..d6e4f426d698 100644 --- a/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild +++ b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit autotools flag-o-matic DESCRIPTION="A thesaurus lib, tool, and database" HOMEPAGE="https://sourceforge.net/projects/aiksaurus" SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.gz + https://downloads.sourceforge.net/${PN}/${P}.tar.gz https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz" LICENSE="GPL-2" diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest index 2012c7b48072..9187309fb066 100644 --- a/app-text/ansifilter/Manifest +++ b/app-text/ansifilter/Manifest @@ -1 +1,3 @@ -DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2 +DIST ansifilter-2.20.tar.bz2 439551 BLAKE2B 71a24e904d7d3769bd0fed4ce93d960fbe434b117dc9f0e0d6b43ced40ce78d315ad58a5b83925ea0d16595e79e0ae415fc1e52323a0c367c63edc1ede57c039 SHA512 f05942eee53513cc81054bfb853fa9a946ffc0c488564975b06e3d1feb15d8ee7be05c561905cdc5944f4d083f04196af0f7c90665b8048ca7e400537517498c +DIST ansifilter-2.20.tar.bz2.asc 488 BLAKE2B 2f2bb56e3cd81e79cd3b5b34e0f5224a79e26977f94708c64ea4278b186acc72e28ce9509fa3c0f31619b3d3ea8e35ee83656d7560152c05bafcffcb12204456 SHA512 5002436eb38399bb7cf96914fd1778ed53a9a0d8fd029b37ae50c6db8b411248f602efcd7bcb9a69871f2b3526fccf4875e3f958afccaeea94e286ddb0f071db +DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5 diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild deleted file mode 100644 index 6b5631003512..000000000000 --- a/app-text/ansifilter/ansifilter-2.18.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs qmake-utils - -DESCRIPTION="Handles text files containing ANSI terminal escape codes" -HOMEPAGE="http://www.andre-simon.de/" -SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -IUSE="qt5" - -RDEPEND=" - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog.adoc README.adoc ) - -src_prepare() { - default - - # bug 431452 - rm src/qt-gui/moc_mydialog.cpp || die - - sed -e "s/-O2//" -i src/makefile || die -} - -src_configure() { - if use qt5 ; then - pushd src/qt-gui > /dev/null || die - eqmake5 - popd > /dev/null || die - fi -} - -src_compile() { - emake -f makefile CXX="$(tc-getCXX)" - - if use qt5 ; then - pushd src/qt-gui > /dev/null || die - emake - popd > /dev/null || die - fi -} - -src_install() { - dobin src/${PN} - if use qt5 ; then - dobin src/qt-gui/${PN}-gui - domenu ${PN}.desktop - fi - - doman man/${PN}.1 - einstalldocs -} diff --git a/app-text/ansifilter/ansifilter-2.20.ebuild b/app-text/ansifilter/ansifilter-2.20.ebuild new file mode 100644 index 000000000000..7baf14e67aa9 --- /dev/null +++ b/app-text/ansifilter/ansifilter-2.20.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc +inherit desktop toolchain-funcs qmake-utils verify-sig xdg-utils + +DESCRIPTION="Handles text files containing ANSI terminal escape codes" +HOMEPAGE=" + http://andre-simon.de/doku/ansifilter/en/ansifilter.php + https://gitlab.com/saalen/ansifilter/ +" +SRC_URI=" + http://www.andre-simon.de/zip/${P}.tar.bz2 + gui? ( https://gitlab.com/uploads/-/system/project/avatar/6678914/ansifilter2_logo_256.png ) + verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc ) +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +IUSE="gui" + +RDEPEND=" + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )" + +DOCS=( ChangeLog.adoc README.adoc ) + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # bug 431452 + rm src/qt-gui/moc_mydialog.cpp || die + + sed \ + -e "/GZIP/d" \ + -e "/COPYING/d" \ + -i makefile || die + + sed \ + -e "s/-O2//" \ + -i src/makefile || die +} + +src_configure() { + if use gui ; then + pushd src/qt-gui > /dev/null || die + eqmake5 + popd > /dev/null || die + fi +} + +src_compile() { + emake -f makefile CXX="$(tc-getCXX)" + + if use gui ; then + emake -C src/qt-gui + fi +} + +src_install() { + emake -f makefile \ + DESTDIR="${ED}" \ + doc_dir="/usr/share/doc/${PF}" \ + -j1 \ + install $(usev gui install-gui) + + einstalldocs + if use gui; then + newicon -s 256 "${DISTDIR}"/ansifilter2_logo_256.png "${PN}".png + fi +} + +pkg_postrm() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postinst() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml index c27cd0454f68..ba284898934f 100644 --- a/app-text/ansifilter/metadata.xml +++ b/app-text/ansifilter/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> - <name>Michael Palimaka</name> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> </maintainer> <upstream> <remote-id type="gitlab">saalen/ansifilter</remote-id> diff --git a/app-text/antiword/antiword-0.37-r2.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild index 4cad9bec11ef..2fb72837676f 100644 --- a/app-text/antiword/antiword-0.37-r2.ebuild +++ b/app-text/antiword/antiword-0.37-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" PATCHES=( "${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER} diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild index a9040566c5eb..392f97f84af0 100644 --- a/app-text/antixls/antixls-0.3b.ebuild +++ b/app-text/antixls/antixls-0.3b.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Print out an XLS file with minimal formatting, or extract the data into CSV" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.perl" + LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~amd64 ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + DEPEND="dev-perl/Spreadsheet-ParseExcel" RDEPEND="${DEPEND}" diff --git a/app-text/apvlv/apvlv-0.4.0-r2.ebuild b/app-text/apvlv/apvlv-0.4.0-r2.ebuild new file mode 100644 index 000000000000..afd75022a0c5 --- /dev/null +++ b/app-text/apvlv/apvlv-0.4.0-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg cmake desktop + +DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim" +HOMEPAGE="https://github.com/naihe2010/apvlv/" +SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug djvu" + +RDEPEND=" + app-text/ebook-tools + >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)] + dev-libs/glib:2 + dev-libs/libxml2 + net-libs/webkit-gtk:4.1= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + djvu? ( app-text/djvu ) +" + +DEPEND="${RDEPEND} + app-text/ghostscript-gpl + media-libs/freetype +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-cmake-cxxflags.patch + "${FILESDIR}"/${P}-icon-r1.patch + # https://github.com/naihe2010/apvlv/commit/39f783103e99b954991183cea2b5ccbd9add2a1a + "${FILESDIR}"/${P}-webkitgtk4.1.patch +) +src_prepare() { + cmake_src_prepare +} +src_configure() { + local mycmakeargs=( + -DAPVLV_WITH_DJVU=$(usex djvu) + -DAPVLV_ENABLE_DEBUG=$(usex debug) + -DAPVLV_WITH_TXT=ON + -DDOCDIR="/usr/share/doc/${PF}" + ) + cmake_src_configure +} +src_install() { + cmake_src_install + # https://github.com/naihe2010/apvlv/issues/84 + newicon -s 32 icons/pdf.png x-office-document.png +} diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch new file mode 100644 index 000000000000..e5cb3526f318 --- /dev/null +++ b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch @@ -0,0 +1,10 @@ +--- a/apvlv.desktop ++++ b/apvlv.desktop +@@ -2,6 +2,7 @@ + Version=1.0 + Type=Application + Name=apvlv ++Icon=x-office-document + Comment=A minimalistic document viewer + Comment[de]=Ein minimalistischer Dokumenten-Betrachter + Comment[fr]=Un visionneur de document minimaliste diff --git a/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch new file mode 100644 index 000000000000..4501184d365c --- /dev/null +++ b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch @@ -0,0 +1,45 @@ +From 39f783103e99b954991183cea2b5ccbd9add2a1a Mon Sep 17 00:00:00 2001 +From: Alberto Garcia <berto@igalia.com> +Date: Wed, 16 Nov 2022 10:05:42 +0100 +Subject: [PATCH] Use the WebKitGTK 4.1 API builds when available + +These use soup3 instead of soup2 internally but the API is the same. +--- + src/CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 457f576..cd12d9b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,14 +18,20 @@ FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(FREETYPE2 freetype2 REQUIRED) + PKG_CHECK_MODULES(GTK gtk+-3.0) + PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) +-PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED) ++PKG_CHECK_MODULES(LIBXML libxml-2.0 REQUIRED) ++PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.1) ++if (NOT WEBKIT_FOUND) ++ PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED) ++endif() + INCLUDE_DIRECTORIES(${FREETYPE2_INCLUDE_DIRS} + ${GTK_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS} ++ ${LIBXML_INCLUDE_DIRS} + ${WEBKIT_INCLUDE_DIRS}) + LINK_DIRECTORIES(${FREETYPE2_LIBRARY_DIRS} + ${GTK_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} ++ ${LIBXML_LIBRARY_DIRS} + ${WEBKIT_LIBRARY_DIRS}) + + IF (WIN32) +@@ -116,7 +122,7 @@ TARGET_LINK_LIBRARIES(apvlv + ${GTHREAD2_LIBRARIES} + ${WEBKIT_LIBRARIES} + "-lepub" +- "-lxml2" ++ ${LIBXML_LIBRARIES} + ${APVLV_REQ_LIBRARIES}) + + IF (WIN32) diff --git a/app-text/asciidoc/asciidoc-10.2.0.ebuild b/app-text/asciidoc/asciidoc-10.2.0.ebuild index 28d44e37b41f..e9bcfe8888cd 100644 --- a/app-text/asciidoc/asciidoc-10.2.0.ebuild +++ b/app-text/asciidoc/asciidoc-10.2.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 optfeature readme.gentoo-r1 pypi DESCRIPTION="A plain text human readable/writable document format" @@ -13,12 +13,14 @@ HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -RDEPEND="app-text/docbook-xml-dtd:4.5 +RDEPEND=" + app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt - dev-libs/libxml2:2" + dev-libs/libxml2:2 +" DOC_CONTENTS=" If you are going to use a2x, please also look at a2x(1) under diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild index b7c383f4743b..075821590784 100644 --- a/app-text/asciidoc/asciidoc-9.1.0.ebuild +++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml index fe643142c872..5e3bb3ff9c88 100644 --- a/app-text/asciidoc/metadata.xml +++ b/app-text/asciidoc/metadata.xml @@ -5,6 +5,7 @@ <upstream> <remote-id type="sourceforge">asciidoc</remote-id> <remote-id type="github">asciidoc-py/asciidoc-py</remote-id> + <remote-id type="pypi">asciidoc</remote-id> <bugs-to>https://github.com/asciidoc-py/asciidoc-py/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest index 6fa52b539146..73345d5c60c1 100644 --- a/app-text/aspell/Manifest +++ b/app-text/aspell/Manifest @@ -1 +1 @@ -DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29 +DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7 diff --git a/app-text/aspell/aspell-0.60.8-r4.ebuild b/app-text/aspell/aspell-0.60.8.1.ebuild index c338ba1221d9..c9600f0ed693 100644 --- a/app-text/aspell/aspell-0.60.8-r4.ebuild +++ b/app-text/aspell/aspell-0.60.8.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools flag-o-matic libtool toolchain-funcs +inherit autotools flag-o-matic libtool MY_P="${P/_/-}" @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="nls unicode" # All available language app-dicts/aspell-* packages. @@ -66,7 +66,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" "${FILESDIR}/${PN}-0.60.6.1-clang.patch" "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" - "${FILESDIR}/${PN}-0.60.8-cve-2019-25051.patch" ) src_prepare() { diff --git a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch b/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch deleted file mode 100644 index 2f15d380ec0b..000000000000 --- a/app-text/aspell/files/aspell-0.60.8-cve-2019-25051.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson <kevina@gnu.org> -Date: Sat, 21 Dec 2019 20:32:47 +0000 -Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk - to prevent a buffer overflow - -Bug found using OSS-Fuze. ---- - common/objstack.hpp | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/common/objstack.hpp b/common/objstack.hpp -index 3997bf7..bd97ccd 100644 ---- a/common/objstack.hpp -+++ b/common/objstack.hpp -@@ -5,6 +5,7 @@ - #include "parm_string.hpp" - #include <stdlib.h> - #include <assert.h> -+#include <stddef.h> - - namespace acommon { - -@@ -26,6 +27,12 @@ class ObjStack - byte * temp_end; - void setup_chunk(); - void new_chunk(); -+ bool will_overflow(size_t sz) const { -+ return offsetof(Node,data) + sz > chunk_size; -+ } -+ void check_size(size_t sz) { -+ assert(!will_overflow(sz)); -+ } - - ObjStack(const ObjStack &); - void operator=(const ObjStack &); -@@ -56,7 +63,7 @@ class ObjStack - void * alloc_bottom(size_t size) { - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} -+ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;} - return tmp; - } - // This alloc_bottom will insure that the object is aligned based on the -@@ -66,7 +73,7 @@ class ObjStack - align_bottom(align); - byte * tmp = bottom; - bottom += size; -- if (bottom > top) {new_chunk(); goto loop;} -+ if (bottom > top) {check_size(size); new_chunk(); goto loop;} - return tmp; - } - char * dup_bottom(ParmString str) { -@@ -79,7 +86,7 @@ class ObjStack - // always be aligned as such. - void * alloc_top(size_t size) { - top -= size; -- if (top < bottom) {new_chunk(); top -= size;} -+ if (top < bottom) {check_size(size); new_chunk(); top -= size;} - return top; - } - // This alloc_top will insure that the object is aligned based on -@@ -88,7 +95,7 @@ class ObjStack - {loop: - top -= size; - align_top(align); -- if (top < bottom) {new_chunk(); goto loop;} -+ if (top < bottom) {check_size(size); new_chunk(); goto loop;} - return top; - } - char * dup_top(ParmString str) { -@@ -117,6 +124,7 @@ class ObjStack - void * alloc_temp(size_t size) { - temp_end = bottom + size; - if (temp_end > top) { -+ check_size(size); - new_chunk(); - temp_end = bottom + size; - } -@@ -131,6 +139,7 @@ class ObjStack - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; -@@ -150,6 +159,7 @@ class ObjStack - } else { - size_t s = temp_end - bottom; - byte * p = bottom; -+ check_size(size); - new_chunk(); - memcpy(bottom, p, s); - temp_end = bottom + size; diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest index 08209813e195..a0d739668c61 100644 --- a/app-text/atril/Manifest +++ b/app-text/atril/Manifest @@ -1 +1,4 @@ DIST atril-1.26.0.tar.xz 1986160 BLAKE2B 40de33749113144c49341cf8249bd20de37c3d64f3daa865dfe2bcad117e1c2b5aae2aef3b4e0199fd2656b17af236e2a863ef97933decc5072e3419219154e4 SHA512 9c4e8b1c45959136c8fc4c5db47117e45e8afca8be2294418e6c1a0f8098c162ccaa4a60e5baea34db91d45d345a3953afe95281782986e7046b87a34c8f7dbd +DIST atril-1.26.1.tar.xz 2087068 BLAKE2B d655bffb4a8245bb3cc25fc91d08ba64ade22fb6da24f5fcb9c418c020c99df66c85a0b59f1d0c31a2f450650d9807adc248a7baeb74cb696bf3687270572f47 SHA512 276e80a81234f3228065f3a804fbd8a306ac948978f3dfd233f678dc4fb6f833ebd1123950996ae08869fac112ebb0d2785ab60fde6bfddd2d2c407a2c991ea3 +DIST atril-1.26.2.tar.xz 2095464 BLAKE2B 9e0d0829c7ae692f695e3cc5a45927b503c87e57d6e6a5808626f71de01394201047fe4bdca804369d1184802eff38364ae43e36536e1258d6798e473e5e08ac SHA512 d0b3fe14443907e43a58083282d555b74189d63d94e9ec0c2053976ad529d236738c3af4a668e813307d1ba44551b0a8ad1bc78cd8f53ab61cb811eca136eec9 +DIST atril-1.28.0.tar.xz 2093588 BLAKE2B 6e5b2f63ce1a0bd1f419b0e9ccb29887086c180ccdeb473770bc20a6408ba37b3334eca0d808c304f20c26818138eeb5116a55d02e8e84b60eeedda03254896f SHA512 dd5f77b3ba2033a3591e0f58742d75eefdd0bfdcdec80a6aa6148a1cf37e4508776733013f946103bdf0412f35dee0b283cc254fa0033fc14966df323bb371a8 diff --git a/app-text/atril/atril-1.26.0-r4.ebuild b/app-text/atril/atril-1.26.0-r5.ebuild index a88dff42b314..e0cd2ec4ae2d 100644 --- a/app-text/atril/atril-1.26.0-r4.ebuild +++ b/app-text/atril/atril-1.26.0-r5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MATE_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit mate python-any-r1 virtualx @@ -17,7 +17,7 @@ DESCRIPTION="Atril document viewer for MATE" LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" SLOT="0" -IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring nls +postscript synctex t1lib test tiff xps" +IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps" REQUIRED_USE="t1lib? ( dvi )" @@ -44,10 +44,10 @@ COMMON_DEPEND=" t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( - dev-libs/mathjax + <dev-libs/mathjax-3 >=net-libs/webkit-gtk-2.6.0:4 ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2 ) synctex? ( virtual/tex-base ) @@ -66,7 +66,7 @@ BDEPEND="${COMMON_DEPEND} dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) @@ -94,7 +94,7 @@ src_configure() { --enable-pixbuf \ --enable-previewer \ --enable-thumbnailer \ - $(use_with gnome-keyring keyring) \ + $(use_with keyring) \ $(use_enable caja) \ $(use_enable dbus) \ $(use_enable debug) \ diff --git a/app-text/atril/atril-1.26.1-r1.ebuild b/app-text/atril/atril-1.26.1-r1.ebuild new file mode 100644 index 000000000000..0876237d55d5 --- /dev/null +++ b/app-text/atril/atril-1.26.1-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit mate python-any-r1 virtualx + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="Atril document viewer for MATE" +LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps" + +REQUIRED_USE="t1lib? ( dvi )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + >=app-text/poppler-0.22[cairo] + >=dev-libs/glib-2.62:2 + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[introspection?] + x11-libs/libICE + >=x11-libs/libSM-1:0 + x11-libs/libX11 + >=x11-libs/cairo-1.14 + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1[introspection?] ) + djvu? ( >=app-text/djvu-3.5.17:0 ) + dvi? ( + virtual/tex-base + t1lib? ( >=media-libs/t1lib-5:5 ) + ) + epub? ( + <dev-libs/mathjax-3 + >=net-libs/webkit-gtk-2.6.0:4.1 + ) + keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-0.6:= ) + postscript? ( >=app-text/libspectre-0.2 ) + synctex? ( virtual/tex-base ) + tiff? ( >=media-libs/tiff-3.6:= ) + xps? ( >=app-text/libgxps-0.2.1 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!app-text/mate-document-viewer +" + +BDEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-build/gtk-doc-am + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" + +#RESTRICT="!test? ( test )" +# Tests use dogtail and require using accessibility services. +# Until we figure out how to run successfully, don't run tests +RESTRICT="test" + +PATCHES=( + # https://github.com/mate-desktop/atril/issues/582 + "${FILESDIR}/${PN}-1.26.1-webkitgtk4.1.patch" +) + +python_check_deps() { + use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # Passing --disable-help would drop offline help, that would be inconsistent + # with helps of the most of GNOME apps that doesn't require network for that. + mate_src_configure \ + --enable-comics \ + --enable-pdf \ + --enable-pixbuf \ + --enable-previewer \ + --enable-thumbnailer \ + $(use_with keyring) \ + $(use_enable caja) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable djvu) \ + $(use_enable dvi) \ + $(use_enable epub) \ + $(use_enable introspection) \ + $(use_enable nls) \ + $(use_enable postscript ps) \ + $(use_enable synctex) \ + $(use_enable t1lib) \ + $(use_enable test tests) \ + $(use_enable tiff) \ + $(use_enable xps) +} + +src_test() { + export GSETTINGS_BACKEND=keyfile + gsettings set org.gnome.desktop.interface toolkit-accessibility true || die + gsettings set org.mate.interface accessibility true || die + virtx emake check +} diff --git a/app-text/atril/atril-1.26.2.ebuild b/app-text/atril/atril-1.26.2.ebuild new file mode 100644 index 000000000000..2bbb97a2dea2 --- /dev/null +++ b/app-text/atril/atril-1.26.2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit mate python-any-r1 virtualx + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="Atril document viewer for MATE" +LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps" + +REQUIRED_USE="t1lib? ( dvi )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-arch/libarchive:= + >=app-text/poppler-0.22[cairo] + >=dev-libs/glib-2.62:2 + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[introspection?] + x11-libs/libICE + >=x11-libs/libSM-1:0 + x11-libs/libX11 + >=x11-libs/cairo-1.14 + x11-libs/pango + caja? ( >=mate-base/caja-1.17.1[introspection?] ) + djvu? ( >=app-text/djvu-3.5.17:0 ) + dvi? ( + virtual/tex-base + t1lib? ( >=media-libs/t1lib-5:5 ) + ) + epub? ( + <dev-libs/mathjax-3 + >=net-libs/webkit-gtk-2.6.0:4.1 + ) + keyring? ( >=app-crypt/libsecret-0.5 ) + introspection? ( >=dev-libs/gobject-introspection-0.6:= ) + postscript? ( >=app-text/libspectre-0.2 ) + synctex? ( virtual/tex-base ) + tiff? ( >=media-libs/tiff-3.6:= ) + xps? ( >=app-text/libgxps-0.2.1 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!app-text/mate-document-viewer +" + +BDEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-build/gtk-doc-am + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" + +#RESTRICT="!test? ( test )" +# Tests use dogtail and require using accessibility services. +# Until we figure out how to run successfully, don't run tests +RESTRICT="test" + +python_check_deps() { + use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # Passing --disable-help would drop offline help, that would be inconsistent + # with helps of the most of GNOME apps that doesn't require network for that. + mate_src_configure \ + --enable-comics \ + --enable-pdf \ + --enable-pixbuf \ + --enable-previewer \ + --enable-thumbnailer \ + $(use_with keyring) \ + $(use_enable caja) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable djvu) \ + $(use_enable dvi) \ + $(use_enable epub) \ + $(use_enable introspection) \ + $(use_enable nls) \ + $(use_enable postscript ps) \ + $(use_enable synctex) \ + $(use_enable t1lib) \ + $(use_enable test tests) \ + $(use_enable tiff) \ + $(use_enable xps) +} + +src_test() { + export GSETTINGS_BACKEND=keyfile + gsettings set org.gnome.desktop.interface toolkit-accessibility true || die + gsettings set org.mate.interface accessibility true || die + virtx emake check +} diff --git a/app-text/atril/atril-1.28.0.ebuild b/app-text/atril/atril-1.28.0.ebuild new file mode 100644 index 000000000000..189aa88ef920 --- /dev/null +++ b/app-text/atril/atril-1.28.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit mate python-any-r1 virtualx + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + +DESCRIPTION="Atril document viewer for MATE" +LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps" + +REQUIRED_USE="t1lib? ( dvi )" + +COMMON_DEPEND=" + app-accessibility/at-spi2-core:2 + app-text/poppler[cairo] + dev-libs/glib:2 + dev-libs/libxml2:2 + >=mate-base/mate-desktop-1.27.1 + sys-libs/zlib + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[introspection?] + x11-libs/libICE + x11-libs/libSM:0 + x11-libs/libX11 + x11-libs/cairo + x11-libs/pango + caja? ( mate-base/caja[introspection?] ) + djvu? ( app-text/djvu:0 ) + dvi? ( + virtual/tex-base + t1lib? ( media-libs/t1lib:5 ) + ) + epub? ( + <dev-libs/mathjax-3 + net-libs/webkit-gtk:4.1 + ) + keyring? ( app-crypt/libsecret ) + introspection? ( dev-libs/gobject-introspection:= ) + postscript? ( app-text/libspectre ) + synctex? ( virtual/tex-base ) + tiff? ( media-libs/tiff:= ) + xps? ( app-text/libgxps ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl +" + +BDEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-build/gtk-doc-am + sys-devel/gettext + virtual/pkgconfig + test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) +" + +#RESTRICT="!test? ( test )" +# Tests use dogtail and require using accessibility services. +# Until we figure out how to run successfully, don't run tests +RESTRICT="test" + +python_check_deps() { + use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + # Passing --disable-help would drop offline help, that would be inconsistent + # with helps of the most of GNOME apps that doesn't require network for that. + mate_src_configure \ + --enable-comics \ + --enable-pdf \ + --enable-pixbuf \ + --enable-previewer \ + --enable-thumbnailer \ + $(use_with keyring) \ + $(use_enable caja) \ + $(use_enable dbus) \ + $(use_enable debug) \ + $(use_enable djvu) \ + $(use_enable dvi) \ + $(use_enable epub) \ + $(use_enable introspection) \ + $(use_enable nls) \ + $(use_enable postscript ps) \ + $(use_enable synctex) \ + $(use_enable t1lib) \ + $(use_enable test tests) \ + $(use_enable tiff) \ + $(use_enable xps) +} + +src_test() { + export GSETTINGS_BACKEND=keyfile + gsettings set org.gnome.desktop.interface toolkit-accessibility true || die + gsettings set org.mate.interface accessibility true || die + virtx emake check +} diff --git a/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch b/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch new file mode 100644 index 000000000000..3dd766bb5d5e --- /dev/null +++ b/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch @@ -0,0 +1,15 @@ +Description: Search for webkit2gtk-4.1. +Author: Unit 193 <unit193@debian.org> +Forwarded: no + +--- atril-1.26.0.orig/configure.ac ++++ atril-1.26.0/configure.ac +@@ -622,7 +622,7 @@ AC_ARG_ENABLE(epub, + + have_webkit="no" + if test "x$enable_epub" = "xyes"; then +- PKG_CHECK_MODULES(EPUB, webkit2gtk-4.0 >= $WEBKIT_REQUIRED \ ++ PKG_CHECK_MODULES(EPUB, webkit2gtk-4.1 >= $WEBKIT_REQUIRED \ + libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no) + + if test "x$have_webkit" = "xyes"; then diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml index 93a232547a27..6a86e9c210cb 100644 --- a/app-text/atril/metadata.xml +++ b/app-text/atril/metadata.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> + <maintainer type="person" proxied="yes"> + <email>oz.tiram@gmail.com</email> + <name>Oz Tiram</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>immoloism@gmail.com</email> + <name>Ian Jordan/name></name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="caja">Enable property page extension in diff --git a/app-text/barcode/barcode-0.99-r1.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild index e0ddd7693b65..477a4dff5786 100644 --- a/app-text/barcode/barcode-0.99-r1.ebuild +++ b/app-text/barcode/barcode-0.99-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="app-text/libpaper" DEPEND="${RDEPEND}" diff --git a/app-text/bibclean/bibclean-3.06.ebuild b/app-text/bibclean/bibclean-3.06.ebuild index 988b9c57cf29..25ac2ac350fc 100644 --- a/app-text/bibclean/bibclean-3.06.ebuild +++ b/app-text/bibclean/bibclean-3.06.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker" -HOMEPAGE="http://www.math.utah.edu/pub/bibclean/" -SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz" +HOMEPAGE="https://ftp.math.utah.edu/pub/bibclean/" +SRC_URI="https://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz" -# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/app-text/bibutils/bibutils-7.1.ebuild b/app-text/bibutils/bibutils-7.1.ebuild index ff15d9bad3bb..ba4d79b4ef6d 100644 --- a/app-text/bibutils/bibutils-7.1.ebuild +++ b/app-text/bibutils/bibutils-7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit toolchain-funcs MY_P="${PN}_${PV}" DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate" HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}_src.tgz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest index 93987c7798a2..dc20ec31bba8 100644 --- a/app-text/blahtexml/Manifest +++ b/app-text/blahtexml/Manifest @@ -1 +1,2 @@ DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042 +DIST blahtexml-1.0.tar.gz 191236 BLAKE2B 1daf42be183cb28eaf14bbca92055f715a9d0da829bb6515d132315c5f3f4866484398d8dfcf87eaf7997b03e21b86aa331fb532ecfd2bdc6e10751ccaba8699 SHA512 919c7cbeeacec25af166678bc74da2be480d082edbc8fc534f416a1cbb3495c5e9788591666a94527a07dcddfb8b27d321a0fa442c84bbcbd444bb46a559da84 diff --git a/app-text/blahtexml/blahtexml-1.0.ebuild b/app-text/blahtexml/blahtexml-1.0.ebuild new file mode 100644 index 000000000000..00d990c80f2a --- /dev/null +++ b/app-text/blahtexml/blahtexml-1.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="TeX-to-MathML converter" +HOMEPAGE="http://gva.noekeon.org/blahtexml" +SRC_URI="https://github.com/gvanas/blahtexml/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD CC-BY-3.0 ZLIB" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86" +IUSE="doc" + +RDEPEND="dev-libs/xerces-c" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/texlive-core + dev-texlive/texlive-latexextra + dev-libs/libxslt + dev-tex/latex2html + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9-Makefile.patch +) + +src_prepare() { + default + + tc-export CC CXX PKG_CONFIG +} + +src_compile() { + emake blahtex{,ml}-linux + use doc && emake doc +} + +src_install() { + dobin blahtex ${PN} + doman "${FILESDIR}"/${PN}.1 + use doc && dodoc Documentation/manual.pdf +} diff --git a/app-text/blahtexml/metadata.xml b/app-text/blahtexml/metadata.xml index bef24d2c2337..b48795512fe9 100644 --- a/app-text/blahtexml/metadata.xml +++ b/app-text/blahtexml/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">gvanas/blahtexml</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/blogc/blogc-0.20.1.ebuild b/app-text/blogc/blogc-0.20.1.ebuild index 166089083955..d67ef789f4f1 100644 --- a/app-text/blogc/blogc-0.20.1.ebuild +++ b/app-text/blogc/blogc-0.20.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ else fi if [[ ${PV} = *9999* ]]; then - BDEPEND="|| ( app-text/ronn-ng app-text/ronn )" + BDEPEND="app-text/ronn-ng" else KEYWORDS="~amd64 ~x86" fi diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild index 166089083955..d67ef789f4f1 100644 --- a/app-text/blogc/blogc-9999.ebuild +++ b/app-text/blogc/blogc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ else fi if [[ ${PV} = *9999* ]]; then - BDEPEND="|| ( app-text/ronn-ng app-text/ronn )" + BDEPEND="app-text/ronn-ng" else KEYWORDS="~amd64 ~x86" fi diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest index c8a028952839..7be41d51f5d6 100644 --- a/app-text/build-docbook-catalog/Manifest +++ b/app-text/build-docbook-catalog/Manifest @@ -1 +1,2 @@ DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7 +DIST build-docbook-catalog-2.4.tar.bz2 4693 BLAKE2B 496356008ef31f87169f9f060ba5593e6054447789a8a1c0dbc43fb4f81ebf087d09adec8fe82d2641e3550616bb874c6a1253b7988553948956f1bbb2e241c7 SHA512 5d42a641c8b336e49749b28101f87d4d856d3e5491adca4053212a473b42dcda88ab00fa64f54813a3e1b4ef1e45756e7de3a652808ad7ee113aa3afe7bf99b5 diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild index 3755bae4d9f2..38a0dee4c042 100644 --- a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild +++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/libxml2 diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild new file mode 100644 index 000000000000..38a0dee4c042 --- /dev/null +++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="DocBook XML catalog auto-updater" +HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/" +SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + dev-libs/libxml2 + || ( sys-apps/util-linux app-misc/getopt ) +" + +src_prepare() { + default + + sed -i -e "1s@#!@#!${EPREFIX}@" build-docbook-catalog || die + sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die + has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die +} + +src_configure() { + # export for bug #490754 + export MAKEOPTS+=" EPREFIX=${EPREFIX}" + + default +} + +pkg_postinst() { + # New version -> regen files + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog." +} diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 27588a4b8fc0..c870d82ebbb8 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,2 +1,12 @@ -DIST calibre-5.43.0.tar.xz 38641220 BLAKE2B dddf9e5f7303845f8d86826d38d08dfbf05f144c4fb80d215197f51dc6685f09d848148f00f9795c441f8cd8c541ed9d4988b0a5d2020ce98eb8f8bcd4853dac SHA512 1a5b95c621e47b660841d989445ab56244b9c805aa5d01efc4d95d8c37c5290e93523cedec92a6ca12d16e5f74b63743d6e682bf4084f400d080678ff540a190 DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230 +DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059 +DIST calibre-7.10.0.tar.xz 44201168 BLAKE2B 9d851ae6cbf0efd16790351720e1e86efb3dc6efc9d7c29b4e471aa99c7ff46969d594e97a2aca13ca096e77e2ae399f6e888c6846da84f7e093493ad32487a6 SHA512 f01d4c57af7f8390c17231ebc6f2fee4b331a8f143337a128119b8585b6e269b5d531a5245c6f418a8ec51ee440f99ce978b0d102f28cc955a2d31911db3b107 +DIST calibre-7.10.0.tar.xz.sig 566 BLAKE2B ef5aceae5e181e1f1e22e4ef90248e54a77bc35a9da51a152408d11833c35a1e1f131d68c8dbb39303446a6a695694b4aa3b84c16eddd273f79f84bae3a7f073 SHA512 23aa5d044524d23f3bb0cab8cbee1a12f3f147cf1a557703f36eec59e651b63cd6185484515accb4456c3dc3adfb9918eb6b88cd9d205a016232347f1db0ebd1 +DIST calibre-7.11.0.tar.xz 44329708 BLAKE2B 0c5a1ccafb9c192b7f25998174f2b9ea3571d63a6aeca274d72e7e8e8ed27b433a209d805fd35079f01a72201cb01e741f95d8c83265ea39d3c191bf41dab93f SHA512 93216323d23919ce37f3983304f0d5e88847833c52a00a8a780db1c95860d814298358347848a439ff006827742a7c19171ed4d3e3569cd03296a682200e8160 +DIST calibre-7.11.0.tar.xz.sig 566 BLAKE2B 2b035fd2a31f5954de229c932c4aca58c0850a3fdfa793932ef81bd84c4612e65ad12138684932714a85e7be68d21cd808f4008d096121d047ae9bf053b893ca SHA512 ffca64e38e5e402c8fc146dff850a67e0644dcf665c5b0d36f9c9ade6702a980f11dcdf73147412c6ee384110fa8a27168fe5c759ba4754005647f8f656a543b +DIST calibre-7.7.0.tar.xz 44006620 BLAKE2B f29dcf4c6550c7649dfddcaa4f5390ebf23ae7ef8d8103c9d001c9fcb8ca4a120c7cc8d5c2c36acced6672d78e45b6a93c6c505482f78e21ecc170c56c2641b3 SHA512 8444811e63be007e075b716c70c7df989408b8a323068fb763a07b27a2c52557e5625f311ac7672d5367df9dd3d071354cf3dd1102a0aa057e5cbbdc09ed24df +DIST calibre-7.7.0.tar.xz.sig 566 BLAKE2B 6e21d5e8517abd2cf9e278cf40308709422b97cf2c953e1f1b8487aeb6561c57902d233fb397abfe50b8a42ce28071426477171a9d5b0b055af5cf41fdb78ef4 SHA512 17d91e46aa0dc3e12f1d65c5956f3c0f6b9fb07705042efd73508cc0040d0df2bae939544fd4bc123064393174057b5107cb38167b2db2f9477988ce369e10ac +DIST calibre-7.8.0.tar.xz 44167208 BLAKE2B 676f5519b2809ca91c972ce0b4227aeac977945248063be58f8ed387c2dc1285f01e0d59c52ba9dea3a25842be1f97cdaece7f1eac5c208503240ff9ac3f0093 SHA512 c90d247af3a8ba3b2a94ca3a03bf9ee4d1c8f07d6feaa1ec045d639f448c476c4be9568e66845e7067e32b746e0ab034be65084a60f2b64f961f6678a30910e7 +DIST calibre-7.8.0.tar.xz.sig 566 BLAKE2B 03f283bee606d3071a2602ad2b1cc962b3d0cf6737ca294955524da6de7f22ddbe740d9b455332961b847331ad15f47efa884cc65bfe1a42eb46bef9f7a4a1dd SHA512 527a931f6d8701580b7b405124f53b54bb6ca65056aa41d677806a00c2ece3cb138c1c37e0d29394ee4e83487dec9dc7e82b6db63a4154e19f8463c19956e040 +DIST calibre-7.9.0.tar.xz 44164396 BLAKE2B 523b3aad25b73f4de4e2e5ce323dc63759fa1d2b65b646d3597dea42723f6a047782b019547df69d824f64cea8ca4c5964a17f37c3ea6beca95c5016bb839791 SHA512 388f47e13e0a682ae61a32ec2d7840e1514dd5cc79cc9ba271cee7619ad67f270c5059849e9412545bd4b9fa0904d105f5e88736956aba37abf9ef3ac8e1e09f +DIST calibre-7.9.0.tar.xz.sig 566 BLAKE2B 7a5c9b835edf649d790c5da143f982deb3ce908fed40a557761b7f80bed372502010ab77c57f2a3f3f4de96bbc1a7f8bae6285c510b7bc1d053fc6571e77491d SHA512 c7ac1ea50f09122b023427ea902ecccdd1ffd7b9e21d70dbd853f45686db912aa88d3830cd587ed6dfe9052cd240ab3771990639a8db20c2801fc244965ac71b diff --git a/app-text/calibre/calibre-5.44.0-r1.ebuild b/app-text/calibre/calibre-5.44.0-r1.ebuild deleted file mode 100644 index 9581e3e5554d..000000000000 --- a/app-text/calibre/calibre-5.44.0-r1.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="ipv6(+),sqlite,ssl" - -inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz" - -LICENSE=" - GPL-3+ - GPL-3 - GPL-2+ - GPL-2 - GPL-1+ - LGPL-3+ - LGPL-2.1+ - LGPL-2.1 - BSD - MIT - Old-MIT - Apache-2.0 - public-domain - || ( Artistic GPL-1+ ) - CC-BY-3.0 - OFL-1.1 - PSF-2 -" -KEYWORDS="amd64 ~arm ~x86" -SLOT="0" -IUSE="ios +udisks" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/hunspell-1.7:= - >=app-text/podofo-0.9.6_pre20171027:= - >=app-text/poppler-0.26.5[qt5] - dev-libs/glib:2= - dev-libs/hyphen:= - >=dev-libs/icu-57.1:= - dev-libs/libinput:= - >=dev-libs/dbus-glib-0.106 - dev-libs/openssl:= - dev-libs/snowball-stemmer:= - >=sys-apps/dbus-1.10.8 - $(python_gen_cond_dep ' - app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}] - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/cchardet[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] - >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] - >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] - dev-python/jeepney[${PYTHON_USEDEP}] - >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] - >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] - >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] - >=dev-python/pillow-3.2.0[truetype,${PYTHON_USEDEP}] - >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] - >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] - >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] - >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - ') - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5=[jpeg] - dev-qt/qtwidgets:5= - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache - media-fonts/liberation-fonts - media-libs/fontconfig:= - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.11:= - >=media-libs/libwmf-0.2.8 - >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= - virtual/libusb:1= - x11-libs/libxkbcommon:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXrender:= - x11-misc/shared-mime-info - >=x11-misc/xdg-utils-1.0.2-r2 - ios? ( - >=app-pda/usbmuxd-1.0.8 - >=app-pda/libimobiledevice-1.2.0 - ) - udisks? ( virtual/libudev )" -RDEPEND="${COMMON_DEPEND} - udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND}" -BDEPEND="$(python_gen_cond_dep ' - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] - >=dev-python/sip-5[${PYTHON_USEDEP}] - ') - >=virtual/podofo-build-0.9.6_pre20171027 - virtual/pkgconfig" - -PATCHES=( - # Don't prompt the user for updates - they've installed via - # an ebuild. - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" - - # Skip calling a binary (JxrDecApp) from libjxr which is used for tests - # We don't (yet?) package libjxr and it seems to be dead upstream - # (last commit in 2017) - "${FILESDIR}/${PN}-5.35.0-jxr-test.patch" - - # TODO: - # test_qt tries to load a bunch of images using Qt and it currently fails - # due to some presumably missing dependencies. This is important and - # we need to look into it, but at time of writing, none of the tests - # are even bring run, so I'd like to return to this later. - # We don't want to skip test_qt entirely, so just skip this particular - # assert for now. - "${FILESDIR}/${PN}-5.31.0-qt-image-test.patch" -) - -src_prepare() { - default - - # Warning: - # - # While it might be rather tempting to add yet another sed here, - # please don't. There have been several bugs in Gentoo's packaging - # of calibre from seds-which-become-stale. Please consider - # creating a patch instead, but in any case, run the test suite - # and ensure it passes. - # - # If in doubt about a problem, checking Fedora or Arch Linux's packaging - # is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre - # contributor. Or just ask them. - - # Fix outdated version constant. - #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ - # -i src/calibre/constants.py || \ - # die "sed failed to patch constants.py" - - # Avoid sandbox violation in /usr/share/gnome/apps when linux.py - # calls xdg-* (bug #258938). - sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ - -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ - -e "s|, PreserveMIMEDefaults():|:|" \ - -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ - -e "s|cmd\[2\]|cmd[4]|" \ - -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ - -i src/calibre/linux.py || die "sed failed to patch linux.py" - - # Disable unnecessary privilege dropping for bug #287067. - sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ - -i setup/install.py || die "sed failed to patch install.py" - sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ -'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ -'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ -'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \ - -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \ - -i setup/build.py || die "sed failed to patch build.py" -} - -src_compile() { - # TODO: get qmake called by setup.py to respect CC and CXX too - tc-export CC CXX - - # bug 821871 - local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" - export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" - - PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die -} - -src_test() { - # Skipped tests: - # - 7z (unpackaged Python dependency: py7zr) - # - test_unrar (unpackaged Python dependency: unrardll) - # - # Note that we currently have a hack to skip one part of test_qt! - # See PATCHES for more. - CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \ - --exclude-test-name 7z \ - --exclude-test-name test_mem_leaks \ - --exclude-test-name test_searching \ - --exclude-test-name test_unrar || die -} - -src_install() { - # calibre works with python 3, so remove the python 2 constraint - export CALIBRE_PY3_PORT=1 - - # Bypass kbuildsycoca and update-mime-database in order to - # avoid sandbox violations if xdg-mime tries to call them. - mkdir "${T}/bin" || die - cat - > "${T}/bin/kbuildsycoca" <<-EOF - #!${BASH} - echo $0 : $@ - exit 0 - EOF - - cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die - chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die - - export QMAKE="$(qt5_get_bindir)/qmake" - - # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox - # violation with kbuildsycoca as in bug #287067, comment #13. - export -n DISPLAY - - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: - # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale - # return _parse_localename(localename) - # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename - # raise ValueError, 'unknown locale: %s' % localename - #ValueError: unknown locale: 46 - export -n LANG LANGUAGE ${!LC_*} - export LC_ALL=C.utf8 #709682 - - # Bug #295672 - Avoid sandbox violation in ~/.config by forcing - # variables to point to our fake temporary $HOME. - export HOME="${T}/fake_homedir" - export XDG_CONFIG_HOME="${HOME}/.config" - export XDG_DATA_HOME="${HOME}/.local/share" - export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" - mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die - - tc-export CC CXX - # Bug #334243 - respect LDFLAGS when building extensions - export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" - local libdir=$(get_libdir) - [[ -n $libdir ]] || die "get_libdir returned an empty string" - - addpredict /dev/dri #665310 - - PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${PYTHON}" setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ - --staging-root="${ED}/usr" \ - --staging-libdir="${ED}/usr/${libdir}" || die - - find "${ED}"/usr/share -type d -empty -delete - - cd "${ED}"/usr/share/calibre/fonts/liberation || die - local x - for x in * ; do - [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done - - einfo "Converting python shebangs" - python_fix_shebang --force "${ED}" - - einfo "Compiling python modules" - python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" - - newinitd "${FILESDIR}"/calibre-server-3.init calibre-server - newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server -} - -pkg_preinst() { - # Indentify stray directories from upstream's "Binary install" - # method (see bug 622728). - CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre - CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do - printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" -} - -pkg_postinst() { - [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" - local x - for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do - if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then - elog "Purging '${x}'" - rm -rf "${x}" - fi - done - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/app-text/calibre/calibre-5.43.0.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild index d54df7705431..fefe407084e6 100644 --- a/app-text/calibre/calibre-5.43.0.ebuild +++ b/app-text/calibre/calibre-5.44.0-r3.ebuild @@ -3,14 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ipv6(+),sqlite,ssl" -inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils +inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils DESCRIPTION="Ebook management application" HOMEPAGE="https://calibre-ebook.com/" -SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/kovidgoyal.gpg" LICENSE=" GPL-3+ @@ -31,33 +35,30 @@ LICENSE=" OFL-1.1 PSF-2 " -KEYWORDS="amd64 ~arm ~x86" +KEYWORDS="amd64" SLOT="0" -IUSE="ios +udisks" +IUSE="ios speech test +udisks" + +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. COMMON_DEPEND="${PYTHON_DEPS} >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= - >=app-text/poppler-0.26.5[qt5] - dev-libs/glib:2= + <app-text/podofo-0.10:= + app-text/poppler[utils] dev-libs/hyphen:= >=dev-libs/icu-57.1:= - dev-libs/libinput:= - >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= - >=sys-apps/dbus-1.10.8 $(python_gen_cond_dep ' - app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}] >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cchardet[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] - >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] dev-python/dnspython[${PYTHON_USEDEP}] >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] @@ -68,52 +69,51 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] - >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] dev-python/zeroconf[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] - >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,${PYTHON_USEDEP}] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] ') + dev-qt/qtimageformats:5 dev-qt/qtcore:5= dev-qt/qtdbus:5= - dev-qt/qtgui:5=[jpeg] - dev-qt/qtwidgets:5= + dev-qt/qtgui:5=[jpeg,png] + dev-qt/qtwidgets:5 dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= - >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= virtual/libusb:1= - x11-libs/libxkbcommon:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) udisks? ( virtual/libudev )" RDEPEND="${COMMON_DEPEND} udisks? ( sys-fs/udisks:2 )" -DEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" BDEPEND="$(python_gen_cond_dep ' - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] >=dev-python/sip-5[${PYTHON_USEDEP}] ') >=virtual/podofo-build-0.9.6_pre20171027 - virtual/pkgconfig" + <virtual/podofo-build-0.10 + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" PATCHES=( # Don't prompt the user for updates - they've installed via @@ -125,14 +125,11 @@ PATCHES=( # (last commit in 2017) "${FILESDIR}/${PN}-5.35.0-jxr-test.patch" - # TODO: - # test_qt tries to load a bunch of images using Qt and it currently fails - # due to some presumably missing dependencies. This is important and - # we need to look into it, but at time of writing, none of the tests - # are even bring run, so I'd like to return to this later. - # We don't want to skip test_qt entirely, so just skip this particular - # assert for now. - "${FILESDIR}/${PN}-5.31.0-qt-image-test.patch" + # fix compatibility with recent versions of zeroconf + "${FILESDIR}"/${PN}-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch + + # Security backport for CVE-2023-46303 + "${FILESDIR}"/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch ) src_prepare() { @@ -146,26 +143,7 @@ src_prepare() { # creating a patch instead, but in any case, run the test suite # and ensure it passes. # - # If in doubt about a problem, checking Fedora or Arch Linux's packaging - # is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre - # contributor. Or just ask them. - - # Fix outdated version constant. - #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \ - # -i src/calibre/constants.py || \ - # die "sed failed to patch constants.py" - - # Avoid sandbox violation in /usr/share/gnome/apps when linux.py - # calls xdg-* (bug #258938). - sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \ - -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \ - -e "s|, PreserveMIMEDefaults():|:|" \ - -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \ - -e "s|cmd\[2\]|cmd[4]|" \ - -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \ - -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \ - -i src/calibre/linux.py || die "sed failed to patch linux.py" + # If in doubt about a problem, checking Fedora's packaging is recommended. # Disable unnecessary privilege dropping for bug #287067. sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ @@ -178,6 +156,20 @@ src_prepare() { '-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \ -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \ -i setup/build.py || die "sed failed to patch build.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die } src_compile() { @@ -187,46 +179,42 @@ src_compile() { # bug 821871 local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt5_get_bindir)/qmake" - PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die + ${EPYTHON} setup.py build || die + ${EPYTHON} setup.py gui || die + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts || die } src_test() { # Skipped tests: - # - 7z (unpackaged Python dependency: py7zr) - # - test_unrar (unpackaged Python dependency: unrardll) - # - # Note that we currently have a hack to skip one part of test_qt! - # See PATCHES for more. - CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \ - --exclude-test-name 7z \ - --exclude-test-name test_mem_leaks \ - --exclude-test-name test_searching \ - --exclude-test-name test_unrar || die + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: unrardll + test_unrar + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" || die } src_install() { - # calibre works with python 3, so remove the python 2 constraint - export CALIBRE_PY3_PORT=1 - - # Bypass kbuildsycoca and update-mime-database in order to - # avoid sandbox violations if xdg-mime tries to call them. - mkdir "${T}/bin" || die - cat - > "${T}/bin/kbuildsycoca" <<-EOF - #!${BASH} - echo $0 : $@ - exit 0 - EOF - - cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die - chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die - - export QMAKE="$(qt5_get_bindir)/qmake" - - # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox - # violation with kbuildsycoca as in bug #287067, comment #13. - export -n DISPLAY - # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale # return _parse_localename(localename) @@ -239,38 +227,27 @@ src_install() { # Bug #295672 - Avoid sandbox violation in ~/.config by forcing # variables to point to our fake temporary $HOME. export HOME="${T}/fake_homedir" - export XDG_CONFIG_HOME="${HOME}/.config" - export XDG_DATA_HOME="${HOME}/.local/share" - export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre" - mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die - - tc-export CC CXX - # Bug #334243 - respect LDFLAGS when building extensions - export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS" - local libdir=$(get_libdir) - [[ -n $libdir ]] || die "get_libdir returned an empty string" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die addpredict /dev/dri #665310 - PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${PYTHON}" setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + "${PYTHON}" setup.py install \ --staging-root="${ED}/usr" \ - --staging-libdir="${ED}/usr/${libdir}" || die + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" || die - find "${ED}"/usr/share -type d -empty -delete + cp -r man-pages/ "${ED}"/usr/share/man || die - cd "${ED}"/usr/share/calibre/fonts/liberation || die - local x - for x in * ; do - [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done + find "${ED}"/usr/share -type d -empty -delete || die einfo "Converting python shebangs" - python_fix_shebang --force "${ED}" + python_fix_shebang "${ED}/usr/bin" einfo "Compiling python modules" python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" @@ -279,23 +256,7 @@ src_install() { newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server } -pkg_preinst() { - # Indentify stray directories from upstream's "Binary install" - # method (see bug 622728). - CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre - CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do - printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}" -} - pkg_postinst() { - [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" - local x - for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do - if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then - elog "Purging '${x}'" - rm -rf "${x}" - fi - done xdg_desktop_database_update xdg_mimeinfo_database_update xdg_icon_cache_update diff --git a/app-text/calibre/calibre-7.10.0.ebuild b/app-text/calibre/calibre-7.10.0.ebuild new file mode 100644 index 000000000000..8bbc8f3c7a6f --- /dev/null +++ b/app-text/calibre/calibre-7.10.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm64" +SLOT="0" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. +COMMON_DEPEND="${PYTHON_DEPS} + app-i18n/uchardet + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.10.0:= + app-text/poppler[utils] + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/openssl:= + dev-libs/snowball-stemmer:= + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + dev-python/jeepney[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + dev-python/lxml-html-clean[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] + ') + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtimageformats:6 + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-gfx/optipng-0.7.6 + virtual/libusb:1= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3:= ) + udisks? ( virtual/libudev ) + unrar? ( dev-python/unrardll ) +" +RDEPEND="${COMMON_DEPEND} + udisks? ( sys-fs/udisks:2 )" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" +BDEPEND="$(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/sip-5[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" + +PATCHES=( + # Skip calling a binary (JxrDecApp) from libjxr which is used for tests + # We don't (yet?) package libjxr and it seems to be dead upstream + # (last commit in 2017) + "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" +) + +src_prepare() { + default + + # Warning: + # + # While it might be rather tempting to add yet another sed here, + # please don't. There have been several bugs in Gentoo's packaging + # of calibre from seds-which-become-stale. Please consider + # creating a patch instead, but in any case, run the test suite + # and ensure it passes. + # + # If in doubt about a problem, checking Fedora's packaging is recommended. + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die +} + +src_compile() { + # TODO: get qmake called by setup.py to respect CC and CXX too + tc-export CC CXX + + # bug 821871 + local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" + export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt6_get_bindir)/qmake" + + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + edo ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi +} + +src_test() { + # Skipped tests: + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: pyzstd + test_zstd + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + $(usev !unrar test_unrar) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" +} + +src_install() { + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C.utf8 # bug #709682 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die + + addpredict /dev/dri #665310 + + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + edo "${PYTHON}" setup.py install \ + --staging-root="${ED}/usr" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + python_fix_shebang "${ED}/usr/bin" + + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server +} diff --git a/app-text/calibre/calibre-7.11.0.ebuild b/app-text/calibre/calibre-7.11.0.ebuild new file mode 100644 index 000000000000..8bbc8f3c7a6f --- /dev/null +++ b/app-text/calibre/calibre-7.11.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm64" +SLOT="0" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. +COMMON_DEPEND="${PYTHON_DEPS} + app-i18n/uchardet + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.10.0:= + app-text/poppler[utils] + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/openssl:= + dev-libs/snowball-stemmer:= + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + dev-python/jeepney[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + dev-python/lxml-html-clean[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] + ') + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtimageformats:6 + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-gfx/optipng-0.7.6 + virtual/libusb:1= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3:= ) + udisks? ( virtual/libudev ) + unrar? ( dev-python/unrardll ) +" +RDEPEND="${COMMON_DEPEND} + udisks? ( sys-fs/udisks:2 )" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" +BDEPEND="$(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/sip-5[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" + +PATCHES=( + # Skip calling a binary (JxrDecApp) from libjxr which is used for tests + # We don't (yet?) package libjxr and it seems to be dead upstream + # (last commit in 2017) + "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" +) + +src_prepare() { + default + + # Warning: + # + # While it might be rather tempting to add yet another sed here, + # please don't. There have been several bugs in Gentoo's packaging + # of calibre from seds-which-become-stale. Please consider + # creating a patch instead, but in any case, run the test suite + # and ensure it passes. + # + # If in doubt about a problem, checking Fedora's packaging is recommended. + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die +} + +src_compile() { + # TODO: get qmake called by setup.py to respect CC and CXX too + tc-export CC CXX + + # bug 821871 + local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" + export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt6_get_bindir)/qmake" + + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + edo ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi +} + +src_test() { + # Skipped tests: + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: pyzstd + test_zstd + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + $(usev !unrar test_unrar) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" +} + +src_install() { + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C.utf8 # bug #709682 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die + + addpredict /dev/dri #665310 + + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + edo "${PYTHON}" setup.py install \ + --staging-root="${ED}/usr" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + python_fix_shebang "${ED}/usr/bin" + + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server +} diff --git a/app-text/calibre/calibre-7.7.0-r1.ebuild b/app-text/calibre/calibre-7.7.0-r1.ebuild new file mode 100644 index 000000000000..331a32a8a077 --- /dev/null +++ b/app-text/calibre/calibre-7.7.0-r1.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="amd64" +SLOT="0" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. +COMMON_DEPEND="${PYTHON_DEPS} + app-i18n/uchardet + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.10.0:= + app-text/poppler[utils] + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/openssl:= + dev-libs/snowball-stemmer:= + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + dev-python/jeepney[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + dev-python/lxml-html-clean[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] + ') + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtimageformats:6 + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-gfx/optipng-0.7.6 + virtual/libusb:1= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3:= ) + udisks? ( virtual/libudev ) + unrar? ( dev-python/unrardll ) +" +RDEPEND="${COMMON_DEPEND} + udisks? ( sys-fs/udisks:2 )" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" +BDEPEND="$(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/sip-5[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" + +PATCHES=( + # Skip calling a binary (JxrDecApp) from libjxr which is used for tests + # We don't (yet?) package libjxr and it seems to be dead upstream + # (last commit in 2017) + "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" +) + +src_prepare() { + default + + # Warning: + # + # While it might be rather tempting to add yet another sed here, + # please don't. There have been several bugs in Gentoo's packaging + # of calibre from seds-which-become-stale. Please consider + # creating a patch instead, but in any case, run the test suite + # and ensure it passes. + # + # If in doubt about a problem, checking Fedora's packaging is recommended. + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die +} + +src_compile() { + # TODO: get qmake called by setup.py to respect CC and CXX too + tc-export CC CXX + + # bug 821871 + local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" + export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt6_get_bindir)/qmake" + + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + edo ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi +} + +src_test() { + # Skipped tests: + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: pyzstd + test_zstd + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + $(usev !unrar test_unrar) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" +} + +src_install() { + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C.utf8 # bug #709682 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die + + addpredict /dev/dri #665310 + + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + edo "${PYTHON}" setup.py install \ + --staging-root="${ED}/usr" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + python_fix_shebang "${ED}/usr/bin" + + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server +} diff --git a/app-text/calibre/calibre-7.8.0-r1.ebuild b/app-text/calibre/calibre-7.8.0-r1.ebuild new file mode 100644 index 000000000000..3bfa3ebc10dd --- /dev/null +++ b/app-text/calibre/calibre-7.8.0-r1.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="amd64" +SLOT="0" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. +COMMON_DEPEND="${PYTHON_DEPS} + app-i18n/uchardet + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.10.0:= + app-text/poppler[utils] + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/openssl:= + dev-libs/snowball-stemmer:= + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + dev-python/jeepney[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + dev-python/lxml-html-clean[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] + ') + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtimageformats:6 + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-gfx/optipng-0.7.6 + virtual/libusb:1= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3:= ) + udisks? ( virtual/libudev ) + unrar? ( dev-python/unrardll ) +" +RDEPEND="${COMMON_DEPEND} + udisks? ( sys-fs/udisks:2 )" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" +BDEPEND="$(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/sip-5[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" + +PATCHES=( + # Skip calling a binary (JxrDecApp) from libjxr which is used for tests + # We don't (yet?) package libjxr and it seems to be dead upstream + # (last commit in 2017) + "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" +) + +src_prepare() { + default + + # Warning: + # + # While it might be rather tempting to add yet another sed here, + # please don't. There have been several bugs in Gentoo's packaging + # of calibre from seds-which-become-stale. Please consider + # creating a patch instead, but in any case, run the test suite + # and ensure it passes. + # + # If in doubt about a problem, checking Fedora's packaging is recommended. + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die +} + +src_compile() { + # TODO: get qmake called by setup.py to respect CC and CXX too + tc-export CC CXX + + # bug 821871 + local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" + export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt6_get_bindir)/qmake" + + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + edo ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi +} + +src_test() { + # Skipped tests: + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: pyzstd + test_zstd + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + $(usev !unrar test_unrar) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" +} + +src_install() { + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C.utf8 # bug #709682 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die + + addpredict /dev/dri #665310 + + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + edo "${PYTHON}" setup.py install \ + --staging-root="${ED}/usr" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + python_fix_shebang "${ED}/usr/bin" + + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server +} diff --git a/app-text/calibre/calibre-7.9.0.ebuild b/app-text/calibre/calibre-7.9.0.ebuild new file mode 100644 index 000000000000..8bbc8f3c7a6f --- /dev/null +++ b/app-text/calibre/calibre-7.9.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg + +DESCRIPTION="Ebook management application" +HOMEPAGE="https://calibre-ebook.com/" +SRC_URI=" + https://download.calibre-ebook.com/${PV}/${P}.tar.xz + verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + +LICENSE=" + GPL-3+ + GPL-3 + GPL-2+ + GPL-2 + GPL-1+ + LGPL-3+ + LGPL-2.1+ + LGPL-2.1 + BSD + MIT + Old-MIT + Apache-2.0 + public-domain + || ( Artistic GPL-1+ ) + CC-BY-3.0 + OFL-1.1 + PSF-2 +" +KEYWORDS="~amd64 ~arm64" +SLOT="0" +IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Qt slotted dependencies are used because the libheadless.so plugin links to +# QT_*_PRIVATE_ABI. It only uses core/gui/dbus. +COMMON_DEPEND="${PYTHON_DEPS} + app-i18n/uchardet + >=app-text/hunspell-1.7:= + >=app-text/podofo-0.10.0:= + app-text/poppler[utils] + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/openssl:= + dev-libs/snowball-stemmer:= + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] + dev-python/jeepney[${PYTHON_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] + dev-python/lxml-html-clean[${PYTHON_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}] + >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}] + >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/xxhash[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}] + ') + dev-qt/qtbase:6=[gui,widgets] + dev-qt/qtimageformats:6 + dev-util/desktop-file-utils + dev-util/gtk-update-icon-cache + media-fonts/liberation-fonts + media-libs/fontconfig:= + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.11:= + >=media-gfx/optipng-0.7.6 + virtual/libusb:1= + x11-misc/shared-mime-info + >=x11-misc/xdg-utils-1.0.2-r2 + font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') ) + ios? ( + >=app-pda/usbmuxd-1.0.8 + >=app-pda/libimobiledevice-1.2.0 + ) + speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') ) + system-mathjax? ( >=dev-libs/mathjax-3:= ) + udisks? ( virtual/libudev ) + unrar? ( dev-python/unrardll ) +" +RDEPEND="${COMMON_DEPEND} + udisks? ( sys-fs/udisks:2 )" +DEPEND="${COMMON_DEPEND} + test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') ) +" +BDEPEND="$(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}] + >=dev-python/sip-5[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + system-mathjax? ( dev-lang/rapydscript-ng ) + verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) +" + +PATCHES=( + # Skip calling a binary (JxrDecApp) from libjxr which is used for tests + # We don't (yet?) package libjxr and it seems to be dead upstream + # (last commit in 2017) + "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" +) + +src_prepare() { + default + + # Warning: + # + # While it might be rather tempting to add yet another sed here, + # please don't. There have been several bugs in Gentoo's packaging + # of calibre from seds-which-become-stale. Please consider + # creating a patch instead, but in any case, run the test suite + # and ensure it passes. + # + # If in doubt about a problem, checking Fedora's packaging is recommended. + + # Disable unnecessary privilege dropping for bug #287067. + sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ + -i setup/install.py || die "sed failed to patch install.py" + + # This is only ever used at build time. It contains a small embedded copy + # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't + # have rapydscript-ng (a nodejs package) itself installed. Its only purpose + # is to build some resources that come bundled in dist tarballs already... + # and which we may also need to regenerate e.g. to use system-mathjax. + # + # However, running qtwebengine violates the portage sandbox (among other + # things, it tries to create directories in /usr! amazing) so this is a + # wash anyway. The only real solution here is to package rapydscript-ng. + # + # We do not need it at build time, and *no one* needs it at install time. + # Delete the cruft. + rm -r resources/rapydscript/ || die +} + +src_compile() { + # TODO: get qmake called by setup.py to respect CC and CXX too + tc-export CC CXX + + # bug 821871 + local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)" + export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}" + export QMAKE="$(qt6_get_bindir)/qmake" + + edo ${EPYTHON} setup.py build + edo ${EPYTHON} setup.py gui + + # A few different resources are bundled in the distfile by default, because + # not all systems necessarily have them. We un-vendor them, using the + # upstream integrated approach if possible. See setup/revendor.py and + # consider migrating other resources to this if they do not use it, in + # *preference* over manual rm'ing. + edo ${EPYTHON} setup.py liberation_fonts \ + --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \ + --system-liberation_fonts + if use system-mathjax; then + edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax + edo ${EPYTHON} setup.py rapydscript + fi +} + +src_test() { + # Skipped tests: + local _test_excludes=( + # unpackaged Python dependency: py7zr + 7z + # unpackaged Python dependency: pyzstd + test_zstd + # tests if a completely unused module is bundled + pycryptodome + + $(usev !speech speech_dispatcher) + $(usev !unrar test_unrar) + + # undocumented reasons + test_mem_leaks + test_searching + ) + + edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" +} + +src_install() { + # Bug #352625 - Some LANGUAGE values can trigger the following ValueError: + # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale + # return _parse_localename(localename) + # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename + # raise ValueError, 'unknown locale: %s' % localename + #ValueError: unknown locale: 46 + export -n LANG LANGUAGE ${!LC_*} + export LC_ALL=C.utf8 # bug #709682 + + # Bug #295672 - Avoid sandbox violation in ~/.config by forcing + # variables to point to our fake temporary $HOME. + export HOME="${T}/fake_homedir" + export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre" + mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die + + addpredict /dev/dri #665310 + + # If this directory doesn't exist, zsh completion won't install + dodir /usr/share/zsh/site-functions + + edo "${PYTHON}" setup.py install \ + --staging-root="${ED}/usr" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --staging-libdir="${ED}/usr/$(get_libdir)" \ + --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + python_fix_shebang "${ED}/usr/bin" + + python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)" + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server +} diff --git a/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch b/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch new file mode 100644 index 000000000000..f33fd3345e27 --- /dev/null +++ b/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch @@ -0,0 +1,55 @@ +From 57190699030dc6746320e49695a67ce83c62d549 Mon Sep 17 00:00:00 2001 +From: Kovid Goyal <kovid@kovidgoyal.net> +Date: Sun, 28 May 2023 14:03:15 +0530 +Subject: [PATCH] HTML Input: Dont add resources that exist outside the folder + hierarchy rooted at the parent folder of the input HTML file by default + +(cherry picked from commit bbbddd2bf4ef4ddb467b0aeb0abe8765ed7f8a6b) +--- + .../ebooks/conversion/plugins/html_input.py | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/calibre/ebooks/conversion/plugins/html_input.py b/src/calibre/ebooks/conversion/plugins/html_input.py +index 6f9c2084ea..742f3e0279 100644 +--- a/src/calibre/ebooks/conversion/plugins/html_input.py ++++ b/src/calibre/ebooks/conversion/plugins/html_input.py +@@ -64,6 +64,16 @@ class HTMLInput(InputFormatPlugin): + ) + ), + ++ OptionRecommendation(name='allow_local_files_outside_root', ++ recommended_value=False, level=OptionRecommendation.LOW, ++ help=_('Normally, resources linked to by the HTML file or its children will only be allowed' ++ ' if they are in a sub-folder of the original HTML file. This option allows including' ++ ' local files from any location on your computer. This can be a security risk if you' ++ ' are converting untrusted HTML and expecting to distribute the result of the conversion.' ++ ) ++ ), ++ ++ + } + + def convert(self, stream, opts, file_ext, log, +@@ -76,6 +86,7 @@ def convert(self, stream, opts, file_ext, log, + if hasattr(stream, 'name'): + basedir = os.path.dirname(stream.name) + fname = os.path.basename(stream.name) ++ self.root_dir_of_input = os.path.abspath(basedir) + os.sep + + if file_ext != 'opf': + if opts.dont_package: +@@ -250,6 +261,11 @@ def link_to_local_path(self, link_, base=None): + frag = l.fragment + if not link: + return None, None ++ link = os.path.abspath(os.path.realpath(link)) ++ if not link.startswith(self.root_dir_of_input): ++ if not self.opts.allow_local_files_outside_root: ++ self.log.warn('Not adding {} as it is outside the document root: {}'.format(link, self.root_dir_of_input)) ++ return None, None + return link, frag + + def resource_adder(self, link_, base=None): +-- +2.41.0 + diff --git a/app-text/calibre/files/calibre-5.31.0-qt-image-test.patch b/app-text/calibre/files/calibre-5.31.0-qt-image-test.patch deleted file mode 100644 index cfecd4c2a5ca..000000000000 --- a/app-text/calibre/files/calibre-5.31.0-qt-image-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/calibre/test_build.py -+++ b/src/calibre/test_build.py -@@ -306,7 +306,6 @@ class BuildTest(unittest.TestCase): - # then it is a distro problem. - fmts = set(map(lambda x: x.data().decode('utf-8'), QImageReader.supportedImageFormats())) # no2to3 - testf = {'jpg', 'png', 'svg', 'ico', 'gif', 'webp'} -- self.assertEqual(testf.intersection(fmts), testf, "Qt doesn't seem to be able to load some of its image plugins. Available plugins: %s" % fmts) - data = P('images/blank.png', allow_user_override=False, data=True) - img = image_from_data(data) - image_from_data(P('catalog/mastheadImage.gif', allow_user_override=False, data=True)) diff --git a/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch new file mode 100644 index 000000000000..79af5d94bb59 --- /dev/null +++ b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch @@ -0,0 +1,26 @@ +From 5d8d85c649b181747d182f676cfd76f843bd61f0 Mon Sep 17 00:00:00 2001 +From: Kovid Goyal <kovid@kovidgoyal.net> +Date: Sun, 1 Oct 2023 15:08:59 +0530 +Subject: [PATCH] Fix compatibility with zeroconf >= 0.73 + +Fixes #2038 (fix compatibility with newer zeroconf) +--- + src/calibre/devices/smart_device_app/driver.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py +index 87608f305b..b41c3a0063 100644 +--- a/src/calibre/devices/smart_device_app/driver.py ++++ b/src/calibre/devices/smart_device_app/driver.py +@@ -2175,6 +2175,8 @@ def monkeypatch_zeroconf(): + # "monkeypatch" zeroconf with a function without the check + try: + from zeroconf._utils.name import service_type_name ++ # zeroconf 0.73 uses an lru cache so we need __wrapped__ ++ service_type_name = getattr(service_type_name, '__wrapped__', service_type_name) + service_type_name.__kwdefaults__['strict'] = False + except ImportError: + import zeroconf +-- +2.41.0 + diff --git a/app-text/calibre/files/calibre-7.0.0-jxr-test.patch b/app-text/calibre/files/calibre-7.0.0-jxr-test.patch new file mode 100644 index 000000000000..c37d0cdfe028 --- /dev/null +++ b/app-text/calibre/files/calibre-7.0.0-jxr-test.patch @@ -0,0 +1,27 @@ +diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py +index b61627b63e..ff51c76e75 100644 +--- a/src/calibre/utils/img.py ++++ b/src/calibre/utils/img.py +@@ -129,8 +129,6 @@ def image_from_data(data): + i = QImage() + if not i.loadFromData(data): + q = what(None, data) +- if q == 'jxr': +- return load_jxr_data(data) + raise NotImage(f'Not a valid image (detected type: {q})') + return i + +@@ -693,13 +691,6 @@ def test(): # {{{ + despeckle_image(img) + remove_borders_from_image(img) + image_to_data(img, fmt='GIF') +- p = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'], +- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0, +- stdout=subprocess.PIPE) +- raw, _ = p.communicate() +- p.wait() +- if b'JPEG XR Decoder Utility' not in raw: +- raise SystemExit('Failed to run JxrDecApp') + # }}} + + diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml index a969c28b1737..7d12d7b1b414 100644 --- a/app-text/calibre/metadata.xml +++ b/app-text/calibre/metadata.xml @@ -4,8 +4,17 @@ <maintainer type="person"> <email>zmedico@gentoo.org</email> </maintainer> + <maintainer type="person" proxied="yes"> + <email>eschwartz93@gmail.com</email> + <name>Eli Schwartz</name> + </maintainer> <upstream> - <remote-id type="sourceforge">calibre</remote-id> <remote-id type="github">kovidgoyal/calibre</remote-id> + <changelog>https://calibre-ebook.com/whats-new</changelog> </upstream> + <use> + <flag name="font-subsetting">Enable font subsetting support</flag> + <flag name="system-mathjax">Use a system copy of mathjax</flag> + <flag name="unrar">Enable support for comic books compressed with the non-free Rar format</flag> + </use> </pkgmetadata> diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1-r1.ebuild index 5a2dba1be4d1..6961b484ccf4 100644 --- a/app-text/capyt/capyt-1.1.1.ebuild +++ b/app-text/capyt/capyt-1.1.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -19,6 +19,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" +RDEPEND="dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}]" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild index 6940f7b90c38..651d5468b9b0 100644 --- a/app-text/catdoc/catdoc-0.95-r1.ebuild +++ b/app-text/catdoc/catdoc-0.95-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x64-solaris" IUSE="tk" DEPEND="tk? ( >=dev-lang/tk-8.1 )" diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml index faf815a1d979..8cd266827d05 100644 --- a/app-text/cb2bib/metadata.xml +++ b/app-text/cb2bib/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <bugs-to>mailto:webmaster@molspaces.com</bugs-to> </upstream> diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7-r1.ebuild index 62a85f40d12f..3c59e14c04dc 100644 --- a/app-text/cedilla/cedilla-0.7.ebuild +++ b/app-text/cedilla/cedilla-0.7-r1.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="UTF-8 to postscript converter" -HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/" +HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/ + https://github.com/jech/cedilla" SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" -KEYWORDS="amd64 x86" +LICENSE="GPL-2+" SLOT="0" -LICENSE="GPL-2" +KEYWORDS="amd64 x86" DEPEND="dev-lisp/clisp" RDEPEND="${DEPEND}" @@ -21,7 +22,7 @@ src_compile() { } src_install() { - sed "s#${ED%/}##g" -i cedilla || die "sed failed" + sed "s#${ED}##g" -i cedilla || die "sed failed" dodir /usr/share/man/man1/ ./install-cedilla || die "Install failed." diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml index f8003ca6d190..432003501472 100644 --- a/app-text/cedilla/metadata.xml +++ b/app-text/cedilla/metadata.xml @@ -5,4 +5,7 @@ <email>titanofold@gentoo.org</email> <name>Aaron W. Swenson</name> </maintainer> + <upstream> + <remote-id type="github">jech/cedilla</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/chasen/chasen-2.4.5.ebuild b/app-text/chasen/chasen-2.4.5.ebuild index d7433b71a1f0..f6067a33f971 100644 --- a/app-text/chasen/chasen-2.4.5.ebuild +++ b/app-text/chasen/chasen-2.4.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}-legacy/56305/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris" +KEYWORDS="amd64 ppc ~ppc64 ~riscv x86" IUSE="perl static-libs" RDEPEND="virtual/libiconv" diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index f48b6ef3db6d..761642d944ca 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1,3 +1,4 @@ -DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0 SHA512 e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666 -DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b SHA512 c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e -DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028 SHA512 3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6 +DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c SHA512 aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508 +DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5 SHA512 07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1 +DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b SHA512 917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc +DIST cherrytree_1.0.4.tar.xz 3436940 BLAKE2B 67fec738e05f1823b9206d9a58f85be94df9c54d94e15a7408ade4801065523707e973bb0643d4b1c0ddb6c94a2a9eb00530b5c8cbd291696daa98f2d18f6767 SHA512 615c551523ef3cc7edaeeeeb632c3e0d4fa4ca1feca719a15e5b3e47f38113c1033ed13ef4a2821b14a3b4ef3a4079bce7f8f2c5643d11a4ecd6cbdc49b408e5 diff --git a/app-text/cherrytree/cherrytree-0.99.55.ebuild b/app-text/cherrytree/cherrytree-1.0.0.ebuild index 589376ce484d..a757d8026dc5 100644 --- a/app-text/cherrytree/cherrytree-0.99.55.ebuild +++ b/app-text/cherrytree/cherrytree-1.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 xdg diff --git a/app-text/cherrytree/cherrytree-0.99.54.ebuild b/app-text/cherrytree/cherrytree-1.0.1.ebuild index 589376ce484d..837ea599e0fc 100644 --- a/app-text/cherrytree/cherrytree-0.99.54.ebuild +++ b/app-text/cherrytree/cherrytree-1.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 xdg diff --git a/app-text/cherrytree/cherrytree-0.99.53.ebuild b/app-text/cherrytree/cherrytree-1.0.2.ebuild index ae17b8db137a..dd062ad78a2f 100644 --- a/app-text/cherrytree/cherrytree-0.99.53.ebuild +++ b/app-text/cherrytree/cherrytree-1.0.2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 xdg DESCRIPTION="A hierarchical note taking application (C++ version)" HOMEPAGE="https://www.giuspen.com/cherrytree/" -SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz" +SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz" S="${WORKDIR}"/${P/-/_} KEYWORDS="~amd64 ~x86" @@ -38,7 +38,7 @@ RDEPEND="app-i18n/uchardet dev-libs/libfmt:= dev-libs/libxml2:2 dev-libs/spdlog:= - gui-libs/vte:2.91-gtk4 + >=x11-libs/vte-0.70.2:2.91 net-misc/curl x11-libs/cairo x11-libs/gtk+:3 diff --git a/app-text/cherrytree/cherrytree-1.0.4.ebuild b/app-text/cherrytree/cherrytree-1.0.4.ebuild new file mode 100644 index 000000000000..dd062ad78a2f --- /dev/null +++ b/app-text/cherrytree/cherrytree-1.0.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-any-r1 xdg + +DESCRIPTION="A hierarchical note taking application (C++ version)" +HOMEPAGE="https://www.giuspen.com/cherrytree/" + +SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz" +S="${WORKDIR}"/${P/-/_} + +KEYWORDS="~amd64 ~x86" + +# GPL-3 — future/src/ct (CherryTree) +# LGPL-2.1 — future/src/7za (7zip) +# MIT — future/src/fmt (libfmt) +LICENSE="GPL-3 LGPL-2.1 MIT" +SLOT="0" +IUSE="nls test" + +# Has deps that aren't available in ::gentoo repo +RESTRICT="test" + +RDEPEND="app-i18n/uchardet + app-text/gspell:= + >=dev-cpp/glibmm-2.64.2:2 + dev-cpp/gtkmm:3.0 + dev-cpp/gtksourceviewmm:3.0 + dev-cpp/libxmlpp:2.6 + dev-cpp/pangomm:1.4 + dev-db/sqlite:3 + dev-libs/fribidi + dev-libs/glib:2 + dev-libs/libfmt:= + dev-libs/libxml2:2 + dev-libs/spdlog:= + >=x11-libs/vte-0.70.2:2.91 + net-misc/curl + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/pango" + +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-util/cpputest )" + +src_prepare() { + # disable compress man pages + sed -i -e \ + '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \ + CMakeLists.txt || die + + # python_fix_shebang . + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPYTHON_EXEC="${PYTHON}" + -DUSE_NLS=$(usex nls) + -DBUILD_TESTING=$(usex test) + -DUSE_SHARED_FMT_SPDLOG=ON + ) + + cmake_src_configure +} diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest index 1a5d16b9e75f..9405f0d6d887 100644 --- a/app-text/cmark/Manifest +++ b/app-text/cmark/Manifest @@ -1,2 +1,2 @@ -DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17 DIST cmark-0.30.3.tar.gz 246916 BLAKE2B b63027e1a7d6db21c3b1bfc89deaebb202972cf65b3ddc51f20d6cb2dacfb6724dffd226f3cace1b25dda2cd87bdb201b82779bd7a6068c5f9751513bda226ae SHA512 27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b +DIST cmark-0.31.0.tar.gz 251922 BLAKE2B 9532255066cd21e99de430787f261b3014c4d270e8243aa258bb9c90cf2ccfd7138dcff2e15f576cc28ee6b6b7901c0f321f5ead6a9202e06b4223288f326897 SHA512 768d456147cb8f5cf36e8122213ad053098201e118109a316518a6a5e721ac94f62af29abe1e69120c84bdc227a5c320803ea2cf320c6d9a719d62909b6533bd diff --git a/app-text/cmark/cmark-0.30.3.ebuild b/app-text/cmark/cmark-0.30.3.ebuild index 42ebdf11074e..57ce9dc2992a 100644 --- a/app-text/cmark/cmark-0.30.3.ebuild +++ b/app-text/cmark/cmark-0.30.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.31.0.ebuild index 1d0738fc0929..9d990ce41277 100644 --- a/app-text/cmark/cmark-0.30.2.ebuild +++ b/app-text/cmark/cmark-0.31.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 @@ -13,12 +13,16 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" BDEPEND="test? ( ${PYTHON_DEPS} )" +PATCHES=( + "${FILESDIR}/cmark-0.31.0_fix_api_test.patch" +) + pkg_setup() { use test && python-any-r1_pkg_setup } @@ -26,9 +30,8 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMARK_LIB_FUZZER=OFF - -DCMARK_SHARED=ON - -DCMARK_STATIC=OFF - -DCMARK_TESTS="$(usex test)" + -DBUILD_SHARED_LIBS=ON + -DBUILD_TESTING="$(usex test)" ) cmake_src_configure } diff --git a/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch new file mode 100644 index 000000000000..defecc445c4e --- /dev/null +++ b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch @@ -0,0 +1,17 @@ +https://github.com/commonmark/cmark/commit/a739d4911b5fa5586679b8e55999719cc910d26b +From: John MacFarlane <jgm@berkeley.edu> +Date: Wed, 13 Mar 2024 14:31:28 -0700 +Subject: [PATCH] Flag root node as open... + +in `cmark_parser_new_with_mem_into_root`. Closes #532. +--- a/src/blocks.c ++++ b/src/blocks.c +@@ -98,6 +98,8 @@ cmark_parser *cmark_parser_new_with_mem_into_root(int options, cmark_mem *mem, c + cmark_strbuf_init(mem, &parser->linebuf, 0); + cmark_strbuf_init(mem, &parser->content, 0); + ++ root->flags = CMARK_NODE__OPEN; ++ + parser->refmap = cmark_reference_map_new(mem); + parser->root = root; + parser->current = root; diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest index e1db9f4d2646..7807f30ceabf 100644 --- a/app-text/cmigemo/Manifest +++ b/app-text/cmigemo/Manifest @@ -1 +1,2 @@ DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18 +DIST cmigemo-1.3e_p20220623.tar.gz 70154 BLAKE2B 633719399afaa48e870d6995557be01460c624d992525b9192d87ccab6f90ab29e9b3b5b11f4274b204eaae0b144246cc713bcce18a51172d8e16ed5333b59fb SHA512 7e95f8a95380991eea33067a2c95b820d520a1a24919ee5be22ebcbccd53ee870ca54dbdcaa08b7d01c9b4abf7f24d09eb2c09a7f9768ed4fd08fc73667d2496 diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild deleted file mode 100644 index 13e4e867cedb..000000000000 --- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -MY_P="${P}-MIT" -DESCRIPTION="Migemo library implementation in C" -HOMEPAGE="http://www.kaoriya.net/#CMIGEMO" -SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ppc x86" -IUSE="unicode vim-syntax" - -DEPEND=">=app-dicts/migemo-dict-200812[unicode=] - dev-lang/perl - || ( - net-misc/curl - net-misc/wget - www-client/fetch - ) - app-i18n/nkf" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # Bug #246953 - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-ldflags.patch -) - -src_prepare() { - default - - touch dict/SKK-JISYO.L || die - if use unicode ; then - sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die - fi - - # Bug #255813 - sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die -} - -src_compile() { - append-flags -fPIC - # parallel make b0rked - emake -j1 \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - gcc-all -} - -src_install() { - # parallel make b0rked - emake -j1 \ - prefix="${D}/usr" \ - libdir="${D}/usr/$(get_libdir)" \ - gcc-install - - local encoding - if use unicode ; then - encoding="utf-8" - else - encoding="euc-jp" - fi - - mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die - rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/plugin - doins tools/migemo.vim - fi - - dodoc doc/{README_j,TODO_j,vimigemo}.txt -} diff --git a/app-text/cmigemo/cmigemo-1.3c-r4.ebuild b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild new file mode 100644 index 000000000000..f39e35d60f0f --- /dev/null +++ b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic toolchain-funcs + +MY_P="${P}-MIT" + +DESCRIPTION="Migemo library implementation in C" +HOMEPAGE="https://www.kaoriya.net/software/cmigemo/" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ppc x86" +IUSE="unicode vim" + +RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]" +DEPEND="${RDEPEND}" +BDEPEND="app-i18n/nkf + dev-lang/perl + || ( + net-misc/curl + net-misc/wget + www-client/fetch + )" +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-ldflags.patch + # bug #246953 + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-parallel-build.patch + "${FILESDIR}"/${P}-parallel-install.patch +) +DOCS=( doc/{README_j,TODO_j,vimigemo}.txt ) + +src_prepare() { + default + + touch dict/SKK-JISYO.L || die + if use unicode; then + sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die + fi + + # bug #255813 + sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die +} + +src_compile() { + append-flags -fPIC + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + gcc-all +} + +src_install() { + emake \ + prefix="${ED}/usr" \ + libdir="${ED}/usr/$(get_libdir)" \ + gcc-install + einstalldocs + + local encoding + if use unicode; then + encoding="utf-8" + else + encoding="euc-jp" + fi + + mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die + rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8} + + if use vim; then + insinto /usr/share/vim/vimfiles/plugin + doins tools/migemo.vim + fi +} diff --git a/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild b/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild new file mode 100644 index 000000000000..84f5050840cc --- /dev/null +++ b/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic toolchain-funcs vcs-snapshot + +EGIT_COMMIT="e0f6145f61e0b7058c3006f344e58571d9fdd83a" + +DESCRIPTION="Migemo library implementation in C" +HOMEPAGE="https://www.kaoriya.net/software/cmigemo/" +SRC_URI="https://github.com/koron/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="unicode vim" + +RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]" +DEPEND="${RDEPEND}" +BDEPEND="app-i18n/nkf + dev-lang/perl + || ( + net-misc/curl + net-misc/wget + www-client/fetch + )" + +PATCHES=( + # bug #246953 + "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-ldflags.patch +) +DOCS=( doc/{README_j,TODO_j,vimigemo}.txt ) + +src_prepare() { + default + + touch dict/SKK-JISYO.L || die + if use unicode; then + sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die + fi + + # bug #255813 + sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die +} + +src_compile() { + append-flags -fPIC + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + gcc-all +} + +src_install() { + emake \ + prefix="${ED}/usr" \ + libdir="${ED}/usr/$(get_libdir)" \ + gcc-install + einstalldocs + + local encoding + if use unicode; then + encoding="utf-8" + else + encoding="euc-jp" + fi + + mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die + rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8} + + if use vim; then + insinto /usr/share/vim/vimfiles/plugin + doins tools/migemo.vim + fi +} diff --git a/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch index 2f903bb9bb62..daf9c18e9157 100644 --- a/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch +++ b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch @@ -1,6 +1,5 @@ -diff -Naur cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak cmigemo-1.3c-MIT/compile/Make_gcc.mak ---- cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak 2003-10-19 16:00:59.000000000 +0900 -+++ cmigemo-1.3c-MIT/compile/Make_gcc.mak 2009-11-08 16:45:32.485952233 +0900 +--- a/compile/Make_gcc.mak ++++ b/compile/Make_gcc.mak @@ -14,7 +14,7 @@ libmigemo = libmigemo.so EXEEXT = @@ -10,9 +9,18 @@ diff -Naur cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak cmigemo-1.3c-MIT/compile/M include config.mk include compile/unix.mak -diff -Naur cmigemo-1.3c-MIT.orig/configure cmigemo-1.3c-MIT/configure ---- cmigemo-1.3c-MIT.orig/configure 2004-06-19 12:50:27.000000000 +0900 -+++ cmigemo-1.3c-MIT/configure 2009-11-08 16:40:42.688962262 +0900 +--- a/compile/unix.mak ++++ b/compile/unix.mak +@@ -22,6 +22,7 @@ + $(MKDIR) $$i; \ + fi \ + done ++ touch $@ + + $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB) + $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS) +--- a/configure ++++ b/configure @@ -31,12 +31,12 @@ fi @@ -30,9 +38,8 @@ diff -Naur cmigemo-1.3c-MIT.orig/configure cmigemo-1.3c-MIT/configure exit 1 fi -diff -Naur cmigemo-1.3c-MIT.orig/tools/migemo.vim cmigemo-1.3c-MIT/tools/migemo.vim ---- cmigemo-1.3c-MIT.orig/tools/migemo.vim 2004-02-23 16:32:53.000000000 +0900 -+++ cmigemo-1.3c-MIT/tools/migemo.vim 2009-11-08 16:42:19.572951008 +0900 +--- a/tools/migemo.vim ++++ b/tools/migemo.vim @@ -20,7 +20,7 @@ let dict = globpath(path, "migemo-dict") endif @@ -47,9 +54,33 @@ diff -Naur cmigemo-1.3c-MIT.orig/tools/migemo.vim cmigemo-1.3c-MIT/tools/migemo. else " non-builtin version - let g:migemodict = s:SearchDict() -+ if !exists('g:migemodict') ++ if !get(g:, 'migemodict') + let g:migemodict = s:SearchDict() + endif command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>) nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr> +@@ -53,11 +55,6 @@ + if retval == '' + return + endif +- if has('iconv') && $HOMEDRIVE != '' +- let retval = iconv(retval, 'cp932', 'euc-jp') +- elseif &encoding != 'euc-jp' +- let retval = iconv(retval, &encoding, 'euc-jp') +- endif + "let retval = system('cmigemo -v -w "'.retval.'" -d "'.g:migemodict.'"') + let retval = system('cmigemo -v -w '.retval.' -d "'.g:migemodict.'"') + if retval == '' +@@ -88,11 +85,6 @@ + echohl None + return + endif +- if has('iconv') && $HOMEDRIVE != '' +- let retval = iconv(retval, 'euc-jp', 'cp932') +- elseif &encoding != 'euc-jp' +- let retval = iconv(retval, 'euc-jp', &encoding) +- endif + + let @/ = retval + let v:errmsg = '' diff --git a/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch b/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch new file mode 100644 index 000000000000..b311754e1538 --- /dev/null +++ b/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch @@ -0,0 +1,73 @@ +https://github.com/koron/cmigemo/pull/28 + +From fd4bad807a9a52130d58269a4b1507a8720c5ae6 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Fri, 12 Nov 2021 15:16:54 +0000 +Subject: [PATCH] Add directory dependencies to fix parallel builds + +When building in parallel (make -j) sometimes make would try to create +a dictionary file before the directory containing it had been +created. To fix this, I've made the directory a dependency of each +file in it, rather than having them be sibling dependencies of the +-files targets. +--- + dict/dict.mak | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/dict/dict.mak b/dict/dict.mak +index 8ea8a66..44bd543 100644 +--- a/dict/dict.mak ++++ b/dict/dict.mak +@@ -33,40 +33,40 @@ cp932: $(DICT) + # Dictionary in euc-jp + # + euc-jp: cp932 euc-jp-files +-euc-jp-files: $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict \ ++euc-jp-files: $(EUCJP_DIR)/migemo-dict \ + $(EUCJP_DIR)/zen2han.dat $(EUCJP_DIR)/han2zen.dat \ + $(EUCJP_DIR)/hira2kata.dat $(EUCJP_DIR)/roma2hira.dat + $(EUCJP_DIR): + $(MKDIR) $(EUCJP_DIR) +-$(EUCJP_DIR)/migemo-dict: migemo-dict ++$(EUCJP_DIR)/migemo-dict: $(EUCJP_DIR) migemo-dict + $(FILTER_EUCJP) < migemo-dict > $@ +-$(EUCJP_DIR)/zen2han.dat: zen2han.dat ++$(EUCJP_DIR)/zen2han.dat: $(EUCJP_DIR) zen2han.dat + $(FILTER_EUCJP) < zen2han.dat > $@ +-$(EUCJP_DIR)/han2zen.dat: han2zen.dat ++$(EUCJP_DIR)/han2zen.dat: $(EUCJP_DIR) han2zen.dat + $(FILTER_EUCJP) < han2zen.dat > $@ +-$(EUCJP_DIR)/hira2kata.dat: hira2kata.dat ++$(EUCJP_DIR)/hira2kata.dat: $(EUCJP_DIR) hira2kata.dat + $(FILTER_EUCJP) < hira2kata.dat > $@ +-$(EUCJP_DIR)/roma2hira.dat: roma2hira.dat ++$(EUCJP_DIR)/roma2hira.dat: $(EUCJP_DIR) roma2hira.dat + $(FILTER_EUCJP) < roma2hira.dat > $@ + + ############################################################################## + # Dictionary in utf-8 + # + utf-8: cp932 utf-8-files +-utf-8-files: $(UTF8_DIR) $(UTF8_DIR)/migemo-dict \ ++utf-8-files: $(UTF8_DIR)/migemo-dict \ + $(UTF8_DIR)/zen2han.dat $(UTF8_DIR)/han2zen.dat \ + $(UTF8_DIR)/hira2kata.dat $(UTF8_DIR)/roma2hira.dat + $(UTF8_DIR): + $(MKDIR) $(UTF8_DIR) +-$(UTF8_DIR)/migemo-dict: migemo-dict ++$(UTF8_DIR)/migemo-dict: $(UTF8_DIR) migemo-dict + $(FILTER_UTF8) < migemo-dict > $@ +-$(UTF8_DIR)/zen2han.dat: zen2han.dat ++$(UTF8_DIR)/zen2han.dat: $(UTF8_DIR) zen2han.dat + $(FILTER_UTF8) < zen2han.dat > $@ +-$(UTF8_DIR)/han2zen.dat: han2zen.dat ++$(UTF8_DIR)/han2zen.dat: $(UTF8_DIR) han2zen.dat + $(FILTER_UTF8) < han2zen.dat > $@ +-$(UTF8_DIR)/hira2kata.dat: hira2kata.dat ++$(UTF8_DIR)/hira2kata.dat: $(UTF8_DIR) hira2kata.dat + $(FILTER_UTF8) < hira2kata.dat > $@ +-$(UTF8_DIR)/roma2hira.dat: roma2hira.dat ++$(UTF8_DIR)/roma2hira.dat: $(UTF8_DIR) roma2hira.dat + $(FILTER_UTF8) < roma2hira.dat > $@ + + ############################################################################## diff --git a/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch b/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch new file mode 100644 index 000000000000..9ac30d65a3c0 --- /dev/null +++ b/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch @@ -0,0 +1,113 @@ +https://github.com/koron/cmigemo/pull/29 + +From 4c7476b614208836c3f4036fca87c8c718043c8b Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Wed, 22 Jun 2022 22:07:18 +0100 +Subject: [PATCH 1/3] compile/unix.mak: add .o file dependency on $(objdir) + directory + +Without this change parallel build fails occasionally when object +files are built before directory is being created: + + make[1]: Entering directory '/build/cmigemo' + gcc -O2 -Wall -fPIC -o build/object/charset.o -c src/charset.c + Assembler messages: + Fatal error: can't create build/object/charset.o: No such file or directory + make[1]: *** [compile/unix.mak:33: build/object/charset.o] Error 1 shuffle=1655929862 +--- + compile/unix.mak | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compile/unix.mak b/compile/unix.mak +index 8ef6413..8cf525a 100644 +--- a/compile/unix.mak ++++ b/compile/unix.mak +@@ -14,7 +14,7 @@ CFLAGS = -O2 -Wall $(DEFINES) $(CFLAGS_MIGEMO) + LDFLAGS = $(LDFLAGS_MIGEMO) + LIBS = + +-default: dirs $(outdir)cmigemo$(EXEEXT) ++default: $(outdir)cmigemo$(EXEEXT) + + dirs: + @for i in $(objdir) $(outdir); do \ +@@ -26,10 +26,10 @@ dirs: + $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB) + $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS) + +-$(objdir)main.o: $(srcdir)main.c ++$(objdir)main.o: $(srcdir)main.c dirs + $(CC) $(CFLAGS) -o $@ -c $< + +-$(objdir)%.o: $(srcdir)%.c ++$(objdir)%.o: $(srcdir)%.c dirs + $(CC) $(CFLAGS) -o $@ -c $< + + ############################################################################## + +From 88a1ed71a637faa6ec4eeb7e2b2f0a9f597a4812 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Wed, 22 Jun 2022 22:10:42 +0100 +Subject: [PATCH 2/3] compile/unix.mak: add install dependency on $(dictdir) + directory + +Without this change parallel install fails occasionally when +$(dictdir) is not yet present: + + gcc -o build/cmigemo ./build/object/main.o -L. -L./build/ -lmigemo -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib + install -m 644 dict/migemo-dict ...-cmigemo-1.3e/share/migemo/cp932 + install: cannot create regular file '...-cmigemo-1.3e/share/migemo/cp932': No such file or directory + make[1]: *** [compile/unix.mak:49: install-dict] Error 1 shuffle=1655931959 +--- + compile/unix.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compile/unix.mak b/compile/unix.mak +index 8cf525a..cb6bd8f 100644 +--- a/compile/unix.mak ++++ b/compile/unix.mak +@@ -45,7 +45,7 @@ install-mkdir: + $(MKDIR) $(dictdir)/euc-jp + $(MKDIR) $(dictdir)/utf-8 + +-install-dict: ++install-dict: install-mkdir + $(INSTALL_DATA) dict/migemo-dict $(dictdir)/cp932 + $(INSTALL_DATA) dict/han2zen.dat $(dictdir)/cp932 + $(INSTALL_DATA) dict/hira2kata.dat $(dictdir)/cp932 + +From 3b39db8a748081e60bcceb7a8ae93616a5939f41 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Wed, 22 Jun 2022 22:16:12 +0100 +Subject: [PATCH 3/3] compile/unix.mak: add install-lib dependency on $(libdir) + directory + +Without this change parallel install fails occasionally when +$(libdir) is not yet present: + + rm -f libmigemo.so.1 libmigemo.so + ln -s libmigemo.so.1.1.0 libmigemo.so.1 + ln -s libmigemo.so.1.1.0 libmigemo.so + install -m 755 libmigemo.so.1.1.0 ...-cmigemo-1.3e/lib + rm -f ...-cmigemo-1.3e/lib/libmigemo.so.1 ...-cmigemo-1.3e/lib/libmigemo.so + ln -s libmigemo.so.1.1.0 ...-cmigemo-1.3e/lib/libmigemo.so.1 + ln: failed to create symbolic link '...-cmigemo-1.3e/lib/libmigemo.so.1': Not a directory + make[1]: *** [compile/Make_gcc.mak:38: install-lib] Error 1 shuffle=1655932664 +--- + compile/unix.mak | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/compile/unix.mak b/compile/unix.mak +index cb6bd8f..6651fcd 100644 +--- a/compile/unix.mak ++++ b/compile/unix.mak +@@ -66,6 +66,9 @@ install-dict: install-mkdir + $(INSTALL_DATA) dict/utf-8.d/zen2han.dat $(dictdir)/utf-8; \ + fi + ++# depends on $(libdir) to be already present ++install-lib: install-mkdir ++ + install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib + $(INSTALL_DATA) $(srcdir)migemo.h $(incdir) + $(INSTALL_DATA) doc/README_j.txt $(docdir) diff --git a/app-text/cmigemo/files/cmigemo-gentoo.patch b/app-text/cmigemo/files/cmigemo-gentoo.patch new file mode 100644 index 000000000000..37215d224ed8 --- /dev/null +++ b/app-text/cmigemo/files/cmigemo-gentoo.patch @@ -0,0 +1,74 @@ +--- a/compile/Make_gcc.mak ++++ b/compile/Make_gcc.mak +@@ -14,7 +14,7 @@ + libmigemo = libmigemo.so + EXEEXT = + CFLAGS_MIGEMO = -fPIC +-LDFLAGS_MIGEMO = -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib ++LDFLAGS_MIGEMO = + + include config.mk + include compile/unix.mak +--- a/compile/unix.mak ++++ b/compile/unix.mak +@@ -22,6 +22,7 @@ + $(MKDIR) $$i; \ + fi \ + done ++ touch $@ + + $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB) + $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS) +--- a/configure ++++ b/configure +@@ -31,12 +31,12 @@ + fi + + # Check encoding filter +-if CHECK_COMMAND qkc ; then +- PROGRAM_ENCODEFILTER="qkc -q -u" +-elif CHECK_COMMAND nkf ; then ++if CHECK_COMMAND nkf ; then + PROGRAM_ENCODEFILTER="nkf -x" ++elif CHECK_COMMAND qkc ; then ++ PROGRAM_ENCODEFILTER="qkc -q -u" + else +- echo "ERROR: Require qkc or nkf installed for encode filter." ++ echo "ERROR: Require nkf or qkc installed for encode filter." + exit 1 + fi + +--- a/tools/migemo.vim ++++ b/tools/migemo.vim +@@ -24,10 +24,7 @@ + endif + if dict == '' + for path in [ +- \ '/usr/local/share/migemo/', +- \ '/usr/local/share/cmigemo/', + \ '/usr/local/share/', +- \ '/usr/share/cmigemo/', + \ '/usr/share/', + \ ] + let path = path . a:name +@@ -50,6 +47,9 @@ + let dict = s:SearchDict2(&encoding.'/migemo-dict') + endif + if dict == '' ++ let dict = s:SearchDict2('migemo/migemo-dict') ++ endif ++ if dict == '' + let dict = s:SearchDict2('migemo-dict') + endif + return dict +@@ -70,7 +70,9 @@ + nnoremap <Leader>f :call <SID>SearchChar(0)<CR> + else + " non-builtin version +- let g:migemodict = s:SearchDict() ++ if !get(g:, 'migemodict') ++ let g:migemodict = s:SearchDict() ++ endif + command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>) + nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr> + diff --git a/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch b/app-text/cmigemo/files/cmigemo-ldflags.patch index 2f4f8c922431..ca1db125c5a2 100644 --- a/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch +++ b/app-text/cmigemo/files/cmigemo-ldflags.patch @@ -1,8 +1,6 @@ -diff --git a/compile/Make_gcc.mak b/compile/Make_gcc.mak -index f042ac6..f91fe92 100644 --- a/compile/Make_gcc.mak +++ b/compile/Make_gcc.mak -@@ -28,7 +28,7 @@ include compile/clean_unix.mak +@@ -28,7 +28,7 @@ # $(libmigemo_LIB): $(libmigemo_DSO) $(libmigemo_DSO): $(libmigemo_OBJ) diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml index a94766977fa6..0d0a18d865c0 100644 --- a/app-text/cmigemo/metadata.xml +++ b/app-text/cmigemo/metadata.xml @@ -5,4 +5,10 @@ <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> + <upstream> + <remote-id type="github">koron/cmigemo</remote-id> + </upstream> + <use> + <flag name="vim">Install Vim plugin for C/Migemo</flag> + </use> </pkgmetadata> diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild index 5d0c25ddedf7..7537c63db64f 100644 --- a/app-text/convmv/convmv-2.05-r1.ebuild +++ b/app-text/convmv/convmv-2.05-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86" IUSE="" DEPEND="dev-lang/perl" diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest deleted file mode 100644 index 0519c8007033..000000000000 --- a/app-text/coolreader/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6 diff --git a/app-text/coolreader/coolreader-3.2.59-r4.ebuild b/app-text/coolreader/coolreader-3.2.59-r4.ebuild deleted file mode 100644 index 9f5dcc61edec..000000000000 --- a/app-text/coolreader/coolreader-3.2.59-r4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" -PLOCALES="bg cs de es hu pl ru uk" -inherit cmake plocale wxwidgets xdg - -CR_PV=$(ver_rs 3 '-') -SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-cr${CR_PV}" - -DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)" -HOMEPAGE="https://github.com/buggins/coolreader/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="wxwidgets" - -CDEPEND="sys-libs/zlib - app-arch/zstd:= - media-libs/libpng:0 - media-libs/libjpeg-turbo - media-libs/freetype - dev-libs/fribidi - media-libs/fontconfig - media-libs/harfbuzz:= - dev-libs/libunibreak:= - dev-libs/libutf8proc:= - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" -BDEPEND="${CDEPEND} - !wxwidgets? ( dev-qt/linguist-tools:5 )" -RDEPEND="${CDEPEND} - wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )" - -PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch ) - -src_prepare() { - cmake_src_prepare - xdg_environment_reset - - # locales - plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' - sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \ - -i "${S}"/cr3qt/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - if use wxwidgets; then - setup-wxwidgets - local mycmakeargs=(-DGUI=WX) - else - local mycmakeargs=(-DGUI=QT5) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - if ! use wxwidgets; then - mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed" - rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed" - gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" - gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" - fi -} diff --git a/app-text/coolreader/files/coolreader-wxwidgets.patch b/app-text/coolreader/files/coolreader-wxwidgets.patch deleted file mode 100644 index aac02864b0e4..000000000000 --- a/app-text/coolreader/files/coolreader-wxwidgets.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 2040a15d2a23ee4d16af8f2294e1593fa267e8d9 Mon Sep 17 00:00:00 2001 -From: Aleksey Chernov <valexlin@gmail.com> -Date: Thu, 9 Sep 2021 10:41:38 +0400 -Subject: [PATCH] Fixed wxWidgets build failure: compilation error due to API - change. Introduced in c47cab44799475a48230312b8e97cd7a71edddb0. - ---- - cr3wx/src/view.cpp | 82 ++++++++++++++++++++++++++++++++++------------ - 1 file changed, 61 insertions(+), 21 deletions(-) - -diff --git a/cr3wx/src/view.cpp b/cr3wx/src/view.cpp -index df2a264f7f..2ee30f9421 100644 ---- a/cr3wx/src/view.cpp -+++ b/cr3wx/src/view.cpp -@@ -307,33 +307,73 @@ void cr3view::OnTimer(wxTimerEvent& event) - } - } - --void cr3view::Paint() -+static bool getBatteryState(int& state, int& chargingConn, int& level) - { -- //printf("cr3view::Paint() \n"); -- int battery_state = -1; - #ifdef _WIN32 -+ // update battery state - SYSTEM_POWER_STATUS bstatus; - BOOL pow = GetSystemPowerStatus(&bstatus); -- if (bstatus.BatteryFlag & 128) -- pow = FALSE; -- if (bstatus.ACLineStatus!=0 || bstatus.BatteryLifePercent==255) -- pow = FALSE; -- if ( pow ) -- battery_state = bstatus.BatteryLifePercent; -+ if (pow) { -+ state = CR_BATTERY_STATE_DISCHARGING; -+ if (bstatus.BatteryFlag & 128) -+ state = CR_BATTERY_STATE_NO_BATTERY; // no system battery -+ else if (bstatus.BatteryFlag & 8) -+ state = CR_BATTERY_STATE_CHARGING; // charging -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ if (bstatus.ACLineStatus==1) -+ chargingConn = CR_BATTERY_CHARGER_AC; // AC power charging connected -+ if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100) -+ level = bstatus.BatteryLifePercent; -+ return true; -+ } -+ return false; - #else -- if ( ::wxGetPowerType() == wxPOWER_BATTERY ) { -- int n = ::wxGetBatteryState(); -- if ( n == wxBATTERY_NORMAL_STATE ) -- battery_state = 100; -- else if ( n == wxBATTERY_LOW_STATE ) -- battery_state = 50; -- else if ( n == wxBATTERY_CRITICAL_STATE ) -- battery_state = 0; -- else if ( n == wxBATTERY_SHUTDOWN_STATE ) -- battery_state = 0; -- }; -+ wxPowerType wxpwrtype = wxGetPowerType(); -+ switch (wxpwrtype) { -+ case wxPOWER_SOCKET: -+ state = CR_BATTERY_STATE_CHARGING; -+ chargingConn = CR_BATTERY_CHARGER_AC; -+ break; -+ case wxPOWER_BATTERY: -+ state = CR_BATTERY_STATE_DISCHARGING; -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ break; -+ default: -+ state = CR_BATTERY_STATE_NO_BATTERY; -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ break; -+ } -+ wxBatteryState wxbatstate = wxGetBatteryState(); -+ switch (wxbatstate) { -+ case wxBATTERY_NORMAL_STATE: -+ level = 100; -+ break; -+ case wxBATTERY_LOW_STATE: -+ level = 50; -+ break; -+ case wxBATTERY_CRITICAL_STATE: -+ level = 5; -+ break; -+ case wxBATTERY_SHUTDOWN_STATE: -+ level = 0; -+ break; -+ default: -+ level = 0; -+ break; -+ } -+ return true; - #endif -- getDocView()->setBatteryState( battery_state ); -+} -+ -+void cr3view::Paint() -+{ -+ //printf("cr3view::Paint() \n"); -+ int battery_state; -+ int charging_conn; -+ int charge_level; -+ if (getBatteryState(battery_state, charging_conn, charge_level)) { -+ getDocView()->setBatteryState( battery_state, charging_conn, charge_level ); -+ } - //_docview->Draw(); - UpdateScrollBar(); - Refresh( FALSE ); diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml deleted file mode 100644 index 5db08561fc93..000000000000 --- a/app-text/coolreader/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>grozin@gentoo.org</email> - </maintainer> - <longdescription lang="en"> - A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices. - Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI. - </longdescription> - <use> - <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag> - </use> - <upstream> - <remote-id type="github">buggins/coolreader</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest index 7fdc7ee16a25..e31b16954f84 100644 --- a/app-text/crengine-ng/Manifest +++ b/app-text/crengine-ng/Manifest @@ -1 +1,2 @@ -DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31 +DIST crengine-ng-0.9.11.tar.bz2 4026770 BLAKE2B 27137f3177a9aacc47b4b2ef38ed9baba81d987c46232247686cdbc307b9602fb1d5a915240d4712ca05ac49c7d263e49cf14dbf1b126e8c31862e62d56e742d SHA512 0014060f13e04432bba4c00885bc0c4cbf094d9d69cd8544b995d40bd569d690b5ebd8f02ab8ecba3d7f4bca6154a753a26690aacd96a19870dc2fdacf625f33 +DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd diff --git a/app-text/crengine-ng/crengine-ng-0.9.7.ebuild b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild index 986b939f7761..f8228762d42d 100644 --- a/app-text/crengine-ng/crengine-ng-0.9.7.ebuild +++ b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,18 +6,21 @@ inherit cmake DESCRIPTION="Cross-platform library designed to implement e-book readers" HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng" -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" +SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2 + test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs" +LICENSE="GPL-2+" +SLOT="0/6" +KEYWORDS="amd64 ~arm64 x86" +IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test" + +RESTRICT="!test? ( test )" CDEPEND="sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 - harfbuzz? ( media-libs/harfbuzz:= ) + harfbuzz? ( media-libs/harfbuzz:=[truetype] ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) @@ -25,12 +28,23 @@ CDEPEND="sys-libs/zlib fontconfig? ( media-libs/fontconfig )" RDEPEND="${CDEPEND}" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest + app-arch/zip ) +" BDEPEND="virtual/pkgconfig ${CDEPEND}" +src_prepare() { + cmake_src_prepare + if use test; then + mkdir -p "${BUILD_DIR}/crengine/tests/fonts/" + cp -p "${WORKDIR}/freefont-20120503/"*.otf "${BUILD_DIR}/crengine/tests/fonts/" + fi +} + src_configure() { - CMAKE_USE_DIR="${S}" CMAKE_BUILD_TYPE="Release" local mycmakeargs=( -DCRE_BUILD_SHARED=ON @@ -50,9 +64,15 @@ src_configure() { -DUSE_ANTIWORD=ON -DUSE_FONTCONFIG=$(usex fontconfig) -DUSE_SHASUM=OFF + -DUSE_CMARK_GFM=ON -DBUILD_TOOLS=OFF - -DENABLE_UNITTESTING=OFF - -DENABLE_LTO=$(usex lto) + -DENABLE_UNITTESTING=$(usex test) + -DOFFLINE_BUILD_MODE=ON ) cmake_src_configure } + +src_test() { + cd "${BUILD_DIR}/crengine/tests" + ./unittests +} diff --git a/app-text/crengine-ng/metadata.xml b/app-text/crengine-ng/metadata.xml index 77c3ad3cd348..8fec2108c8d1 100644 --- a/app-text/crengine-ng/metadata.xml +++ b/app-text/crengine-ng/metadata.xml @@ -12,7 +12,7 @@ </maintainer> <longdescription lang="en"> A fork of coolreader engine. Supported formats are: fb2 (including fb2.zip), fb3, - epub (without DRM), rtf, doc, docx, odt, html, chm, pdb, mobi (without DRM), txt, trc, prc. + epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc. </longdescription> <use> <flag name="chm">Support chm format</flag> @@ -20,7 +20,6 @@ <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag> <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag> <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag> - <flag name="lto">Use link time optimization</flag> </use> <upstream> <remote-id type="gitlab">coolreader-ng/crengine-ng</remote-id> diff --git a/app-text/crf++/crf++-0.58-r2.ebuild b/app-text/crf++/crf++-0.58-r2.ebuild new file mode 100644 index 000000000000..abab5dad11cd --- /dev/null +++ b/app-text/crf++/crf++-0.58-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data" +HOMEPAGE="https://taku910.github.io/crfpp/" +SRC_URI="mirror://gentoo/${P^^}.tar.gz" +S="${WORKDIR}/${P^^}" + +LICENSE="|| ( BSD LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-registers.patch +) +HTML_DOCS=( doc/. ) + +src_prepare() { + default + eautoreconf +} + +src_test() { + local d + for d in example/*; do + pushd "${d}" >/dev/null || die + ./exec.sh || die "failed test in ${d}" + popd >/dev/null || die + done +} + +src_install() { + default + + if use examples; then + dodoc -r example + docompress -x /usr/share/doc/${PF}/example + fi + + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/app-text/crf++/files/crf++-0.58-registers.patch b/app-text/crf++/files/crf++-0.58-registers.patch new file mode 100644 index 000000000000..960e7f923d6b --- /dev/null +++ b/app-text/crf++/files/crf++-0.58-registers.patch @@ -0,0 +1,57 @@ +From 12204f40fdab494328931f12f45ad7d884ef6dac Mon Sep 17 00:00:00 2001 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Tue, 16 May 2023 12:29:40 +0530 +Subject: [PATCH] Removing register keywords + +The register keyword has been dropped since C++17. + +Bug: https://bugs.gentoo.org/894642 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/darts.h ++++ b/darts.h +@@ -404,10 +404,10 @@ class DoubleArrayImpl { + T result; + set_result(result, -1, 0); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b +(node_u_type_)(key[i]) + 1; + if (static_cast<array_u_type_>(b) == array_[p].check) + b = array_[p].base; +@@ -431,12 +431,12 @@ class DoubleArrayImpl { + size_t node_pos = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register size_t num = 0; +- register array_type_ n; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ size_t num = 0; ++ array_type_ n; ++ array_u_type_ p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b; // + 0; + n = array_[p].base; + if ((array_u_type_) b == array_[p].check && n < 0) { +@@ -469,8 +469,8 @@ class DoubleArrayImpl { + size_t len = 0) const { + if (!len) len = length_func_()(key); + +- register array_type_ b = array_[node_pos].base; +- register array_u_type_ p; ++ array_type_ b = array_[node_pos].base; ++ array_u_type_ p; + + for (; key_pos < len; ++key_pos) { + p = b +(node_u_type_)(key[key_pos]) + 1; +-- +2.40.1 + diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r2.ebuild index 97d0d5c39cc0..a5d4a7b851d4 100644 --- a/app-text/crm114/crm114-20100106-r1.ebuild +++ b/app-text/crm114/crm114-20100106-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,12 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-makefile.patch + # https://bugs.gentoo.org/854897 + # Upstream is dead since 2009 so no point submitting this to them. + "${FILESDIR}"/0001-fix-broken-function-signatures-for-5-argument-functi.patch +) src_prepare() { default diff --git a/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch new file mode 100644 index 000000000000..ab2ebcaa368d --- /dev/null +++ b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch @@ -0,0 +1,43 @@ +From c0cb641ec6c1ab960df91c23b726836add0ca3a5 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 6 May 2024 00:26:18 -0400 +Subject: [PATCH] fix broken function signatures for 5-argument functions + +These are always called before exit() so presumably no one noticed that +these "log error and exit(-1)" functions were prone to "exiting with an +error" (our new term for "hello how would you like to have some UB"). + +However, the LTO optimizer noticed what was being done and died in +painful agony. Bring it back to life and soothe its hurts. +--- + crm_util_errorhandlers.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/crm_util_errorhandlers.c b/crm_util_errorhandlers.c +index 1f64f3c..cba9d89 100644 +--- a/crm_util_errorhandlers.c ++++ b/crm_util_errorhandlers.c +@@ -23,17 +23,17 @@ long untrappableerror ( char *str1, char *str2) + fprintf (stderr, "ERROR: %s%s \n", str1, str2); + exit (-1); + } +-long fatalerror5 ( char *str1, char *str2) ++long fatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline) + { + fprintf (stderr, "ERROR: %s%s \n", str1, str2); + exit (-1); + } +-long nonfatalerror5 ( char *str1, char *str2) ++long nonfatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline) + { + fprintf (stderr, "ERROR: %s%s \n", str1, str2); + exit (-1); + } +-long untrappableerror5 ( char *str1, char *str2) ++long untrappableerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline) + { + fprintf (stderr, "ERROR: %s%s \n", str1, str2); + exit (-1); +-- +2.43.2 + diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest index 3f8f2d78747c..db521758cfa1 100644 --- a/app-text/crqt-ng/Manifest +++ b/app-text/crqt-ng/Manifest @@ -1 +1,2 @@ -DIST crqt-ng-1.0.9.tar.bz2 435826 BLAKE2B 771b073fadf6f1bc9ddf7887603aaf6081d54c2effd548523f7afbb8b6bdf20d21bf55c1c37101662c2b851e932c6b4dce777c8e9160b059dbb1daed499db1c4 SHA512 b4f395be1d2029024dfb064f38db2ea372587151de1f5fae3cef492d4285d6ce597bc93a48d98594c5b703db8c99ba29cd9afdaae4c39b80b53cf6a7bafdbb97 +DIST crqt-ng-1.0.13.tar.bz2 444509 BLAKE2B 7f69f1ea509cff8610f62539a66c9ce7a805660da6c4188c7e0c966b1f3f63932302ace0b70e0a21c2eaa7dfbfba1ef37ceda7e64b520d248eeb671d3f35ff1d SHA512 7857efedb641635e386ca16cdb8789b77641e593bf78f3a89ed0ac8c3d91d87c14de8cf32722b36290261c55975ea250768ac525caa279b15a35bddbde62609c +DIST crqt-ng-1.0.14.tar.bz2 445540 BLAKE2B 147a42ffb63b9f2f4525d683f0f3c02bc4895a235884044150e7fa395f07a7f8ba460287ed0c296592974e0bf8029f8af6daa623b2387d4d9400a6737e7a3b51 SHA512 424f5a9717f9cab5e9ea9b6e5ee9397807acb0dfccc6edb19f2de988c80811ea9c01853d2f664d7b0b1a380fcf6fa7290da0c7d58fef5317632ba83f946235f8 diff --git a/app-text/crqt-ng/crqt-ng-1.0.9.ebuild b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild index c90ba913816f..de0e7855551b 100644 --- a/app-text/crqt-ng/crqt-ng-1.0.9.ebuild +++ b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PLOCALES="bg cs hu ru uk" +PLOCALES="bg cs hu nl ru uk" inherit cmake plocale xdg DESCRIPTION="Cross-platform e-book reader" HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng" SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" -CDEPEND=">=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] +CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5" diff --git a/app-text/crqt-ng/crqt-ng-1.0.14.ebuild b/app-text/crqt-ng/crqt-ng-1.0.14.ebuild new file mode 100644 index 000000000000..0191ef0b7f1c --- /dev/null +++ b/app-text/crqt-ng/crqt-ng-1.0.14.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PLOCALES="bg cs hu nl ru uk" +inherit cmake plocale xdg + +DESCRIPTION="Cross-platform e-book reader" +HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng" +SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" + +CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5" +RDEPEND="${CDEPEND}" +BDEPEND="${CDEPEND} + dev-qt/linguist-tools:5" + +src_prepare() { + cmake_src_prepare + xdg_environment_reset + + # locales + plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts' + sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \ + -i "${S}"/src/CMakeLists.txt \ + || die "sed CMakeLists.txt failed" +} + +src_configure() { + CMAKE_USE_DIR="${S}" + CMAKE_BUILD_TYPE="Release" + local mycmakeargs=(-DUSE_QT=QT5) + cmake_src_configure +} diff --git a/app-text/crqt-ng/metadata.xml b/app-text/crqt-ng/metadata.xml index 78b99b69d30d..3816f988544b 100644 --- a/app-text/crqt-ng/metadata.xml +++ b/app-text/crqt-ng/metadata.xml @@ -12,7 +12,7 @@ </maintainer> <longdescription lang="en"> A fork of coolreader Qt program. Supported formats are: fb2 (including fb2.zip), fb3, - epub (without DRM), rtf, doc, docx, odt, html, chm, pdb, mobi (without DRM), txt, trc, prc. + epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc. </longdescription> <use> <flag name="chm">Support chm format</flag> diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest index 3120086dcfd6..14942f26777b 100644 --- a/app-text/crwx-ng/Manifest +++ b/app-text/crwx-ng/Manifest @@ -1 +1 @@ -DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99 +DIST crwx-ng-0.3.1.tar.bz2 363898 BLAKE2B f44434014ec773c603f2497fd78236897e7988b46dc7697b2aaad7da6eb0a6334723bf6fd73b95960d835b762562fb809bc3aee6aa5ee06557b9fb442ef7aa07 SHA512 7f4c5de17ed32dc18aa7ef58f56090753c6fd4e87d3be6072ecb225f3339f1dacde8b54ec5b79bf031e3082067a00eb66008842248a819fe8c6af9eb6d080662 diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild index c362c9d43f6d..8d503c432457 100644 --- a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild +++ b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -WX_GTK_VER="3.0-gtk3" -inherit cmake wxwidgets +WX_GTK_VER="3.2-gtk3" +inherit cmake wxwidgets xdg DESCRIPTION="Cross-platform e-book reader" HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng" SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" -CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] +CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:${WX_GTK_VER}[X]" BDEPEND="${CDEPEND}" RDEPEND="${CDEPEND} virtual/ttf-fonts" -PATCHES=( "${FILESDIR}"/${P}.patch ) +pkg_prepare() { + setup-wxwidgets +} diff --git a/app-text/crwx-ng/files/crwx-ng-0.2.0.patch b/app-text/crwx-ng/files/crwx-ng-0.2.0.patch deleted file mode 100644 index f754ceb88d0b..000000000000 --- a/app-text/crwx-ng/files/crwx-ng-0.2.0.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 146f22a7c56a3402c75b4a51b8b1940144dfd9fd Mon Sep 17 00:00:00 2001 -From: Aleksey Chernov <valexlin@gmail.com> -Date: Tue, 27 Dec 2022 10:11:16 +0400 -Subject: [PATCH] Compile error/warn fixed. - ---- - src/cr3.cpp | 25 +++++++++++-------------- - 1 file changed, 11 insertions(+), 14 deletions(-) - -diff --git a/src/cr3.cpp b/src/cr3.cpp -index 19d5c4a..00e733b 100644 ---- a/src/cr3.cpp -+++ b/src/cr3.cpp -@@ -341,14 +341,17 @@ void testFormatting() { - LFormattedText txt; - void addLine(const lChar32* str, int flags, LVFontRef font) { - lString32 s(str); -- txt.AddSourceLine(s.c_str(), /* pointer to unicode text string */ -- s.length(), /* number of chars in text, 0 for auto(strlen) */ -- 0x000000, /* text color */ -- 0xFFFFFF, /* background color */ -- font.get(), /* font to draw string */ -- NULL, flags, 16, /* interline space, *16 (16=single, 32=double) */ -- 30, /* first line margin */ -- NULL, 0); -+ txt.AddSourceLine(s.c_str(), /* pointer to unicode text string */ -+ s.length(), /* number of chars in text, 0 for auto(strlen) */ -+ 0x000000, /* text color */ -+ 0xFFFFFF, /* background color */ -+ font.get(), /* font to draw string */ -+ NULL, /* pointer to text lang config */ -+ flags, /* flags */ -+ 16, /* line height in screen pixels; *16 (16=single, 32=double) */ -+ 0, /* drift y from baseline */ -+ 30, /* first line margin */ -+ NULL, 0, 0); - } - void dump() { - formatted_text_fragment_t* buf = txt.GetBuffer(); -@@ -1380,9 +1383,6 @@ void cr3Frame::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { - wxT(""), //const wxString& defaultFile = "", - wxT("All supported files|*.fb2;*.fbz;*.txt;*.zip;*.rtf;*.epub;*.tcr;*.html;*.htm;*.shtml;*.xhtml|FictionBook files (*.fb2)|*.fb2;*.fbz|RTF files (*.rtf)|*.rtf|Text files (*.txt, *.tcr)|*.txt;*.tcr|HTML files|*.html;*.htm;*.shtml;*.xhtml|EPUB files (*.epub)|*.epub|ZIP archieves (*.zip)|*.zip"), //const wxString& wildcard = "*.*", - wxFD_OPEN | wxFD_FILE_MUST_EXIST //long style = wxFD_DEFAULT_STYLE, -- //const wxPoint& pos = wxDefaultPosition, -- //const wxSize& sz = wxDefaultSize, -- //const wxString& name = "filedlg" - ); - - if (dlg.ShowModal() == wxID_OK) { -@@ -1410,9 +1410,6 @@ void cr3Frame::OnFileSave(wxCommandEvent& WXUNUSED(event)) { - wxT(""), //const wxString& defaultFile = "", - wxT("Wolf EBook files (*.wol)|*.wol"), //const wxString& wildcard = "*.*", - wxFD_SAVE | wxFD_OVERWRITE_PROMPT //long style = wxFD_DEFAULT_STYLE, -- //const wxPoint& pos = wxDefaultPosition, -- //const wxSize& sz = wxDefaultSize, -- //const wxString& name = "filedlg" - ); - WolOptions opts(this); - if (dlg.ShowModal() == wxID_OK && opts.ShowModal() == wxID_OK) { --- -2.38.2 - diff --git a/app-text/crwx-ng/metadata.xml b/app-text/crwx-ng/metadata.xml index 536740ef901b..8ff6a0b3b831 100644 --- a/app-text/crwx-ng/metadata.xml +++ b/app-text/crwx-ng/metadata.xml @@ -12,7 +12,7 @@ </maintainer> <longdescription lang="en"> A fork of coolreader wx program. Supported formats are: fb2 (including fb2.zip), fb3, - epub (without DRM), rtf, doc, docx, odt, html, chm, pdb, mobi (without DRM), txt, trc, prc. + epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc. </longdescription> <use> <flag name="chm">Support chm format</flag> diff --git a/app-text/cssmin/cssmin-0.2.0-r1.ebuild b/app-text/cssmin/cssmin-0.2.0-r1.ebuild index 9d989698550f..4ebe24c1333d 100644 --- a/app-text/cssmin/cssmin-0.2.0-r1.ebuild +++ b/app-text/cssmin/cssmin-0.2.0-r1.ebuild @@ -3,12 +3,17 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + inherit distutils-r1 pypi DESCRIPTION="Python port of the YUI CSS compression algorithm" -HOMEPAGE="https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin" +HOMEPAGE=" + https://pypi.org/project/cssmin/ + https://github.com/zacharyvoase/cssmin/ +" LICENSE="MIT BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 arm64 x86" diff --git a/app-text/cssmin/cssmin-0.2.0.ebuild b/app-text/cssmin/cssmin-0.2.0.ebuild deleted file mode 100644 index 074ed8583a55..000000000000 --- a/app-text/cssmin/cssmin-0.2.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 - -DESCRIPTION="Python port of the YUI CSS compression algorithm" -HOMEPAGE="https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT BSD" -SLOT="0" -KEYWORDS="amd64 x86" diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild index 16ad43b3ac40..f1c79faecb48 100644 --- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild +++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake flag-o-matic PV_MAJ=$(ver_cut 1-2) MY_P=${PN}-linux-${PV} -DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies" +DESCRIPTION="Enterprise quality OCR engine by Cognitive Technologies" HOMEPAGE="https://launchpad.net/cuneiform-linux" SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" @@ -22,8 +23,6 @@ RDEPEND=" graphicsmagick? ( media-gfx/graphicsmagick:= )" DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - PATCHES=( # From Fedora "${FILESDIR}"/${P}-c-assert.patch diff --git a/app-text/cwtext/cwtext-0.96-r1.ebuild b/app-text/cwtext/cwtext-0.96-r1.ebuild index 309da04a1ee4..3630180dbb93 100644 --- a/app-text/cwtext/cwtext-0.96-r1.ebuild +++ b/app-text/cwtext/cwtext-0.96-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit toolchain-funcs DESCRIPTION="Text to Morse Code converter" HOMEPAGE="http://cwtext.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12-r1.ebuild index ba104ee9d005..8ea4d20f5ee6 100644 --- a/app-text/dblatex/dblatex-0.3.12.ebuild +++ b/app-text/dblatex/dblatex-0.3.12-r1.ebuild @@ -3,7 +3,9 @@ EAPI="7" -PYTHON_COMPAT=( python3_{9,10} ) +# Breaks installation of /usr/bin/dblatex, bug #906788 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 @@ -13,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="inkscape test" RESTRICT="!test? ( test )" diff --git a/app-text/dblatex/dblatex-0.3.12-r2.ebuild b/app-text/dblatex/dblatex-0.3.12-r2.ebuild new file mode 100644 index 000000000000..cc17b55ab1a5 --- /dev/null +++ b/app-text/dblatex/dblatex-0.3.12-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +# Breaks installation of /usr/bin/dblatex, bug #906788 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 + +DESCRIPTION="Transform DocBook using TeX macros" +HOMEPAGE="http://dblatex.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="inkscape test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-text/docbook-xml-dtd:4.5 + dev-libs/kpathsea + dev-libs/libxslt + dev-libs/libxslt + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-mathscience + dev-texlive/texlive-pictures + dev-texlive/texlive-xetex + gnome-base/librsvg + media-gfx/imagemagick + >=media-gfx/fig2dev-3.2.9-r1 + inkscape? ( media-gfx/inkscape ) +" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND} + test? ( ~${CATEGORY}/${P} )" + +S="${WORKDIR}/${PN}3-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.11-path-logging.patch" + "${FILESDIR}/${PN}-0.3.11-setup.patch" + "${FILESDIR}/${PN}-0.3.11-encode.patch" +) + +python_prepare_all() { + # Manual page is precomressed, but we will use our own compression later. + gunzip docs/manpage/dblatex.1.gz || die + # If we dont have inkscape we need to use an alternative SVG converter + use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch" + # If we use inscape however we want to make dblatex compatible with v1.0 + use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch" + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + # Move package documentation to a folder name containing version number + mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die +} + +python_test_all() { + emake -C tests/mathml +} diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest index 875e659dd7c0..5f213c8909a8 100644 --- a/app-text/dictd/Manifest +++ b/app-text/dictd/Manifest @@ -1 +1,2 @@ DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439 +DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea diff --git a/app-text/dictd/dictd-1.13.0-r5.ebuild b/app-text/dictd/dictd-1.13.0-r7.ebuild index 4e67bcc3b9c6..92b0cb5bd7c5 100644 --- a/app-text/dictd/dictd-1.13.0-r5.ebuild +++ b/app-text/dictd/dictd-1.13.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit autotools readme.gentoo-r1 systemd DESCRIPTION="Dictionary Client/Server for the DICT protocol" HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/" -SRC_URI="mirror://sourceforge/dict/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz" LICENSE="GPL-1+ GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="dbi judy minimal test" RESTRICT="!test? ( test )" @@ -20,7 +20,7 @@ RDEPEND=" acct-group/dictd acct-user/dictd >=sys-apps/coreutils-6.10 - dev-libs/libmaa + dev-libs/libmaa:= sys-libs/zlib dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) @@ -28,7 +28,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-apps/gawk-3.1.6 - sys-devel/flex + app-alternatives/lex app-alternatives/yacc test? ( !~sys-apps/gawk-4.2.1 ) " diff --git a/app-text/dictd/dictd-1.13.0-r8.ebuild b/app-text/dictd/dictd-1.13.0-r8.ebuild new file mode 100644 index 000000000000..7e2ec11bfbac --- /dev/null +++ b/app-text/dictd/dictd-1.13.0-r8.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 systemd + +DESCRIPTION="Dictionary Client/Server for the DICT protocol" +HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/" +SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz" + +LICENSE="GPL-1+ GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="dbi judy minimal selinux test" +RESTRICT="!test? ( test )" + +# <gawk-3.1.6 makes tests fail. +RDEPEND=" + acct-group/dictd + acct-user/dictd + >=sys-apps/coreutils-6.10 + dev-libs/libmaa:= + sys-libs/zlib + dbi? ( dev-db/libdbi ) + judy? ( dev-libs/judy ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-apps/gawk-3.1.6 + app-alternatives/lex + app-alternatives/yacc + test? ( !~sys-apps/gawk-4.2.1 ) +" +RDEPEND+=" selinux? ( sec-policy/selinux-dictd )" + +DOC_CONTENTS=" + To start and use ${PN} you need to emerge at least one dictionary from + the app-dicts category with the package name starting with 'dictd-'. + To install all available dictionaries, emerge app-dicts/dictd-dicts. + ${PN} will NOT start without at least one dictionary.\n + \nIf you are running systemd, you will need to review the instructions + explained in /etc/dict/dictd.conf comments. +" + +PATCHES=( + "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch + "${FILESDIR}"/dictd-1.12.0-build.patch + "${FILESDIR}"/dictd-1.13.0-lex.patch + "${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535 + "${FILESDIR}"/dictd-1.13.0-version.patch # 852884 + "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # 908998 +) + +src_prepare() { + default + + sed -i -e 's:configure.in:configure.ac:' Makefile.in || die + eautoreconf +} + +src_configure() { + econf \ + $(use_with dbi plugin-dbi) \ + $(use_with judy plugin-judy) \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ + --sysconfdir="${EPREFIX}"/etc/dict +} + +src_compile() { + # -j1 for bug #743292 + + if use minimal; then + emake -j1 dictfmt dictzip dictzip + else + emake -j1 + fi +} + +src_test() { + use minimal && return 0 # All tests are for dictd which we don't build... + + if [[ ${EUID} -eq 0 ]]; then + # If dictd is run as root user (-userpriv) it drops its privileges to + # dictd user and group. Give dictd group write access to test directory. + chown :dictd "${WORKDIR}" "${S}/test" || die + chmod 770 "${WORKDIR}" "${S}/test" || die + fi + + emake -j1 test +} + +src_install() { + if use minimal; then + emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt + else + default + + # Don't install rfc2229.txt because it is non-free + dodoc doc/{dicf.ms,rfc.ms,rfc.sh} + dodoc doc/{security.doc,toc.ms} + dodoc -r examples + + # conf files. For dict.conf see below. + insinto /etc/dict + for f in dictd.conf site.info colorit.conf; do + doins "${FILESDIR}/1.10.11/${f}" + done + + # startups for dictd + newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd + newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd + systemd_dounit "${FILESDIR}"/${PN}.service + fi + + find "${ED}" -name '*.la' -o -name '*.a' -delete || die + + insinto /etc/dict + doins "${FILESDIR}"/1.10.11/dict.conf + + dodoc ANNOUNCE NEWS README TODO + + readme.gentoo_create_doc +} + +pkg_postinst() { + if has_version sys-apps/systemd; then + ewarn "The default location for dicts has changed! If you've modified your" + ewarn "systemd units locally to point into /usr/lib/dict, please update it" + ewarn "to point at /usr/share/dict now." + fi +} diff --git a/app-text/dictd/dictd-1.13.1.ebuild b/app-text/dictd/dictd-1.13.1.ebuild new file mode 100644 index 000000000000..72344073f076 --- /dev/null +++ b/app-text/dictd/dictd-1.13.1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 systemd + +DESCRIPTION="Dictionary Client/Server for the DICT protocol" +HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/" +SRC_URI="https://downloads.sourceforge.net/dict/${P}.tar.gz" + +LICENSE="GPL-1+ GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="dbi judy minimal selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/dictd + acct-user/dictd + >=sys-apps/coreutils-6.10 + dev-libs/libmaa:= + sys-libs/zlib + dbi? ( dev-db/libdbi ) + judy? ( dev-libs/judy ) +" +DEPEND="${RDEPEND}" +# <gawk-3.1.6 makes tests fail. +BDEPEND=" + >=sys-apps/gawk-3.1.6 + app-alternatives/lex + app-alternatives/yacc +" +RDEPEND+=" selinux? ( sec-policy/selinux-dictd )" + +DOC_CONTENTS=" + To start and use ${PN} you need to emerge at least one dictionary from + the app-dicts category with the package name starting with 'dictd-'. + To install all available dictionaries, emerge app-dicts/dictd-dicts. + ${PN} will NOT start without at least one dictionary.\n + \nIf you are running systemd, you will need to review the instructions + explained in /etc/dict/dictd.conf comments. +" + +PATCHES=( + "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch + "${FILESDIR}"/dictd-1.12.0-build.patch + "${FILESDIR}"/dictd-1.13.0-lex.patch + "${FILESDIR}"/dictd-1.13.0-libtool.patch # bug #818535 + "${FILESDIR}"/dictd-1.13.1-version.patch # bug #852884 + "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # bug #908998 +) + +src_prepare() { + default + + sed -i -e 's:configure.in:configure.ac:' Makefile.in || die + eautoreconf +} + +src_configure() { + econf \ + $(use_with dbi plugin-dbi) \ + $(use_with judy plugin-judy) \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ + --sysconfdir="${EPREFIX}"/etc/dict +} + +src_compile() { + # -j1 for bug #743292 + if use minimal; then + emake -j1 dictfmt dictzip dictzip + else + emake -j1 + fi +} + +src_test() { + use minimal && return 0 # All tests are for dictd which we don't build... + + if [[ ${EUID} -eq 0 ]]; then + # If dictd is run as root user (-userpriv) it drops its privileges to + # dictd user and group. Give dictd group write access to test directory. + chown :dictd "${WORKDIR}" "${S}/test" || die + chmod 770 "${WORKDIR}" "${S}/test" || die + fi + + emake -j1 test +} + +src_install() { + if use minimal; then + emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt + else + default + + # Don't install rfc2229.txt because it is non-free + dodoc doc/{dicf.ms,rfc.ms,rfc.sh} + dodoc doc/{security.doc,toc.ms} + dodoc -r examples + + # conf files. For dict.conf see below. + insinto /etc/dict + for f in dictd.conf site.info colorit.conf; do + doins "${FILESDIR}/1.10.11/${f}" + done + + # startups for dictd + newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd + newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd + systemd_dounit "${FILESDIR}"/${PN}.service + fi + + find "${ED}" -name '*.la' -o -name '*.a' -delete || die + + insinto /etc/dict + doins "${FILESDIR}"/1.10.11/dict.conf + + dodoc ANNOUNCE NEWS README TODO + + readme.gentoo_create_doc +} + +pkg_postinst() { + if has_version sys-apps/systemd; then + ewarn "The default location for dicts has changed! If you've modified your" + ewarn "systemd units locally to point into /usr/lib/dict, please update it" + ewarn "to point at /usr/share/dict now." + fi +} diff --git a/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch new file mode 100644 index 000000000000..e5747a6680af --- /dev/null +++ b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch @@ -0,0 +1,18 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611203 +https://bugs.gentoo.org/908998 +--- a/md5.h ++++ b/md5.h +@@ -1,11 +1,8 @@ + #ifndef MD5_H + #define MD5_H + +-#ifdef __alpha +-typedef unsigned int uint32; +-#else +-typedef unsigned long uint32; +-#endif ++#include <stdint.h> ++typedef uint32_t uint32; + + struct MD5Context { + uint32 buf[4]; diff --git a/app-text/dictd/files/dictd-1.13.1-version.patch b/app-text/dictd/files/dictd-1.13.1-version.patch new file mode 100644 index 000000000000..c0ef4f1f594e --- /dev/null +++ b/app-text/dictd/files/dictd-1.13.1-version.patch @@ -0,0 +1,65 @@ +https://bugs.gentoo.org/852884 + +From: orbea <orbea@riseup.net> +Date: Sat, 18 Jun 2022 10:00:21 -0700 +Subject: [PATCH] configure: Set version directly in AC_INIT + +This avoids a command not found error in config.status. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -20,7 +20,7 @@ + + # Add a _letter_ if you change the version number and release your own version. + # Numbers are for the original author(s) only. +-DICT_VERSION=@DICT_VERSION@ ++DICT_VERSION=@PACKAGE_VERSION@ + + ifneq (,) + This makefile requires GNU Make. +--- a/configure.in ++++ b/configure.in +@@ -23,14 +23,10 @@ dnl CFLAGS and LDFLAGS should be settable on the make commandline + dnl for optimization and stripping. + dnl LIBOBJS is an automatically-generated list of extra objects we need + +- +-define(VERSION, 1.13.1) +- +- + AC_PREREQ(2.53) + AC_REVISION($Revision: 1.144 $) + +-AC_INIT([dict],[VERSION],[dict-beta@dict.org]) ++AC_INIT([dict],[1.13.1],[dict-beta@dict.org]) + + AC_CONFIG_SRCDIR([dictd.c]) + AC_CONFIG_HEADER(config.h) +@@ -40,8 +36,6 @@ LT_INIT + echo Configuring for dict + echo . + +-DICT_VERSION=VERSION +- + AC_CANONICAL_HOST + + AC_PROG_CC +@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir` + LIBEXECDIR=`eval3 $libexecdir` + DATADIR=`eval3 $datadir` + +-AC_SUBST(DICT_VERSION) + AC_SUBST(USE_PLUGIN) + AC_SUBST(EXEEXT) + AC_SUBST(allsubdirs) +--- a/dictdplugin-config.in ++++ b/dictdplugin-config.in +@@ -24,7 +24,7 @@ while test $# -ne 0; do + usage + exit;; + --version) +- echo @DICT_VERSION@ ++ echo @PACKAGE_VERSION@ + exit;; + --libs) + echo -L@libdir@ diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml index d7d240c16242..0209b505f064 100644 --- a/app-text/dictd/metadata.xml +++ b/app-text/dictd/metadata.xml @@ -8,5 +8,6 @@ </use> <upstream> <remote-id type="sourceforge">dict</remote-id> + <remote-id type="github">cheusov/dictd</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest index 9486bceaf457..33086153aba7 100644 --- a/app-text/diff-pdf/Manifest +++ b/app-text/diff-pdf/Manifest @@ -1 +1 @@ -DIST diff-pdf-0.5.tar.gz 135755 BLAKE2B e4b9599b4f443171473ef483fe868c58e0a0c9f23838895aa08f1bd662c4df920fdb50277d2d0a5b28d5bb66054e700012a98be636a12d34ec919ad85d332cc0 SHA512 62a868118fc807b433e504edfefdc6a9598a8197aaf5cd4e46451b67d5d73fcf9234bd6efbe6307ed7c3821aabef8edea81cbb0bbe5f4d34365c5f8d6dd9a51d +DIST diff-pdf-0.5.1.tar.gz 142541 BLAKE2B db402ee9c0d3013b76b5e20381d661c572206bd834e5ec31824dc9f4aed08e0fcb1d57909b4a7490297c767aaf17efdd522ca4488c63a276ba6fb3f50e74b8b9 SHA512 8f2669da974912023208cdb538256ff979935d64e1f32d547da33d6c8231945ae555f6f85481ef36ec888d3ceda7fdfdddcfbd225f0a891c5f1613be6f249f4f diff --git a/app-text/diff-pdf/diff-pdf-0.5.ebuild b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild index 2ec1dc0bd7d4..1daaf8ab5b42 100644 --- a/app-text/diff-pdf/diff-pdf-0.5.ebuild +++ b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit wxwidgets DESCRIPTION="A simple tool for visually comparing two PDF files" diff --git a/app-text/diff-pdf/metadata.xml b/app-text/diff-pdf/metadata.xml index f2908ee10b59..1f67f7ee14fa 100644 --- a/app-text/diff-pdf/metadata.xml +++ b/app-text/diff-pdf/metadata.xml @@ -5,4 +5,8 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + + <upstream> + <remote-id type="github">vslavik/diff-pdf</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest index 943f936ff693..1aa7e0a68741 100644 --- a/app-text/discount/Manifest +++ b/app-text/discount/Manifest @@ -1,3 +1,3 @@ -DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806 DIST discount-2.2.7c.tar.gz 133282 BLAKE2B 3258cfa34d58ef5944ae5282f6df061b8183bccc1ca7f9f3a39b3c001a8b86a4deb86b80d109d937e334b2773e5065a0f6c212ac7a79317ce2ae665778a023e2 SHA512 2a959fb24d7291b3a8c6d659b5c904b8c2f8b6d9b0666e998ca5313533cc25898b9c2114f7922272f3bc6b9bfe4bc486fe08c620b4cb2a2282624e128dc92781 DIST discount-3.0.0a.tar.gz 140250 BLAKE2B 1e89f9c58c4d90157a9ccd925b89f098538c93191937e86eeefd32810e937feb78b6eeab96aead029fc35e4bf6699a40f67bdceb3c2d70fdc645fcd14091a3e7 SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a +DIST discount-3.0.0d.tar.gz 141531 BLAKE2B 723f0319d82ec240e7eed8c812278555066f092b3a764c332f8327f09cfc0420c6db18f0ab114f64b26a9fbd6f7374f309a892f53dd0f721c02741e849cd6562 SHA512 ab24722bb8513f64eed59bb2770276b91615033b494a0492a331f36c5fcd2e32b7a9f3bd7ef0bb74c107f1e0e955522c83ddba6c482fca7f18cf275334707c4d diff --git a/app-text/discount/discount-2.2.7c-r1.ebuild b/app-text/discount/discount-2.2.7c-r1.ebuild new file mode 100644 index 000000000000..1ff52d6de8b1 --- /dev/null +++ b/app-text/discount/discount-2.2.7c-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A Markdown-to HTML translator written in C" +HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" +SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/2.2.7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="minimal test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.7c-C99-fix.patch +) + +src_prepare() { + default + + # for QA, we remove the Makefile’s usage of install -s. + # Drop ldconfig invocation. + # Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS + # at that point). + sed -i \ + -e '/INSTALL_PROGRAM/s,\$_strip ,,' \ + -e 's/\(LDCONFIG=\).*/\1:/' \ + -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \ + configure.inc || die "sed configure.inc failed" +} + +src_configure() { + local configure_call=( + ./configure.sh + --libdir="${EPREFIX}/usr/$(get_libdir)" + --prefix="${EPREFIX}/usr" + --mandir="${EPREFIX}/usr/share/man" + --shared + --pkg-config + $(usex minimal '' --enable-all-features) + # Enable deterministic HTML generation behavior. Otherwise, will + # actually call rand() as part of its serialization code... + --debian-glitch + ) + einfo "Running ${configure_call[@]}" + CC="$(tc-getCC)" AR="$(tc-getAR)" \ + "${configure_call[@]}" || die +} + +src_compile() { + emake libmarkdown + emake +} + +src_install() { + emake \ + DESTDIR="${D}" \ + $(usex minimal install install.everything) \ + SAMPLE_PFX="${PN}-" +} + +pkg_postinst() { + if ! use minimal; then + elog 'Sample binaries with overly-generic names have been' + elog "prefixed with \"${PN}-\"." + fi +} diff --git a/app-text/discount/discount-2.2.7c.ebuild b/app-text/discount/discount-2.2.7c.ebuild index 6472ea525508..d10ba7694ad3 100644 --- a/app-text/discount/discount-2.2.7c.ebuild +++ b/app-text/discount/discount-2.2.7c.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/2.2.7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="minimal test" RESTRICT="!test? ( test )" diff --git a/app-text/discount/discount-2.2.7b.ebuild b/app-text/discount/discount-3.0.0d.ebuild index cbfe59ee5c39..c33b32489b4f 100644 --- a/app-text/discount/discount-2.2.7b.ebuild +++ b/app-text/discount/discount-3.0.0d.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,11 @@ inherit toolchain-funcs DESCRIPTION="A Markdown-to HTML translator written in C" HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" -SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2" +SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -SLOT="0/2.2.7" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" +SLOT="0/3.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="minimal test" RESTRICT="!test? ( test )" diff --git a/app-text/discount/files/discount-2.2.7c-C99-fix.patch b/app-text/discount/files/discount-2.2.7c-C99-fix.patch new file mode 100644 index 000000000000..b08d3d41f844 --- /dev/null +++ b/app-text/discount/files/discount-2.2.7c-C99-fix.patch @@ -0,0 +1,38 @@ +FROM: https://github.com/Orc/discount/issues/283 +FROM: Atri Bhattacharya <badshah400@gmail.com> + +--- a/main.c ++++ b/main.c +@@ -100,14 +100,15 @@ free_it(char *object, void *ctx) + } + + char * +-external_codefmt(char *src, int len, char *lang) ++external_codefmt(const char *src, const int len, void *lang) + { + int extra = 0; + int i, x; + char *res; ++ char *ec_lang = (char *)lang; + +- if ( lang == 0 ) +- lang = "generic_code"; ++ if ( ec_lang == 0 ) ++ ec_lang = "generic_code"; + + for ( i=0; i < len; i++) { + if ( src[i] == '&' ) +@@ -117,11 +118,11 @@ external_codefmt(char *src, int len, cha + } + + /* 80 characters for the format wrappers */ +- if ( (res = malloc(len+extra+80+strlen(lang))) ==0 ) ++ if ( (res = malloc(len+extra+80+strlen(ec_lang))) ==0 ) + /* out of memory? drat! */ + return 0; + +- sprintf(res, "<pre><code class=\"%s\">\n", lang); ++ sprintf(res, "<pre><code class=\"%s\">\n", ec_lang); + x = strlen(res); + for ( i=0; i < len; i++ ) { + switch (src[i]) { diff --git a/app-text/djview/djview-4.10.6-r2.ebuild b/app-text/djview/djview-4.10.6-r2.ebuild index 89ea0c6b9f2b..afe3918dd9d5 100644 --- a/app-text/djview/djview-4.10.6-r2.ebuild +++ b/app-text/djview/djview-4.10.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,10 +6,10 @@ EAPI=7 inherit autotools desktop flag-o-matic qmake-utils toolchain-funcs xdg-utils DESCRIPTION="Portable DjVu viewer using Qt" -HOMEPAGE="http://djvu.sourceforge.net/djview4.html" -SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz" +HOMEPAGE="https://djvu.sourceforge.net/djview4.html" +SRC_URI="https://downloads.sourceforge.net/djvu/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="debug" @@ -25,7 +25,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" dev-qt/linguist-tools:5 - >=sys-devel/autoconf-2.67 + >=dev-build/autoconf-2.67 virtual/pkgconfig" DOCS=( README NEWS ) diff --git a/app-text/djvu/djvu-3.5.28-r3.ebuild b/app-text/djvu/djvu-3.5.28-r3.ebuild index f95282fac537..fb2851ba987e 100644 --- a/app-text/djvu/djvu-3.5.28-r3.ebuild +++ b/app-text/djvu/djvu-3.5.28-r3.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop flag-o-matic optfeature xdg +inherit autotools flag-o-matic optfeature xdg MY_P="${PN}libre-${PV#*_p}" DESCRIPTION="DjVu viewers, encoders and utilities" -HOMEPAGE="http://djvu.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz" +HOMEPAGE="https://djvu.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/djvu/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P%%.3}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug doc jpeg tiff xml" RDEPEND="jpeg? ( media-libs/libjpeg-turbo:= ) diff --git a/app-text/djvu/djvu-3.5.28-r4.ebuild b/app-text/djvu/djvu-3.5.28-r4.ebuild new file mode 100644 index 000000000000..fefb78cad008 --- /dev/null +++ b/app-text/djvu/djvu-3.5.28-r4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic optfeature xdg + +MY_P="${PN}libre-${PV#*_p}" +DESCRIPTION="DjVu viewers, encoders and utilities" +HOMEPAGE="https://djvu.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/djvu/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P%%.3}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug doc jpeg tiff xml" + +RDEPEND="jpeg? ( media-libs/libjpeg-turbo:= ) + tiff? ( media-libs/tiff:= )" +DEPEND="${RDEPEND}" + +# inkscape/rsvg-convert are used to generate icons at build-time only +BDEPEND="app-arch/unzip + || ( gnome-base/librsvg media-gfx/inkscape )" + +DOCS=( NEWS README ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5.28-drop-register-keyword-clang16.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY" + + # We install all desktop files by hand. + econf \ + $(use_enable xml xmltools) \ + $(use_with jpeg) \ + $(use_with tiff) \ + --disable-desktopfiles +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + use doc && dodoc -r doc + + # Install desktop files. + cd desktopfiles || die + for i in {22,32,48,64}; do + insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes + newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png + done + + insinto /usr/share/mime/packages + doins djvulibre-mime.xml +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "djviewer or browser plugin" app-text/djview +} diff --git a/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch b/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch new file mode 100644 index 000000000000..dd86bb8bf130 --- /dev/null +++ b/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch @@ -0,0 +1,21 @@ +Bug: https://bugs.gentoo.org/894644 +--- a/libdjvu/GBitmap.h ++++ b/libdjvu/GBitmap.h +@@ -620,7 +620,7 @@ GBitmap::euclidian_ratio(int a, int b, int &q, int &r) + inline int + GBitmap::read_run(unsigned char *&data) + { +- register int z=*data++; ++ int z=*data++; + return (z>=RUNOVERFLOWVALUE)? + ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; + } +@@ -628,7 +628,7 @@ GBitmap::read_run(unsigned char *&data) + inline int + GBitmap::read_run(const unsigned char *&data) + { +- register int z=*data++; ++ int z=*data++; + return (z>=RUNOVERFLOWVALUE)? + ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z; + } diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild index 3bb7a6a274d7..c0b21e971bcf 100644 --- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild +++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$ LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" RDEPEND=" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild index e22f103cf285..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild index e22f103cf285..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild index e22f103cf285..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild index c97fe2e17741..65ff439e368d 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild index 1224a947fd14..741061d98573 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild index ff5b1be547c3..58e75c67fd66 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild index cf1e1f19c87a..7fe768242249 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild index 002eebef8a0f..d1f6ad4d7933 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" BDEPEND=">=app-arch/unzip-5.41" diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild index 43f3d58d7e5c..34fc413680d8 100644 --- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild +++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,6 @@ DEPEND=">=dev-lang/perl-5 ~app-text/docbook-sgml-dtd-4.4 ~app-text/docbook-xml-simple-dtd-1.0 ~app-text/docbook-xml-simple-dtd-4.1.2.4 - sys-apps/which jadetex? ( dev-texlive/texlive-formatsextra ) || ( www-client/lynx @@ -43,10 +42,16 @@ RDEPEND="${DEPEND}" # including both xml-simple-dtd 4.1.2.4 and 1.0, to ease # transition to simple-dtd 1.0, <obz@gentoo.org> +PATCHES=( + "${FILESDIR}"/${MY_P}-elinks.patch + "${FILESDIR}"/${P}-grep-2.7.patch + + # drop dependency on sys-apps/which + "${FILESDIR}"/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch +) + src_prepare() { default - eapply "${FILESDIR}"/${MY_P}-elinks.patch - eapply "${FILESDIR}"/${P}-grep-2.7.patch if use prefix; then eapply "${FILESDIR}"/${MY_P}-prefix.patch eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in diff --git a/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch b/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch new file mode 100644 index 000000000000..764d06ad4d78 --- /dev/null +++ b/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch @@ -0,0 +1,90 @@ +From a5956fccad44bed98b5de22a6169e0aa098d169f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 4 Mar 2024 18:16:32 -0500 +Subject: [PATCH] Migrate from 1998 style "which progname" lookup to command -v + +The "which" utility is not guaranteed to be installed either, and if it +is, its behavior is not portable either. This means that when sgml tools +are installed, the `which` check will report a fatal error because the +which tool did not exist and the shell returned a nonzero status when +attempting to fork+exec. If it did exist, it might not be an +implementation of `which` that returns nonzero when commands do not +exist. + +The general scripting suggestion is to use the "command -v" shell +builtin that is required to exist in all POSIX 2008 compliant shells, +and is thus guaranteed to work everywhere. + +For some in-depth discussions on the topic, see: +- https://mywiki.wooledge.org/BashFAQ/081 +- https://unix.stackexchange.com/questions/85249/why-not-use-which-what-to-use-then/85250#85250 + +Examples of open-source shells likely to be installed as /bin/sh on +Linux, which implement the 15-year-old standard: ash, bash, busybox, +dash, ksh, mksh and zsh. + +However, in this case there's a pretty good exuse for not using a 2008 +standard. The docbook-utils project is dead since 2004. So we patch it +(and scratch our heads about where to try sending patches). + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + bin/jw.in | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/bin/jw.in b/bin/jw.in +index 4bfb312..82bd497 100644 +--- a/bin/jw.in ++++ b/bin/jw.in +@@ -58,8 +58,7 @@ SGML_ERRORS_LIST="\n\ + \040 no-valid \t Do not require the document to be type-valid" + + # Get name of main SGML configuration file +-which sgmlwhich >/dev/null 2>/dev/null +-if [ $? -eq 0 ] ++if command -v sgmlwhich >/dev/null + then + SGML_CONF=`sgmlwhich` + else +@@ -296,10 +295,10 @@ fi + # Try to find the SGML normalizer + if [ -z "$SGML_NORM" ] + then +- SGML_NORM=`which sgmlnorm 2>/dev/null` ++ SGML_NORM=`command -v sgmlnorm` + if [ -z "SGML_NORM" ] + then +- SGML_NORM=`which osgmlnorm 2>/dev/null` ++ SGML_NORM=`command -v osgmlnorm` + fi + fi + +@@ -376,13 +375,11 @@ esac + # Choose a parser + if [ -z "$SGML_JADE" ] + then +- which jade >/dev/null 2>/dev/null +- if [ $? -eq 0 ] ++ if command -v jade >/dev/null + then + SGML_JADE="jade" + else +- which openjade >/dev/null 2>/dev/null +- if [ $? -eq 0 ] ++ if command -v openjade >/dev/null + then + SGML_JADE="openjade" + else +@@ -391,8 +388,7 @@ then + fi + fi + else +- which $SGML_JADE >/dev/null 2>/dev/null +- if [ $? -ne 0 ] ++ if ! command -v $SGML_JADE >/dev/null + then + echo "`basename $0`: parser $SGML_JADE is not available" >&2 + exit 6 +-- +2.43.0 + diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild index 6c957cfa7620..41625f30b9c0 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild index c173cd212615..42302b037952 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild index c173cd212615..42302b037952 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild index c94e3db4beae..b2e0f454ced5 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild index c94e3db4beae..b2e0f454ced5 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild index cc284bad92d7..71de3e3219bb 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=app-text/build-docbook-catalog-1.6" diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild index 22309833e00b..2b4d5848456a 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=app-text/build-docbook-catalog-1.6" diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild index 2b4ddeebe068..8e741cbb347c 100644 --- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild +++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=app-text/build-docbook-catalog-1.6" diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild index 1db6f61cf189..fbf2961b212f 100644 --- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild +++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="XSL Stylesheets for Docbook" HOMEPAGE="https://github.com/docbook/wiki/wiki" -SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/docbook/${MY_P}.tar.bz2" LICENSE="BSD" SLOT="0" diff --git a/app-text/docbook-xsl-ns-stylesheets/metadata.xml b/app-text/docbook-xsl-ns-stylesheets/metadata.xml index 385cd4b9beb4..19ad17418de9 100644 --- a/app-text/docbook-xsl-ns-stylesheets/metadata.xml +++ b/app-text/docbook-xsl-ns-stylesheets/metadata.xml @@ -11,5 +11,6 @@ <stabilize-allarches/> <upstream> <remote-id type="sourceforge">docbook</remote-id> + <remote-id type="github">docbook/wiki</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild index 5a7b57f763db..bccf505ec522 100644 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby27 ruby30" +USE_RUBY="ruby30 ruby31" inherit ruby-single DOCBOOKDIR="/usr/share/sgml/${PN/-//}" @@ -12,19 +12,19 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="XSL Stylesheets for Docbook" HOMEPAGE="https://github.com/docbook/wiki/wiki" -SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/docbook/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ruby" # Makefile is broken since 1.76.0 RESTRICT="test" RDEPEND=" >=app-text/build-docbook-catalog-1.1 - ruby? ( ${RUBY_DEPS} ) + ruby? ( ${RUBY_DEPS} dev-ruby/rexml ) " PATCHES=( diff --git a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml index e170e24574ba..0e1b0dec14df 100644 --- a/app-text/docbook-xsl-stylesheets/metadata.xml +++ b/app-text/docbook-xsl-stylesheets/metadata.xml @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="sourceforge">docbook</remote-id> + <remote-id type="github">docbook/wiki</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild index b3d97459e00e..463c7d258a8c 100644 --- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild +++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ EAPI=7 inherit autotools DESCRIPTION="Tools to convert docbook to man and info" -SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/docbook2x/${P}.tar.gz" HOMEPAGE="http://docbook2x.sourceforge.net/" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" LICENSE="MIT" diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild index 5b437b5ef590..40749129b011 100644 --- a/app-text/docx2txt/docx2txt-1.4.ebuild +++ b/app-text/docx2txt/docx2txt-1.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Convert MS Office docx files to plain text" HOMEPAGE="http://docx2txt.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest index 416a8a8c6ee1..c3777c9a88a1 100644 --- a/app-text/dos2unix/Manifest +++ b/app-text/dos2unix/Manifest @@ -1,2 +1,2 @@ -DIST dos2unix-7.4.3.tar.gz 788278 BLAKE2B da959b06e583bbf27a2cb2ce5b1f1a41380722aa09ac75b3d31260e92fd6f1203d87266d3a12201b036a69796b4aa4f23718741036e20fe686801bb368fbde22 SHA512 1c6d81348de8aca451174794141d0802685487cf6847fa91f7de745d89bcf2af864fc2ec549b9af72031891d4efcb9731fe823ce05da36d1f9e9890ff2cb60fb -DIST dos2unix-7.4.4.tar.gz 914647 BLAKE2B eb8d33344780bb15201eed571d7a6a21db0bc13e8e94388c70e1daea84cc0d1dfb9f16b7ed1cd216bb31ffd84dee706e7f2fb46050a299602f7c67c53915ded9 SHA512 e7a6b1d90bf0a32aa53b22caa1660dcf58c5874d02a45e80f4cc811cae9bd7b0cb8144301fb6808798100a057c03210925da1d8461e380dff1059f6bee086f55 +DIST dos2unix-7.5.0.tar.gz 957576 BLAKE2B 5a674d61c9f911a2cb9c20c363fdc0e0affd3b6f26531d37a231aedb5e6a7428116b139d4af12ee32f4107f78ea079fb7a8d008c9630375f4afbc2afa0afb39f SHA512 914cbc3255045b1b87ad702c70844b059f9435ccfe636dc67514f092090b86a9f271789fcde28a9ead4d94a869fb92e334aa115d3cfe24133338260ad2233763 +DIST dos2unix-7.5.1.tar.gz 959228 BLAKE2B 4f4a334a295b702d0540e58a0a86dcf091583d6c2b64f6de9bea883dfe0d70bfa05e8e5b9c8fb867bfd5e66b2eba562da1ca45c60f97bac67bdb275d66de0fe0 SHA512 733d163fff4effdf8acb382abec9bcd23f594fa17502e9dde2f24d3326aeb7653eee353bef812090ab8dc055136d236b40c2f778deea4ac026c2eed471e763b5 diff --git a/app-text/dos2unix/dos2unix-7.4.4.ebuild b/app-text/dos2unix/dos2unix-7.5.0.ebuild index 50b9c020604b..83e99979e445 100644 --- a/app-text/dos2unix/dos2unix-7.4.4.ebuild +++ b/app-text/dos2unix/dos2unix-7.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,14 +11,14 @@ DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa" HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/" SRC_URI=" https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz - mirror://sourceforge/${PN}/${P/_/-}.tar.gz + https://downloads.sourceforge.net/${PN}/${P/_/-}.tar.gz " S="${WORKDIR}/${P/_/-}" LICENSE="BSD-2" SLOT="0" [[ "${PV}" == *_beta* ]] || \ -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug nls test" RDEPEND=" diff --git a/app-text/dos2unix/dos2unix-7.4.3.ebuild b/app-text/dos2unix/dos2unix-7.5.1.ebuild index bc7cc8179d7a..83e99979e445 100644 --- a/app-text/dos2unix/dos2unix-7.4.3.ebuild +++ b/app-text/dos2unix/dos2unix-7.5.1.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW" +PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW" inherit plocale toolchain-funcs DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa" -HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/" +HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/" SRC_URI=" - http://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz - mirror://sourceforge/${PN}/${P/_/-}.tar.gz" + https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz + https://downloads.sourceforge.net/${PN}/${P/_/-}.tar.gz +" S="${WORKDIR}/${P/_/-}" LICENSE="BSD-2" SLOT="0" [[ "${PV}" == *_beta* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug nls test" RDEPEND=" diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest new file mode 100644 index 000000000000..0a55723b880d --- /dev/null +++ b/app-text/doxygen/Manifest @@ -0,0 +1,2 @@ +DIST doxygen-1.10.0.src.tar.gz 8400410 BLAKE2B dc7882dfb8b023e9250592375105cc79d4744362d96f4518b931ac264259257d27e0f2c5456580f3676bb54cc29fbc2ab3b2ffc37da6441297091c60a38dc13b SHA512 885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416 +DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb diff --git a/app-text/doxygen/doxygen-1.10.0-r1.ebuild b/app-text/doxygen/doxygen-1.10.0-r1.ebuild new file mode 100644 index 000000000000..38eafa53a490 --- /dev/null +++ b/app-text/doxygen/doxygen-1.10.0-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=17 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic llvm python-any-r1 + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.nl/" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" +else + SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz" + SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +# GPL-2 also for bundled libmscgen +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch gui test" +# - We need TeX for tests, bug #765472 +# - We keep the odd construct of noop USE=test because of +# the special relationship b/t RESTRICT & USE for tests. +# Also, it's a hint which avoids tests being silently skipped during arch testing. +REQUIRED_USE="test? ( doc )" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + ${PYTHON_DEPS} +" +RDEPEND=" + app-text/ghostscript-gpl + dev-db/sqlite:3 + dev-lang/perl + dev-libs/libfmt:= + dev-libs/spdlog:= + media-libs/libpng:= + virtual/libiconv + clang? ( + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) + doxysearch? ( dev-libs/xapian:= ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch" + "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch" + + # Backports +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + # TODO: Investigate this and report a bug accordingly... + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen. Using -O2 instead." + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + # Very slow to compile, bug #920092 + filter-flags -fipa-pta + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + + local mycmakeargs=( + -Duse_libclang=$(usex clang) + # Let the user choose instead, see also bug #822615 + -Duse_libc++=OFF + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex gui) + -Duse_sys_spdlog=ON + -Duse_sys_sqlite3=ON + -DBUILD_SHARED_LIBS=OFF + -DGIT_EXECUTABLE="false" + ) + + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {testing/Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + + # -j1 for bug #770070 + cmake_src_compile docs -j1 + fi +} + +src_install() { + cmake_src_install + + # manpages are only automatically installed when docs are + # https://github.com/doxygen/doxygen/pull/10647 + doman doc/doxygen.1 + use gui && doman doc/doxywizard.1 + use doxysearch && { + doman doc/doxyindexer.1 + doman doc/doxysearch.1 + } +} diff --git a/app-text/doxygen/doxygen-1.9.8.ebuild b/app-text/doxygen/doxygen-1.9.8.ebuild new file mode 100644 index 000000000000..31e26890494b --- /dev/null +++ b/app-text/doxygen/doxygen-1.9.8.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=17 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic llvm python-any-r1 + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.nl/" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" +else + SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz" + SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +# GPL-2 also for bundled libmscgen +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch gui test" +# - We need TeX for tests, bug #765472 +# - We keep the odd construct of noop USE=test because of +# the special relationship b/t RESTRICT & USE for tests. +# Also, it's a hint which avoids tests being silently skipped during arch testing. +REQUIRED_USE="test? ( doc )" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + ${PYTHON_DEPS} +" +RDEPEND=" + app-text/ghostscript-gpl + dev-db/sqlite:3 + dev-lang/perl + dev-libs/libfmt:= + dev-libs/spdlog:= + media-libs/libpng:= + virtual/libiconv + clang? ( + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) + doxysearch? ( dev-libs/xapian:= ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch" + "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch" + + # Backports + "${FILESDIR}/${P}-spdlog-link.patch" + "${FILESDIR}/${P}-unbundle-sqlite.patch" +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + # TODO: Investigate this and report a bug accordingly... + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen. Using -O2 instead." + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + # Very slow to compile, bug #920092 + filter-flags -fipa-pta + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + + local mycmakeargs=( + -Duse_libclang=$(usex clang) + # Let the user choose instead, see also bug #822615 + -Duse_libc++=OFF + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex gui) + -Duse_sys_spdlog=ON + -Duse_sys_sqlite3=ON + -DBUILD_SHARED_LIBS=OFF + -DGIT_EXECUTABLE="false" + ) + + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {testing/Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + + # -j1 for bug #770070 + cmake_src_compile docs -j1 + fi +} + +src_install() { + cmake_src_install + + doman doc/*.1 +} diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild new file mode 100644 index 000000000000..563834fb7d62 --- /dev/null +++ b/app-text/doxygen/doxygen-9999.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=17 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic llvm python-any-r1 + +DESCRIPTION="Documentation system for most programming languages" +HOMEPAGE="https://www.doxygen.nl/" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" +else + SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz" + SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +# GPL-2 also for bundled libmscgen +LICENSE="GPL-2" +SLOT="0" +IUSE="clang debug doc dot doxysearch gui test" +# - We need TeX for tests, bug #765472 +# - We keep the odd construct of noop USE=test because of +# the special relationship b/t RESTRICT & USE for tests. +# Also, it's a hint which avoids tests being silently skipped during arch testing. +REQUIRED_USE="test? ( doc )" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + ${PYTHON_DEPS} +" +RDEPEND=" + app-text/ghostscript-gpl + dev-db/sqlite:3 + dev-lang/perl + dev-libs/libfmt:= + dev-libs/spdlog:= + media-libs/libpng:= + virtual/libiconv + clang? ( + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + ) + dot? ( + media-gfx/graphviz + media-libs/freetype + ) + doc? ( + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-plaingeneric + ) + doxysearch? ( dev-libs/xapian:= ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" + "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch" + "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch" + + # Backports +) + +DOCS=( LANGUAGE.HOWTO README.md ) + +pkg_setup() { + use clang && llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 + sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die + + # fix pdf doc + sed -i.orig -e "s:g_kowal:g kowal:" \ + doc/maintainers.txt || die + + if is-flagq "-O3" ; then + # TODO: Investigate this and report a bug accordingly... + ewarn "Compiling with -O3 is known to produce incorrectly" + ewarn "optimized code which breaks doxygen. Using -O2 instead." + replace-flags "-O3" "-O2" + fi +} + +src_configure() { + # Very slow to compile, bug #920092 + filter-flags -fipa-pta + # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287 + filter-lto + + local mycmakeargs=( + -Duse_libclang=$(usex clang) + # Let the user choose instead, see also bug #822615 + -Duse_libc++=OFF + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex gui) + -Duse_sys_spdlog=ON + -Duse_sys_sqlite3=ON + -DBUILD_SHARED_LIBS=OFF + -DGIT_EXECUTABLE="false" + ) + + use doc && mycmakeargs+=( + -DDOC_INSTALL_DIR="share/doc/${P}" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + export VARTEXFONTS="${T}/fonts" # bug #564944 + + if ! use dot; then + sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ + {testing/Doxyfile,doc/Doxyfile} \ + || die "disabling dot failed" + fi + + # -j1 for bug #770070 + cmake_src_compile docs -j1 + fi +} + +src_install() { + cmake_src_install + + doman doc/*.1 +} diff --git a/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch b/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch new file mode 100644 index 000000000000..66093eb7deb9 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch @@ -0,0 +1,24 @@ +diff --git a/addon/doxywizard/.CMakeLists.txt.swp b/addon/doxywizard/.CMakeLists.txt.swp +deleted file mode 100644 +index fc379d2..0000000 +Binary files a/addon/doxywizard/.CMakeLists.txt.swp and /dev/null differ +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index bb0e0eb..b6135bd 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -132,12 +132,12 @@ apply_editbin(doxywizard windows) + endif() + + if(Qt5Core_FOUND) +- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version) ++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread) + else() + if(Qt6Core_FOUND) +- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version) ++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread) + else() +- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version) ++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread) + endif() + endif() + diff --git a/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch b/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch new file mode 100644 index 000000000000..2c71a0af9ae8 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/906920 +https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17 + +From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Thu, 25 May 2023 10:52:29 +0200 +Subject: [PATCH] Apply upstream fix for spdlog + +Fixes the build with musl >= 1.2.4, see +https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96 +for details. +--- a/deps/spdlog/include/spdlog/details/os-inl.h ++++ b/deps/spdlog/include/spdlog/details/os-inl.h +@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f) + # else + int fd = ::fileno(f); + # endif +-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated) +-# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) ++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated) ++# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) + struct stat64 st; + if (::fstat64(fd, &st) == 0) + { +-- +2.41.0.rc2 diff --git a/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch b/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch new file mode 100644 index 000000000000..e73385dec3b2 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch @@ -0,0 +1,51 @@ +https://github.com/doxygen/doxygen/issues/10265 +https://github.com/doxygen/doxygen/pull/10284 + +From 70bb112352ae7f3130647dcc009d8de5d4134e6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= + =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com> +Date: Mon, 4 Sep 2023 18:49:27 +0100 +Subject: [PATCH 1/2] doxyapp: Fix linking to spdlog + +--- + addon/doxyapp/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index 4f3c31feacd..6097a3cca69 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -46,7 +46,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-spdlog ++spdlog::spdlog + ${ICONV_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + +From 71f2ed171a6d14a67f1905802714add974c31789 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= + =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com> +Date: Mon, 4 Sep 2023 18:50:25 +0100 +Subject: [PATCH 2/2] doxyparse: Fix linking to spdlog + +--- + addon/doxyparse/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index 24881e3ef12..0157afb45e2 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -35,7 +35,7 @@ mscgen + doxygen_version + doxycfg + vhdlparser +-spdlog ++spdlog::spdlog + ${ICONV_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${SQLITE3_LIBRARIES} + diff --git a/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch b/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch new file mode 100644 index 000000000000..1da9a2da6459 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch @@ -0,0 +1,16 @@ +Always expose the use_libc++ option. It's only useful for Clang but cmake.class +tries to find when we've used CMake options which are unused/unknown and this +triggers it for GCC builds if we set -Duse_libc++=OFF. + +So, always expose the option so we can turn it off without a warning. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ option(build_xmlparser "Automatically update the XML parser modules when updatin + option(build_search "Build external search tools (doxysearch and doxyindexer)" OFF) + option(build_doc "Build user manual (HTML and PDF)" OFF) + option(build_doc_chm "Build user manual (CHM)" OFF) +-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if (TRUE) + option(use_libc++ "Use libc++ as C++ standard library." ON) + endif() + option(use_libclang "Add support for libclang parsing." OFF) diff --git a/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch b/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch new file mode 100644 index 000000000000..04d1d69b7b86 --- /dev/null +++ b/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch @@ -0,0 +1,119 @@ +https://github.com/doxygen/doxygen/issues/10263 +https://github.com/doxygen/doxygen/commit/28609fecd41d885e54fa170e499a0e5b55def2c2 + +From 28609fecd41d885e54fa170e499a0e5b55def2c2 Mon Sep 17 00:00:00 2001 +From: Dimitri van Heesch <doxygen@gmail.com> +Date: Mon, 28 Aug 2023 20:19:16 +0200 +Subject: [PATCH] issue #10263 please add a use_sys_sqlite3 config option + +--- + CMakeLists.txt | 6 +++++- + cmake/FindSQLite3.cmake | 38 ++++++++++++++++++++++++++++++++++++++ + deps/CMakeLists.txt | 4 +++- + src/CMakeLists.txt | 4 +++- + 4 files changed, 49 insertions(+), 3 deletions(-) + create mode 100644 cmake/FindSQLite3.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4957c34c24d..31e53cc8440 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + option(use_libc++ "Use libc++ as C++ standard library." ON) + endif() + option(use_libclang "Add support for libclang parsing." OFF) +-option(use_sys_spdlog "Use system spdlog instead of bundled." OFF) ++option(use_sys_spdlog "Use system spdlog library instead of the one bundled." OFF) ++option(use_sys_sqlite3 "Use system sqlite3 library instead of the one bundled." OFF) + option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF) + option(win_static "Link with /MT in stead of /MD on windows" OFF) + option(enable_console "Enable that executables on Windows get the CONSOLE bit set for the doxywizard executable [development]" OFF) +@@ -67,6 +68,9 @@ endif() + if (use_sys_spdlog) + find_package(spdlog CONFIG REQUIRED) + endif() ++if (use_sys_sqlite3) ++ find_package(SQLite3 REQUIRED) ++endif() + if (build_wizard) + if (force_qt STREQUAL "Qt6") + if (CMAKE_SYSTEM MATCHES "Darwin") +diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake +new file mode 100644 +index 00000000000..7c21de223a7 +--- /dev/null ++++ b/cmake/FindSQLite3.cmake +@@ -0,0 +1,38 @@ ++# Copyright (C) 2007-2009 LuaDist. ++# Created by Peter Kapec <kapecp@gmail.com> ++# Redistribution and use of this file is allowed according to the terms of the MIT license. ++# For details see the COPYRIGHT file distributed with LuaDist. ++# Note: ++# Searching headers and libraries is very simple and is NOT as powerful as scripts ++# distributed with CMake, because LuaDist defines directories to search for. ++# Everyone is encouraged to contact the author with improvements. Maybe this file ++# becomes part of CMake distribution sometimes. ++ ++# - Find sqlite3 ++# Find the native SQLite3 headers and libraries. ++# ++# SQLite3_INCLUDE_DIRS - where to find sqlite3.h, etc. ++# SQLite3_LIBRARIES - List of libraries when using sqlite. ++# SQLite3_FOUND - True if sqlite found. ++ ++# Look for the header file. ++FIND_PATH(SQLite3_INCLUDE_DIR NAMES sqlite3.h) ++ ++# Look for the library. ++FIND_LIBRARY(SQLite3_LIBRARY NAMES sqlite3) ++ ++# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE. ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLite3 DEFAULT_MSG SQLite3_LIBRARY SQLite3_INCLUDE_DIR) ++ ++# Copy the results to the output variables. ++IF(SQLite3_FOUND) ++ SET(SQLite3_LIBRARIES ${SQLite3_LIBRARY}) ++ SET(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR}) ++ELSE(SQLite3_FOUND) ++ SET(SQLite3_LIBRARIES) ++ SET(SQLite3_INCLUDE_DIRS) ++ENDIF(SQLite3_FOUND) ++ ++MARK_AS_ADVANCED(SQLite3_INCLUDE_DIRS SQLite3_LIBRARIES) ++ +diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt +index a689b4a7018..eb716417f22 100644 +--- a/deps/CMakeLists.txt ++++ b/deps/CMakeLists.txt +@@ -4,4 +4,6 @@ add_subdirectory(libmscgen) + if (NOT use_sys_spdlog) + add_subdirectory(spdlog) + endif() +-add_subdirectory(sqlite3) ++if (NOT use_sys_sqlite3) ++ add_subdirectory(sqlite3) ++endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78a55c3f2bf..02c52240e5b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -6,7 +6,6 @@ include_directories( + ${PROJECT_SOURCE_DIR}/deps/libmd5 + ${PROJECT_SOURCE_DIR}/deps/liblodepng + ${PROJECT_SOURCE_DIR}/deps/libmscgen +- ${PROJECT_SOURCE_DIR}/deps/sqlite3 + ${PROJECT_SOURCE_DIR}/libversion + ${PROJECT_SOURCE_DIR}/libxml + ${PROJECT_SOURCE_DIR}/vhdlparser +@@ -18,6 +17,9 @@ include_directories( + if (NOT use_sys_spdlog) + include_directories(${PROJECT_SOURCE_DIR}/deps/spdlog/include) + endif() ++if (NOT use_sys_sqlite) ++ include_directories(${PROJECT_SOURCE_DIR}/deps/sqlite3) ++endif() + + + file(MAKE_DIRECTORY ${GENERATED_SRC}) + diff --git a/app-text/doxygen/metadata.xml b/app-text/doxygen/metadata.xml new file mode 100644 index 000000000000..1a7e4e52585a --- /dev/null +++ b/app-text/doxygen/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <longdescription> + Doxygen is a tool for analyzing, documenting, and reverse-engineering + source code of various languages using a variety of output formats + (try it and see). Doxygen supports C++, C, Java, Objective-C, Python, + IDL (Corba and Microsoft flavors) and to some extent PHP, C#, and D, + as well as other languages (using additional helper tools). + </longdescription> + <upstream> + <remote-id type="github">doxygen/doxygen</remote-id> + <remote-id type="sourceforge">doxygen</remote-id> + </upstream> + <use> + <flag name="clang">support for <pkg>sys-devel/clang</pkg> assisted parsing</flag> + <flag name="dot">allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag> + <flag name="doxysearch">build doxyindexer and doxysearch.cgi</flag> + </use> +</pkgmetadata> diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild index ff2e7e865a14..0439d8a6ddde 100644 --- a/app-text/dvipng/dvipng-1.17.ebuild +++ b/app-text/dvipng/dvipng-1.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Translate DVI files into PNG or GIF graphics" -HOMEPAGE="http://dvipng.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://dvipng.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-3+ Texinfo-manual" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="truetype test" RESTRICT="!test? ( test )" diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest index c03d1e1a6f1e..4ddd62ed0ca2 100644 --- a/app-text/dvipsk/Manifest +++ b/app-text/dvipsk/Manifest @@ -1,3 +1,6 @@ +DIST dvips.doc.r66203.tar.xz 531004 BLAKE2B 9b94b423a8d75a2a5f48e8db43fe06df77fd4e34c0bc29e781829f99330d5f423ab651ba551c4e5d27ec939cf9a310185d66b1cdee8baf9291c850898b91cb75 SHA512 ac2518c20c26dcda42df79be79ed24e2c021af2084ede43f51a5589b1023c9c94a307bd0a4742880e2c89d7620b2889f3a675e30a449d699d15db98922b0da71 +DIST dvips.r66203.tar.xz 58076 BLAKE2B 3ed83d92e42cb830edd9220b6db6600b00198a67e158d55ef454499be02e65b4a4996cd2d14f96adfd57696239cec9f6656b101afaa15c80aa65e27c5fa733ff SHA512 fbaf1dd979ceed4f7146d8aebc31ba7d770a8389b4ac214086db5951c485a2a3e3a62b2772394c8053444dfb8de0d22b3501c2ee3ee1e4e7493a1df5a34cc275 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 +DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96 DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7cbcb48e80d9e72ea613a30a82c2d825eb4caae00bd04241260257e6feb400767fa3a12c55522799272dff2996 SHA512 1eec2ddbbc5d211f1d38237289a2bcfe716fe41210d47f6f9111a009dc179ca3dcaefde11e49d28d4cdd26b992dfed7fca3bff3178a6ca273f396afc45118013 DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138 diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild index 2db4040223d4..5d0cf5d7abfa 100644 --- a/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild +++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild @@ -6,30 +6,30 @@ EAPI=7 inherit texlive-common DESCRIPTION="DVI-to-PostScript translator" -HOMEPAGE="http://tug.org/texlive/" -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" TL_VERSION=2021 EXTRA_TL_MODULES="dvips" EXTRA_TL_DOC_MODULES="dvips.doc" for i in ${EXTRA_TL_MODULES} ; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" done SRC_URI="${SRC_URI} doc? ( " for i in ${EXTRA_TL_DOC_MODULES} ; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz" done SRC_URI="${SRC_URI} ) " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc source" DEPEND=">=dev-libs/kpathsea-6.2.1:=" - +RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN} diff --git a/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild new file mode 100644 index 000000000000..89f7a18670cb --- /dev/null +++ b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit texlive-common + +TL_VERSION="$(ver_cut 1)$(ver_cut 2)$(ver_cut 3)" +DESCRIPTION="DVI-to-PostScript translator" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${TL_VERSION}-source.tar.xz" + +DVIPS_REVISION=$(ver_cut 5) +EXTRA_TL_MODULES="dvips.r${DVIPS_REVISION}" +EXTRA_TL_DOC_MODULES="dvips.doc.r${DVIPS_REVISION}" + +texlive-common_append_to_src_uri EXTRA_TL_MODULES + +SRC_URI+=" doc? ( " +texlive-common_append_to_src_uri EXTRA_TL_DOC_MODULES +SRC_URI+=" ) " + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc source" + +DEPEND=">=dev-libs/kpathsea-6.2.1:=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/texlive-${TL_VERSION}-source/texk/${PN}" + +src_configure() { + econf --with-system-kpathsea +} + +src_install() { + emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install + + dodir /usr/share # just in case + cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees" + if use source ; then + cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files" + fi + + dodoc AUTHORS ChangeLog NEWS README TODO +} + +pkg_postinst() { + etexmf-update +} + +pkg_postrm() { + etexmf-update +} diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest index 54549925986c..9c4090ec0f05 100644 --- a/app-text/dvisvgm/Manifest +++ b/app-text/dvisvgm/Manifest @@ -1,3 +1,5 @@ -DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008 DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6 DIST dvisvgm-3.0.4.tar.gz 2970986 BLAKE2B 2a8cff58cc728c833c74a44af1139529eab433ec5cd8b82949dbad169a609e66069f38f18c046250da5c085756c1ef6d95247c133df1afefc92b1783d9dd5ecd SHA512 89105ecc14b974f0fc0a1684a3ce4c66444bc819d56dd43c517d6b547f618ab60a15abb18609c38ac120ac5990fcd0fa6599cb7b0af11c4f820b1f955943688e +DIST dvisvgm-3.1.2.tar.gz 2940106 BLAKE2B 05672e2f6b2248e0a28548dae52aa6f6d5f3c599417a9adf7a46d1f8abfeafe4840b01dcbda4068cd3d522c0c1fe2e2f87fedce7678eb4a5630d6b482025afae SHA512 2d98c9830c0280975c52d3adfa146a4681c2f4e955fe33efc55e25f7e6f2133ad21063bfdbafabca37bf0315efec4eff0bb32dcfe13755a70c1d41898449ab19 +DIST dvisvgm-3.1.tar.gz 2908747 BLAKE2B f7544d291fbabf1bb126c97077b15296369815ae0ae8baa2b23d5831d8a6788673af13e0d44c12028be1cef319f83117b0842693810fcc3e5c14263999b41d9e SHA512 8e019eb54f0ad4a5f0e6241e2a5223582da723c7692598278668c1220d7769f161895eb292be0a95771ea7b3e65e8fb83052b7b1f6a6432276fd013e00fd7e51 +DIST dvisvgm-3.2.tar.gz 2940355 BLAKE2B 51a00b948a7ecaa68cee78d484813622c449eb2876a326051f93bb62304bfd174c443cf2eb192bb7c46e28065fe53001ada283002d30949bf39a69270c387dd4 SHA512 718ce9cd1cc8c826859df74eccd8e05dfb1c42f0defb57cdc99910957d009044e0e8a1854ff7fcde739cb832b2559976d3025dbf4cfda9e4cdea85398558d730 diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild deleted file mode 100644 index 0fc4f7c95209..000000000000 --- a/app-text/dvisvgm/dvisvgm-2.12.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Converts DVI files to SVG" -HOMEPAGE="https://dvisvgm.de/" -SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" -IUSE="test" -# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative -# directories from where the binary is executed. -# We cannot really use absolute paths in the kpathsea configuration since that -# would make it harder for prefix installs. -RESTRICT="test" - -RDEPEND=">=app-arch/brotli-1.0.5:= - app-text/ghostscript-gpl:= - dev-libs/kpathsea:= - dev-libs/openssl:= - >=dev-libs/xxhash-0.6.5 - >=media-gfx/potrace-1.10-r1 - media-libs/freetype:2 - >=media-libs/woff2-1.0.2 - sys-libs/zlib - virtual/tex-base" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" -BDEPEND="app-text/asciidoc - app-text/xmlto - dev-libs/libxslt - virtual/pkgconfig" - -src_configure() { - local myargs=( - --without-ttfautohint - ) - - econf "${myargs[@]}" -} diff --git a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild index 03c4f46d78ed..d583b7ecb4d2 100644 --- a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild +++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz # variant: Boost-1.0 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" @@ -40,6 +40,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-gcc13.patch +) + src_configure() { local myargs=( --disable-bundled-libs diff --git a/app-text/dvisvgm/dvisvgm-3.1.2.ebuild b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild new file mode 100644 index 000000000000..66f6668dae75 --- /dev/null +++ b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Converts DVI files to SVG" +HOMEPAGE="https://dvisvgm.de/" +SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz" + +# dvisvgm: GPL-3 +# Boost (tiny part, one header): Boost-1.0 +# md5: || ( public-domain BSD-1 ) +# clipper: Boost-1.0 +# variant: Boost-1.0 +LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/brotli-1.0.5:= + app-text/ghostscript-gpl:= + dev-libs/kpathsea:= + >=dev-libs/xxhash-0.8.1 + >=media-gfx/potrace-1.10-r1 + media-libs/freetype:2 + >=media-libs/woff2-1.0.2 + sys-libs/zlib + virtual/tex-base +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.11 ) +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-libs/libxslt + virtual/pkgconfig +" + +src_configure() { + local myargs=( + --disable-bundled-libs + --without-ttfautohint + ) + + econf "${myargs[@]}" +} diff --git a/app-text/dvisvgm/dvisvgm-3.1.ebuild b/app-text/dvisvgm/dvisvgm-3.1.ebuild new file mode 100644 index 000000000000..c94c72cd11ca --- /dev/null +++ b/app-text/dvisvgm/dvisvgm-3.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Converts DVI files to SVG" +HOMEPAGE="https://dvisvgm.de/" +SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz" + +# dvisvgm: GPL-3 +# Boost (tiny part, one header): Boost-1.0 +# md5: || ( public-domain BSD-1 ) +# clipper: Boost-1.0 +# variant: Boost-1.0 +LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/brotli-1.0.5:= + app-text/ghostscript-gpl:= + dev-libs/kpathsea:= + >=dev-libs/xxhash-0.8.1 + >=media-gfx/potrace-1.10-r1 + media-libs/freetype:2 + >=media-libs/woff2-1.0.2 + sys-libs/zlib + virtual/tex-base +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.11 ) +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-libs/libxslt + virtual/pkgconfig +" + +src_configure() { + local myargs=( + --disable-bundled-libs + --without-ttfautohint + ) + + econf "${myargs[@]}" +} diff --git a/app-text/dvisvgm/dvisvgm-3.2.ebuild b/app-text/dvisvgm/dvisvgm-3.2.ebuild new file mode 100644 index 000000000000..426a55d79622 --- /dev/null +++ b/app-text/dvisvgm/dvisvgm-3.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Converts DVI files to SVG" +HOMEPAGE="https://dvisvgm.de/" +SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz" + +# dvisvgm: GPL-3 +# Boost (tiny part, one header): Boost-1.0 +# md5: || ( public-domain BSD-1 ) +# clipper: Boost-1.0 +# variant: Boost-1.0 +LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/brotli-1.0.5:= + app-text/ghostscript-gpl:= + dev-libs/kpathsea:= + >=dev-libs/xxhash-0.8.1 + >=media-gfx/potrace-1.10-r1 + media-libs/freetype:2 + >=media-libs/woff2-1.0.2 + sys-libs/zlib + virtual/tex-base +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.11 ) +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-libs/libxslt + virtual/pkgconfig +" + +src_configure() { + local myargs=( + --disable-bundled-libs + --without-ttfautohint + ) + + econf "${myargs[@]}" +} diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch new file mode 100644 index 000000000000..a6452baf6794 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/906250 +https://github.com/mgieseki/dvisvgm/commit/b16a8d1c452d809118ceade4d2e8c6f9dfce48ac + +From b16a8d1c452d809118ceade4d2e8c6f9dfce48ac Mon Sep 17 00:00:00 2001 +From: Martin Gieseking <martin.gieseking@uos.de> +Date: Fri, 5 May 2023 22:22:00 +0200 +Subject: [PATCH] added missing includes + +--- a/src/DVIActions.hpp ++++ b/src/DVIActions.hpp +@@ -21,6 +21,7 @@ + #ifndef DVIACTIONS_HPP + #define DVIACTIONS_HPP + ++#include <cstdint> + #include <string> + #include <vector> + +--- a/src/Pair.hpp ++++ b/src/Pair.hpp +@@ -22,6 +22,7 @@ + #define PAIR_HPP + + #include <cmath> ++#include <cstdint> + #include <ostream> + #include "macros.hpp" + + diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild index cecebdf25781..a889bb12a90f 100644 --- a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild +++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Tools for accessing and converting various ebook file formats" HOMEPAGE="https://sourceforge.net/projects/ebook-tools/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/app-text/ebook2cw/Manifest b/app-text/ebook2cw/Manifest new file mode 100644 index 000000000000..78ad133a72ce --- /dev/null +++ b/app-text/ebook2cw/Manifest @@ -0,0 +1 @@ +DIST ebook2cw-0.8.5.tar.gz 34619 BLAKE2B 898a8bb6307a10c33085aca9d172cc145ec9fd1ccb8e76b2be051fd144097ff78f554c01af7540943e2042002b70b25106f615d7e3e9fcfa4f1dfde9cf7f5244 SHA512 88f1b42f1d9e96d34b923e31d78b597d00e2696cf4361fb7b2ebeda791f5e6df14bb60d152036d179c16ddceb35577f136a4bc959171faebc0fb5e0ea1877e4b diff --git a/app-text/ebook2cw/ebook2cw-0.8.5.ebuild b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild new file mode 100644 index 000000000000..9ff5b441d55c --- /dev/null +++ b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Convert ebooks to Morse MP3s/OGGs" +HOMEPAGE="https://fkurz.net/ham/ebook2cw.html" +SRC_URI="https://fkurz.net/ham/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + media-sound/lame + media-libs/libvorbis + media-libs/libogg + " + +src_prepare() { + # avoid prestripping of 'qrq' binary + sed -i -e "s/install -s -m/install -m/" Makefile || die + # fix install dir for doc files + sed -i -e "s#/doc/ebook2cw/#/doc/${P}/#g" Makefile || die + eapply_user +} + +src_install() { + emake DESTDIR="${D}/usr" install + dodoc ChangeLog +} diff --git a/app-text/ebook2cw/metadata.xml b/app-text/ebook2cw/metadata.xml new file mode 100644 index 000000000000..001997549c54 --- /dev/null +++ b/app-text/ebook2cw/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tomjbe@gentoo.org</email> + <name>Thomas Beierlein</name> + </maintainer> +</pkgmetadata> diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest index 019c781103f6..67f854da6f6e 100644 --- a/app-text/editorconfig-core-c/Manifest +++ b/app-text/editorconfig-core-c/Manifest @@ -1 +1 @@ -DIST editorconfig-core-c-0.12.5.tar.gz 72272 BLAKE2B 044723047f8bc6ed0a4b3c5defbc43a0192edd0997dbaf9e9be6027d47f0d09c2bf4ba8141dda67ba541657a6c462afb86bb575a0eee586cf9a45581a5ff2017 SHA512 7d54c8c1ade8ecef5dc8f35e006f0e226455b7ed9541442a846bbebc26765e92abbbb29b991748164015bcfaff8764a0ac007e4384e163678a2922f7ca6b2e03 +DIST editorconfig-core-c-0.12.6.tar.gz 76525 BLAKE2B 2ffad6b22d72bd23eca9f0f1704d279323328e01b72a4a18a7181c998f088d7f8c0bb93549d8071e6723b8294b628fe6d1b503de7434be45770a2be9127c1cab SHA512 7cf69ed48c0d28694fc1f54cd8ae89202a3f0a13b5302fd316f50d0f99a606f54af9709874f0da75ad11ab6f4cc36edacb4cd8639717d44842a309140be3a968 diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild index ffaf17c1d50e..be53eaf511e3 100644 --- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild +++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,22 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="cli doc" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" DEPEND="dev-libs/libpcre2:=" -RDEPEND="${DEPEND} - cli? ( !dev-python/editorconfig-core-py[cli] )" +RDEPEND=" + ${DEPEND} + cli? ( !dev-python/editorconfig[cli] !<dev-python/editorconfig-editorconfig-0.12.4-r1 ) +" +# Header-only +DEPEND+=" dev-libs/uthash" src_prepare() { # Don't install the static library. sed -e '/install(TARGETS editorconfig_static/,+5d' -i src/lib/CMakeLists.txt || die + + # Unbundle dev-libs/uthash + rm src/lib/utarray.h || die + cmake_src_prepare } diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest index 631a47be6493..e0cde0b11fd0 100644 --- a/app-text/enchant/Manifest +++ b/app-text/enchant/Manifest @@ -1,3 +1,2 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 -DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb -DIST enchant-2.3.4.tar.gz 1015430 BLAKE2B 5a9c92b1c3767e4929c16b6429935c083cc733207434d7eeb3a28b384ff9287ecee6c756ff575a926f6e709179f2d6232e339bc007f200ba169251ad13a8fc34 SHA512 d109ab320ed84d6c9eec6c558c72a54d71ad30237c2bf11650b0e4030fbd9990a5ccf06a20851e46b6530279e1a9916b891cd394eefabc8812f7f92da62cbe1a +DIST enchant-2.6.1.tar.gz 1014436 BLAKE2B 3df1d72d4fa2e912788d4e12e7bc4ab2676952e358e97457259284e78c32006482be0713059d5feeef56905e83ded975e7d723563c58e4f92c845b0b279a6827 SHA512 e2faabeb6a4edc7237a0a279b210512100fb1662b097cd23f0fc07a3519e48632e5527b0d393793a7623667011eae7e11f15fcddcaa155c4abd26ab6981ddf44 diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild index 32d2179edde5..5cbf57768245 100644 --- a/app-text/enchant/enchant-1.6.1-r2.ebuild +++ b/app-text/enchant/enchant-1.6.1-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="aspell +hunspell test" RESTRICT="!test? ( test )" diff --git a/app-text/enchant/enchant-2.3.4.ebuild b/app-text/enchant/enchant-2.3.4.ebuild deleted file mode 100644 index 3c71c0775e63..000000000000 --- a/app-text/enchant/enchant-2.3.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Spellchecker wrapping library" -HOMEPAGE="https://abiword.github.io/enchant/" -SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - -IUSE="aspell +hunspell nuspell test voikko" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( aspell hunspell nuspell )" - -COMMON_DEPEND=" - >=dev-libs/glib-2.6:2 - aspell? ( app-text/aspell ) - hunspell? ( >=app-text/hunspell-1.2.1:0= ) - nuspell? ( >=app-text/nuspell-5.1.0:0= ) - voikko? ( dev-libs/libvoikko ) -" -RDEPEND="${COMMON_DEPEND} - !<app-text/enchant-1.6.1-r2:0 -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-libs/unittest++-2.0.0-r2 ) -" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local myconf=( - --disable-static - $(use_enable test relocatable) - $(use_with aspell) - $(use_with hunspell) - $(use_with nuspell) - $(use_with voikko) - --without-hspell - --without-applespell - --without-zemberek - --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/ - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.6.1.ebuild index 3f7c2ef51001..9e29da6bb928 100644 --- a/app-text/enchant/enchant-2.3.3-r1.ebuild +++ b/app-text/enchant/enchant-2.6.1.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit libtool + DESCRIPTION="Spellchecker wrapping library" HOMEPAGE="https://abiword.github.io/enchant/" SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="aspell +hunspell nuspell test voikko" RESTRICT="!test? ( test )" @@ -20,7 +22,7 @@ COMMON_DEPEND=" aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) nuspell? ( >=app-text/nuspell-5.1.0:0= ) - voikko? ( dev-libs/libvoikko ) + voikko? ( dev-libs/libvoikko:= ) " RDEPEND="${COMMON_DEPEND} !<app-text/enchant-1.6.1-r2:0 @@ -28,7 +30,21 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} test? ( >=dev-libs/unittest++-2.0.0-r2 ) " -BDEPEND="virtual/pkgconfig" +BDEPEND=" + sys-apps/groff + virtual/pkgconfig +" + +QA_CONFIG_IMPL_DECL_SKIP=( + alignof + static_assert + unreachable +) + +src_prepare() { + default + elibtoolize +} src_configure() { local myconf=( diff --git a/app-text/enscript/enscript-1.6.6-r1.ebuild b/app-text/enscript/enscript-1.6.6-r1.ebuild index f7a75d380afc..f3503237816d 100644 --- a/app-text/enscript/enscript-1.6.6-r1.ebuild +++ b/app-text/enscript/enscript-1.6.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" LICENSE="GPL-3" IUSE="nls ruby" @@ -17,8 +17,8 @@ IUSE="nls ruby" RDEPEND="nls? ( virtual/libintl )" DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex - sys-devel/bison + app-alternatives/lex + app-alternatives/yacc nls? ( sys-devel/gettext ) " diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild index d19bd91cc735..46d374f8a716 100644 --- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild +++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc tk" DEPEND="sys-apps/texinfo" diff --git a/app-text/epspdf/epspdf-0.6.5.ebuild b/app-text/epspdf/epspdf-0.6.5.ebuild index 1c46675218c9..10eb318fdc5f 100644 --- a/app-text/epspdf/epspdf-0.6.5.ebuild +++ b/app-text/epspdf/epspdf-0.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc tk" RDEPEND="!<dev-texlive/texlive-pictures-2011-r1 diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 413c4ae36643..4b75dbd25049 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,4 +1 @@ -DIST evince-43.1.tar.xz 2909512 BLAKE2B 1695320814aca28df17e5bbe6f4000b0191b9b600895c529d4ccd5628335fc4dd4fa788ddfe54c06fe37da12705add93f7df99a8c0dfb1060b8fd497aabae596 SHA512 c12d7b6e961a74c8e31b604f232483576289ba9e5a37faa766f4e5aaa95bdcbf37cf98c1d28de45ad1728452b0a2408fe4fe245dc76289a21e7664c96237d09f -DIST evince-44.0.tar.xz 2918888 BLAKE2B 7994157ea2fdaadbb9e217441154af67f051f2d475a632cad0521179c7cd46e5b52f9818c2e7742d29f0d79d29dc8b735896877fe0aa8d4eecf3a2c787273e68 SHA512 1ff4e5a30e8b0c834dfa26294a6b6a4ec9fb2e3b5ecf040cc175423ebe4660a4c238bc21bf761e5dcda2b8c3888bddf6cae4cff3437ec20b9477f2106b5ba8da -DIST evince-44.1.tar.xz 2919776 BLAKE2B 2284bdcfb7f0eff6f4eb064ece9ef794ad83f601615c04c018a36be3382c618850207fefa39edde126a0c2a2dfa7094dd1f3d260a0cd2d0453d8de21ea77e701 SHA512 978aa58f318bf63b0cc3619b625384188a36bcda3cfa632239267a54e0a6bdcc99fe6127c328f094431daa90097615975345cdb53d8a80f051ac1674f215c696 -DIST evince-44.rc.tar.xz 2916416 BLAKE2B 75e2151100643aa786c3c37b77e0b9aebe0daa9942a7d9d220298cb5222e743b3d983deab01ca228a271bdf5b8665c7f4d3e6a7ac3a40e3c699aed6d26307b96 SHA512 a6e7efb79a9317604f1f5646af692693105d974b56dc23fe7248588215066b314bd464cbd454608610dd3514364e2a1c0ca4747b1e4804dc63746344857e1806 +DIST evince-45.0.tar.xz 2925768 BLAKE2B a926efd836dcf265184d84b8ae3ab246612767ab7f4e600225e21cb7395aa6aa7c6c238aa3958e1924d67a6aa377a2817101a9b04633dc30c381424ee1e0ebaa SHA512 3c2f796fda6c6e4d570748b6f8fcda2fada239df4cb392c164d7f91041cda6337373ea521146e7f7a1d572692a5e894938117d092fa033ddeb81fa72f8591086 diff --git a/app-text/evince/evince-43.1-r1.ebuild b/app-text/evince/evince-43.1-r1.ebuild deleted file mode 100644 index 7696799520e3..000000000000 --- a/app-text/evince/evince-43.1-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" - -# atk used in libview -# bundles unarr -DEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0 - dev-libs/atk - ) - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.5.0:1= - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-22.02.0[cairo] - >=app-arch/libarchive-3.6.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-4.0:= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.3 - ) - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - default - xdg_environment_reset - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddevelopment=false - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - -Dinternal_synctex=true - - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/evince-44.1.ebuild b/app-text/evince/evince-44.1.ebuild deleted file mode 100644 index a5331cb9b677..000000000000 --- a/app-text/evince/evince-44.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" -REQUIRED_USE="gtk-doc? ( introspection )" - -# atk used in libview -# bundles unarr -DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.5.0:1 - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10 - >=app-text/poppler-22.02.0:=[cairo] - >=app-arch/libarchive-3.6.0:= - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-4.0:= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.3 - ) - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - default - xdg_environment_reset - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddevelopment=false - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - -Dinternal_synctex=true - - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{libevdocument,libevview} "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/evince-44_rc.ebuild b/app-text/evince/evince-44_rc.ebuild deleted file mode 100644 index c845f426e4fe..000000000000 --- a/app-text/evince/evince-44_rc.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" -SRC_URI="https://download.gnome.org/sources/${PN}/44/${PN}-44.rc.tar.xz" -S="${WORKDIR}/${PN}-44.rc" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" -REQUIRED_USE="gtk-doc? ( introspection )" - -# atk used in libview -# bundles unarr -DEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0 - dev-libs/atk - ) - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.5.0:1= - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-22.02.0[cairo] - >=app-arch/libarchive-3.6.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-4.0:= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - gnome-base/gvfs - gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.3 - ) - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_prepare() { - default - xdg_environment_reset - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Ddevelopment=false - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - -Dinternal_synctex=true - - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{libevdocument,libevview} "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/evince-44.0.ebuild b/app-text/evince/evince-45.0.ebuild index a5331cb9b677..fd78478a7ed5 100644 --- a/app-text/evince/evince-44.0.ebuild +++ b/app-text/evince/evince-45.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" LICENSE="GPL-2+ CC-BY-SA-3.0" # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) SLOT="0/evd3.4-evv3.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="cups djvu dvi gstreamer gnome keyring gtk-doc +introspection nautilus postscript spell tiff xps" REQUIRED_USE="gtk-doc? ( introspection )" # atk used in libview @@ -27,7 +27,7 @@ DEPEND=" >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10 - >=app-text/poppler-22.02.0:=[cairo] + >=app-text/poppler-22.05.0:=[cairo] >=app-arch/libarchive-3.6.0:= djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( @@ -39,7 +39,7 @@ DEPEND=" media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) + keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) @@ -50,10 +50,6 @@ DEPEND=" RDEPEND="${DEPEND} gnome-base/gvfs gnome-base/librsvg - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) " BDEPEND=" gtk-doc? ( @@ -71,10 +67,6 @@ BDEPEND=" src_prepare() { default xdg_environment_reset - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die } src_configure() { @@ -99,7 +91,7 @@ src_configure() { -Duser_doc=true $(meson_use introspection) -Ddbus=true - $(meson_feature gnome-keyring keyring) + $(meson_feature keyring) $(meson_feature cups gtk_unix_print) $(meson_feature gnome thumbnail_cache) $(meson_feature gstreamer multimedia) diff --git a/app-text/feathernotes/Manifest b/app-text/feathernotes/Manifest new file mode 100644 index 000000000000..e7f3dcef6859 --- /dev/null +++ b/app-text/feathernotes/Manifest @@ -0,0 +1 @@ +DIST feathernotes-1.2.0.tar.gz 926273 BLAKE2B ae945ae6adb95d3cd8ef42becfcd68a591ef62f97f05d514f19a9c07e6900b2230e89361b65abfc2082797755bcb8b6c521b72a6406a21886ba6ab386f23295f SHA512 f6aabc0d4bee5f3af20a86035befbc27eddedc5ec37c9a353723a80fb0f691af6ad57d5f50a0e8504336c141822227f8287ed61e52d084b34e3b8ab5246315c0 diff --git a/app-text/feathernotes/feathernotes-1.2.0.ebuild b/app-text/feathernotes/feathernotes-1.2.0.ebuild new file mode 100644 index 000000000000..3f3075fd6e7a --- /dev/null +++ b/app-text/feathernotes/feathernotes-1.2.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION=" Lightweight Qt Notes-Manager for Linux" +HOMEPAGE="https://github.com/tsujan/FeatherNotes" +SRC_URI="https://github.com/tsujan/FeatherNotes/archive/V${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/FeatherNotes-${PV}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="spell X" + +RDEPEND=" + dev-qt/qtbase:6[dbus,gui,network,widgets,xml,X?] + dev-qt/qtsvg:6 + spell? ( app-text/hunspell:= ) + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="dev-qt/qttools:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DWITHOUT_X11=$(usex !X) + -DWITH_HUNSPELL=$(usex spell) + ) + cmake_src_configure +} diff --git a/app-text/feathernotes/feathernotes-9999.ebuild b/app-text/feathernotes/feathernotes-9999.ebuild new file mode 100644 index 000000000000..880fc704e847 --- /dev/null +++ b/app-text/feathernotes/feathernotes-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit git-r3 cmake xdg + +DESCRIPTION=" Lightweight Qt Notes-Manager for Linux" +HOMEPAGE="https://github.com/tsujan/FeatherNotes" +EGIT_REPO_URI="https://github.com/tsujan/FeatherNotes" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="spell X" + +RDEPEND=" + dev-qt/qtbase:6[dbus,gui,network,widgets,xml,X?] + dev-qt/qtsvg:6 + spell? ( app-text/hunspell:= ) + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="dev-qt/qttools:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DWITHOUT_X11=$(usex !X) + -DWITH_HUNSPELL=$(usex spell) + ) + cmake_src_configure +} diff --git a/app-text/feathernotes/metadata.xml b/app-text/feathernotes/metadata.xml new file mode 100644 index 000000000000..25af69d6ae8f --- /dev/null +++ b/app-text/feathernotes/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> + <use> + <flag name="X"> + Link application against X11 libraries which adds + support for virtual desktop awareness and tab DND + </flag> + </use> + <upstream> + <remote-id type="github">tsujan/FeatherNotes</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest index abe37e46fc62..de219933828b 100644 --- a/app-text/foliate/Manifest +++ b/app-text/foliate/Manifest @@ -1 +1 @@ -DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3 +DIST foliate-3.1.0.tar.bz2 7902106 BLAKE2B cd804b168529ebde3312954de6e907d4de30ef4342dbcf872757f485d5b5e223c96629c01d6e0e0b3bb7cfcc1e98015b034b053d6a6429138a8aa1ed40b0b0c2 SHA512 36dfb6618b04fcfdd3d298133f9fb592e987b898420da08d1e2e1539f162abc4c06cf28e3c9e6ae5f008554fdec9ab36a69333f5c5074b069c345ae729301236 diff --git a/app-text/foliate/foliate-2.6.4-r2.ebuild b/app-text/foliate/foliate-2.6.4-r2.ebuild deleted file mode 100644 index 55777f866399..000000000000 --- a/app-text/foliate/foliate-2.6.4-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW" -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 plocale xdg gnome2-utils -SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -DESCRIPTION="gtk ebook reader built with gjs" -HOMEPAGE="https://github.com/johnfactotum/foliate/" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="handy spell" - -BDEPEND="${MESON_DEPEND} - ${PYTHON_DEPS} - sys-devel/gettext" -RDEPEND="dev-libs/gjs - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] - x11-libs/gdk-pixbuf:2[introspection] - net-libs/webkit-gtk:4[introspection] - sys-devel/gettext - handy? ( gui-libs/libhandy:=[introspection] ) - spell? ( app-text/gspell[introspection] )" - -src_prepare() { - default - python_fix_shebang build-aux/meson - xdg_environment_reset - - plocale_find_changes "${S}"/po '' '.po' - - rm_po() { - rm po/${1}.po - sed -e "/^${1}/d" -i po/LINGUAS - } - - plocale_for_each_disabled_locale rm_po -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/app-text/foliate/foliate-3.1.0.ebuild b/app-text/foliate/foliate-3.1.0.ebuild new file mode 100644 index 000000000000..87f75f240349 --- /dev/null +++ b/app-text/foliate/foliate-3.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PLOCALES="ar cs de el es eu fa_IR fr he hi hr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW" +inherit meson plocale xdg gnome2-utils +DESCRIPTION="gtk ebook reader built with gjs" +HOMEPAGE="https://github.com/johnfactotum/foliate/" +SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64" + +BDEPEND="${MESON_DEPEND}" +RDEPEND=">=dev-libs/gjs-1.76 + >=gui-libs/gtk-4.12 + gui-libs/libadwaita + net-libs/webkit-gtk:6[introspection] + sys-devel/gettext" + +src_prepare() { + default + xdg_environment_reset + + plocale_find_changes "${S}"/po '' '.po' + + rm_po() { + rm po/${1}.po + sed -e "/^${1}/d" -i po/LINGUAS + } + + plocale_for_each_disabled_locale rm_po +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml index 86063f52e8d8..56812b6b96b7 100644 --- a/app-text/foliate/metadata.xml +++ b/app-text/foliate/metadata.xml @@ -9,9 +9,6 @@ Supported formats: epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt </longdescription> - <use> - <flag name="handy">Use <pkg>gui-libs/libhandy</pkg></flag> - </use> <upstream> <remote-id type="github">johnfactotum/foliate</remote-id> </upstream> diff --git a/app-text/fzy/metadata.xml b/app-text/fzy/metadata.xml index 77fefea822bc..628df2e40fcd 100644 --- a/app-text/fzy/metadata.xml +++ b/app-text/fzy/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <maintainer type="project"> <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> diff --git a/app-text/gentoo-dtd/Manifest b/app-text/gentoo-dtd/Manifest new file mode 100644 index 000000000000..77d39c1fa1bc --- /dev/null +++ b/app-text/gentoo-dtd/Manifest @@ -0,0 +1 @@ +DIST gentoo-dtd-20230914.tar.xz 6288 BLAKE2B 0b11fb7c34bf6be994242d93ae3a999d6490a177bcdd596d6b949a903c663fa66c75ea14d52e3d63ab19c806742be470570303c16ab656ce69e8a7406f38ef6c SHA512 29f8a12ddb2e9764c1d1eace26a4e7ae559c9001c32313e55708529a894a93a54c17c856e34589c016451a594deedb32279d282fbb9452b671089061a073bc71 diff --git a/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild b/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild new file mode 100644 index 000000000000..2f030b713978 --- /dev/null +++ b/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild @@ -0,0 +1,49 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 99999999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/data/dtd.git" +else + # git archive --prefix=${P}/ HEAD | xz >${P}.tar.xz + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Document Type Definition for Gentoo-related XML files" +HOMEPAGE="https://gitweb.gentoo.org/data/dtd.git/" + +# Presumably these simple DTDs are not copyrightable, +# but repositories.dtd says GPL v2 or later. +LICENSE="public-domain GPL-2+" +SLOT="0" + +RDEPEND="dev-libs/libxml2" +IDEPEND="${RDEPEND}" + +src_install() { + insinto /usr/share/xml/gentoo/dtd + doins *.dtd +} + +pkg_postinst() { + ebegin "Installing catalog entry" + xmlcatalog --noout \ + --add rewriteSystem "http://www.gentoo.org/dtd/" \ + "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \ + --add rewriteSystem "https://www.gentoo.org/dtd/" \ + "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \ + "${EROOT}"/etc/xml/catalog + eend $? +} + +pkg_postrm() { + ebegin "Cleaning catalog" + xmlcatalog --noout \ + --del "http://www.gentoo.org/dtd/" \ + --del "https://www.gentoo.org/dtd/" \ + "${EROOT}"/etc/xml/catalog + eend $? +} diff --git a/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild b/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild new file mode 100644 index 000000000000..2f030b713978 --- /dev/null +++ b/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild @@ -0,0 +1,49 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 99999999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/data/dtd.git" +else + # git archive --prefix=${P}/ HEAD | xz >${P}.tar.xz + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Document Type Definition for Gentoo-related XML files" +HOMEPAGE="https://gitweb.gentoo.org/data/dtd.git/" + +# Presumably these simple DTDs are not copyrightable, +# but repositories.dtd says GPL v2 or later. +LICENSE="public-domain GPL-2+" +SLOT="0" + +RDEPEND="dev-libs/libxml2" +IDEPEND="${RDEPEND}" + +src_install() { + insinto /usr/share/xml/gentoo/dtd + doins *.dtd +} + +pkg_postinst() { + ebegin "Installing catalog entry" + xmlcatalog --noout \ + --add rewriteSystem "http://www.gentoo.org/dtd/" \ + "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \ + --add rewriteSystem "https://www.gentoo.org/dtd/" \ + "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \ + "${EROOT}"/etc/xml/catalog + eend $? +} + +pkg_postrm() { + ebegin "Cleaning catalog" + xmlcatalog --noout \ + --del "http://www.gentoo.org/dtd/" \ + --del "https://www.gentoo.org/dtd/" \ + "${EROOT}"/etc/xml/catalog + eend $? +} diff --git a/app-text/gentoo-dtd/metadata.xml b/app-text/gentoo-dtd/metadata.xml new file mode 100644 index 000000000000..eee04478cf76 --- /dev/null +++ b/app-text/gentoo-dtd/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>ulm@gentoo.org</email> +</maintainer> +<stabilize-allarches/> +<upstream> + <remote-id type="gentoo">data/dtd</remote-id> +</upstream> +</pkgmetadata> diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index ec7b3d35ad26..fed436b0d5a5 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,3 +1,4 @@ -DIST ghostscript-10.0.0.tar.xz 62749144 BLAKE2B 10b962d358994506b69aba34827ea9d6a86c61e5093d7371b8350ff29a74b1db4816d0a62ff64f5d0e5a652fcd0304224c6236d33e717299789dfb2c9f350e24 SHA512 660252841e9b24c411bc92d0eb104de464686131e70051f60108db1a6ecfe2ada2ccacbeed8f2ac84bf69338ad75c850e814c9ac4e0351943f9989d66b3b082d -DIST ghostscript-10.01.0.tar.xz 67564800 BLAKE2B 6b4b724158e7878f879e56154eaa399be0a53c97292e8df5b2a324ef329d83c31e85850d10b463e3e5373d5b47b7ac4a8b0d92769c76162b5e445292882ca831 SHA512 b679b35bcdcf211d6aa41a571225a50449e7e36def75cf37fee8f06889df3a5a9726a7aef2fd5ae819c2071cb6fcf8712741cd2c131c9341b60936e684bd8d98 +DIST ghostscript-10.02.1.tar.xz 68017088 BLAKE2B b491473f0b3d50121e4373e21af3d8cdf55d9ca4390b240c4cb88d0d44e707e32570a7f1f05cb656d1b65443fcd7e37f5eab404d72a20f83d8fd87370a585467 SHA512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 +DIST ghostscript-10.03.0.tar.xz 68041176 BLAKE2B c64e0fc9dd290b81e61793671e8645f16b04070685f6ab9d35a60cb910d7504e1e686525af8b74121ae31a5b344e2332efd8bdf99f2a4c5586bff747b8df78d7 SHA512 74d7da586eefbf3fb3c085bb4d2b73ee667fd0ae9cff73ece613c77c443148b847086f91802124baf91ac35cdc83be07199799378def92c8fbd96ced7d0ee9a8 +DIST ghostscript-10.03.1.tar.xz 68048612 BLAKE2B 991e81c4a9f8459220f6af988fb533cc3c2393fef0c57b35da5685fb6f8b0e76af00457f9b0e552ea241b272cdfaa90cf4a06d6cb1008b55efe782faa14c90da SHA512 59e071cd23aed246b51317d3cccd9ccf8e1e84c4ecf9b22fb938e561eff42cec61915b0bdd96a313a3ea27750579c54ca0d0862b65edd306a621731c0063ffd3 DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch new file mode 100644 index 000000000000..a9356f861c52 --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/922448 +https://bugs.ghostscript.com/show_bug.cgi?id=707502 +https://git.ghostscript.com/?p=ghostpdl.git;h=8f5c77af6c0b84bdea719010cf4f67877e857b2b + +From 8f5c77af6c0b84bdea719010cf4f67877e857b2b Mon Sep 17 00:00:00 2001 +From: Ken Sharp <Ken.Sharp@artifex.com> +Date: Fri, 19 Jan 2024 08:44:33 +0000 +Subject: [PATCH] X device - fix compiler 'warning' + +Bug #707502 "- -Wincompatible-pointer-types warning in devices/gdevxini.c" + +This is probably an oversight from when we changed a load of variables +to size_t. + +Seems odd that compilers (well gcc) should refuse to compile becuase of +a warning, but that's compilers. The pointer type is incorrect so let's +fix it. +--- a/devices/gdevx.h ++++ b/devices/gdevx.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2023 Artifex Software, Inc. ++/* Copyright (C) 2001-2024 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -39,7 +39,7 @@ typedef struct gx_device_X_s { + bool is_buffered; + bool IsPageDevice; + byte *buffer; /* full-window image */ +- long buffer_size; ++ size_t buffer_size; + gx_device_color_info orig_color_info; + + /* An XImage object for writing bitmap images to the screen */ +--- a/devices/gdevxini.c ++++ b/devices/gdevxini.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2023 Artifex Software, Inc. ++/* Copyright (C) 2001-2024 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -621,7 +621,7 @@ x_set_buffer(gx_device_X * xdev) + } + if (mdev->width != xdev->width || mdev->height != xdev->height) { + byte *buffer; +- ulong space; ++ size_t space; + + if (gdev_mem_data_size(mdev, xdev->width, xdev->height, &space) < 0 || + space > xdev->space_params.MaxBitmap) { +-- +2.34.1 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch new file mode 100644 index 000000000000..82677ea5418e --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/919065 +https://bugs.ghostscript.com/show_bug.cgi?id=707130 +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b7beb19ad06e + +From b7beb19ad06e08b889a44694ff813ed5f6c96da4 Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Thu, 14 Sep 2023 09:01:43 +0100 +Subject: [PATCH] Bug 707130: Cast to void ** to avoid compiler warning + +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -1280,7 +1280,7 @@ gs_fapi_ft_get_scaled_font(gs_fapi_server * a_server, gs_fapi_font * a_font, + + if (a_font->retrieve_tt_font != NULL) { + unsigned int ms; +- code = a_font->retrieve_tt_font(a_font, &own_font_data, &ms); ++ code = a_font->retrieve_tt_font(a_font, (void **)&own_font_data, &ms); + if (code == 0) { + data_owned = false; + open_args.memory_base = own_font_data; +-- +2.34.1 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch new file mode 100644 index 000000000000..494c7080317a --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch @@ -0,0 +1,25 @@ +https://bugs.ghostscript.com/show_bug.cgi?id=707649 +https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=90cabe08422afdd16bac5dd9217602679d943045 + +From 90cabe08422afdd16bac5dd9217602679d943045 Mon Sep 17 00:00:00 2001 +From: Ken Sharp <Ken.Sharp@artifex.com> +Date: Fri, 8 Mar 2024 09:19:05 +0000 +Subject: [PATCH] Bug #707649 - fix apply_sasl in error cases. + +Forgot to dereference the pointers before assigning the values, if we +get non-fatal errors returned from stringprep. +--- a/pdf/pdf_sec.c ++++ b/pdf/pdf_sec.c +@@ -183,8 +183,8 @@ static int apply_sasl(pdf_context *ctx, char *Password, int Len, char **NewPassw + * this easy: the errors we want to ignore are the ones with + * codes less than 100. */ + if ((int)err < 100) { +- NewPassword = Password; +- NewLen = Len; ++ *NewPassword = Password; ++ *NewLen = Len; + return 0; + } + +-- +2.34.1 diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild index dc3060ab3fe5..bd7de413886b 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.0.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ fi LICENSE="AGPL-3 CPL-1.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cups dbus gtk l10n_de static-libs unicode X" LANGS="ja ko zh-CN zh-TW" @@ -31,7 +31,8 @@ for X in ${LANGS} ; do IUSE="${IUSE} l10n_${X}" done -DEPEND="app-text/libpaper:= +DEPEND=" + app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= @@ -45,19 +46,27 @@ DEPEND="app-text/libpaper:= dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) - X? ( x11-libs/libXt x11-libs/libXext )" + X? ( x11-libs/libXt x11-libs/libXext ) +" BDEPEND="virtual/pkgconfig" # bug #844115 for newer poppler-data dep -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) - l10n_zh-TW? ( media-fonts/arphicfonts )" + l10n_zh-TW? ( media-fonts/arphicfonts ) +" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-10.02.1-c99.patch + "${FILESDIR}"/${PN}-10.02.1-c99-2.patch +) + src_prepare() { if [[ -n ${MY_PATCHSET} ]] ; then # apply various patches, many borrowed from Fedora diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild index ec7a31487639..7bd11e3f8484 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r5.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ fi LICENSE="AGPL-3 CPL-1.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cups dbus gtk l10n_de static-libs unicode X" LANGS="ja ko zh-CN zh-TW" @@ -31,7 +31,8 @@ for X in ${LANGS} ; do IUSE="${IUSE} l10n_${X}" done -DEPEND="app-text/libpaper:= +DEPEND=" + app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= @@ -45,19 +46,26 @@ DEPEND="app-text/libpaper:= dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) - X? ( x11-libs/libXt x11-libs/libXext )" + X? ( x11-libs/libXt x11-libs/libXext ) +" BDEPEND="virtual/pkgconfig" # bug #844115 for newer poppler-data dep -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) - l10n_zh-TW? ( media-fonts/arphicfonts )" + l10n_zh-TW? ( media-fonts/arphicfonts ) +" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-10.02.1-c99.patch +) + src_prepare() { if [[ -n ${MY_PATCHSET} ]] ; then # apply various patches, many borrowed from Fedora @@ -187,8 +195,4 @@ src_install() { if ! use static-libs; then find "${ED}" -name '*.la' -delete || die fi - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi } diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild new file mode 100644 index 000000000000..06fb12a0d2a7 --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN/-gpl} +MY_P="${MY_PN}-${PV/_}" +PVM=$(ver_cut 1-2) +PVM_S=$(ver_rs 1-2 "") + +# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches +# See 'index' branch for README +MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz" + +DESCRIPTION="Interpreter for the PostScript language and PDF" +HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary" +SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz" +if [[ -n "${MY_PATCHSET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="AGPL-3 CPL-1.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cups dbus gtk l10n_de static-libs unicode X" + +LANGS="ja ko zh-CN zh-TW" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +DEPEND=" + app-text/libpaper:= + media-libs/fontconfig + >=media-libs/freetype-2.4.9:2= + >=media-libs/jbig2dec-0.19:= + >=media-libs/lcms-2.6:2 + >=media-libs/libpng-1.6.2:= + media-libs/libjpeg-turbo:= + >=media-libs/openjpeg-2.1.0:2= + >=media-libs/tiff-4.0.1:= + >=sys-libs/zlib-1.2.7 + cups? ( >=net-print/cups-1.3.8 ) + dbus? ( sys-apps/dbus ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) + X? ( x11-libs/libXt x11-libs/libXext ) +" +BDEPEND="virtual/pkgconfig" +# bug #844115 for newer poppler-data dep +RDEPEND=" + ${DEPEND} + >=app-text/poppler-data-0.4.11-r2 + >=media-fonts/urw-fonts-2.4.9 + l10n_ja? ( media-fonts/kochi-substitute ) + l10n_ko? ( media-fonts/baekmuk-fonts ) + l10n_zh-CN? ( media-fonts/arphicfonts ) + l10n_zh-TW? ( media-fonts/arphicfonts ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-10.03.0-c99.patch +) + +src_prepare() { + if [[ -n ${MY_PATCHSET} ]] ; then + # apply various patches, many borrowed from Fedora + # https://src.fedoraproject.org/rpms/ghostscript + # and Debian + # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches + eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*} + fi + + default + + # Remove internal copies of various libraries + rm -r cups/libs || die + rm -r freetype || die + rm -r jbig2dec || die + rm -r jpeg || die + rm -r lcms2mt || die + rm -r libpng || die + rm -r tiff || die + rm -r zlib || die + rm -r openjpeg || die + # Remove internal CMaps (CMaps from poppler-data are used instead) + rm -r Resource/CMap || die + + if ! use gtk ; then + sed -e "s:\$(GSSOX)::" \ + -e "s:.*\$(GSSOX_XENAME)$::" \ + -i base/unix-dll.mak || die "sed failed" + fi + + # Force the include dirs to a neutral location. + sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + -i configure.ac || die + # Some files depend on zlib.h directly. Redirect them. #573248 + # Also make sure to not define OPJ_STATIC to avoid linker errors due to + # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) + sed -e '/^zlib_h/s:=.*:=:' \ + -e 's|-DOPJ_STATIC ||' \ + -i base/lib.mak || die + + # Search path fix + # put LDFLAGS after BINDIR, bug #383447 + sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \ + -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ + -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ + -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ + -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ + -i Makefile.in base/*.mak || die "sed failed" + + # Remove incorrect symlink, bug 590384 + rm ijs/ltmain.sh || die + eautoreconf + + cd ijs || die + eautoreconf +} + +src_configure() { + # Unsupported upstream, bug #884841 + filter-lto + + # bug #899952 + append-lfs-flags + + local FONTPATH + for path in \ + "${EPREFIX}"/usr/share/fonts/urw-fonts \ + "${EPREFIX}"/usr/share/fonts/Type1 \ + "${EPREFIX}"/usr/share/fonts + do + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" + done + + # Do not add --enable-dynamic here, it's not supported fully upstream + # https://bugs.ghostscript.com/show_bug.cgi?id=705895 + # bug #884707 + # + # leptonica and tesseract are bundled but modified upstream, like in + # mujs/mupdf. + PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \ + --enable-freetype \ + --enable-fontconfig \ + --enable-openjpeg \ + --disable-compile-inits \ + --with-drivers=ALL \ + --with-fontpath="${FONTPATH}" \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper \ + --with-system-libtiff \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable gtk) \ + $(use_with cups pdftoraster) \ + $(use_with unicode libidn) \ + $(use_with X x) \ + DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/" + + cd "${S}/ijs" || die + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake so all + emake -C ijs +} + +src_install() { + emake DESTDIR="${D}" install-so install + + # move gsc to gs, bug #343447 + # gsc collides with gambit, bug #253064 + mv -f "${ED}"/usr/bin/{gsc,gs} || die + + cd "${S}/ijs" || die + emake DESTDIR="${D}" install + + # Sometimes the upstream versioning deviates from the tarball(!) + # bug #844115#c32 + local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die) + my_gs_version=${my_gs_version##*/} + + # Install the CMaps from poppler-data properly, bug #409361 + dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild new file mode 100644 index 000000000000..56448bed0f2a --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.1.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN/-gpl} +MY_P="${MY_PN}-${PV/_}" + +# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches +# See 'index' branch for README +MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz" + +DESCRIPTION="Interpreter for the PostScript language and PDF" +HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary" +SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/${PV}/${MY_P}.tar.xz" +if [[ -n "${MY_PATCHSET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="AGPL-3 CPL-1.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cups dbus gtk l10n_de static-libs unicode X" + +LANGS="ja ko zh-CN zh-TW" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +DEPEND=" + app-text/libpaper:= + media-libs/fontconfig + >=media-libs/freetype-2.4.9:2= + >=media-libs/jbig2dec-0.19:= + >=media-libs/lcms-2.6:2 + >=media-libs/libpng-1.6.2:= + media-libs/libjpeg-turbo:= + >=media-libs/openjpeg-2.1.0:2= + >=media-libs/tiff-4.0.1:= + >=sys-libs/zlib-1.2.7 + cups? ( >=net-print/cups-1.3.8 ) + dbus? ( sys-apps/dbus ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) + X? ( x11-libs/libXt x11-libs/libXext ) +" +BDEPEND="virtual/pkgconfig" +# bug #844115 for newer poppler-data dep +RDEPEND=" + ${DEPEND} + >=app-text/poppler-data-0.4.11-r2 + >=media-fonts/urw-fonts-2.4.9 + l10n_ja? ( media-fonts/kochi-substitute ) + l10n_ko? ( media-fonts/baekmuk-fonts ) + l10n_zh-CN? ( media-fonts/arphicfonts ) + l10n_zh-TW? ( media-fonts/arphicfonts ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-10.03.0-c99.patch +) + +src_prepare() { + if [[ -n ${MY_PATCHSET} ]] ; then + # apply various patches, many borrowed from Fedora + # https://src.fedoraproject.org/rpms/ghostscript + # and Debian + # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches + eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*} + fi + + default + + # Remove internal copies of various libraries + rm -r cups/libs || die + rm -r freetype || die + rm -r jbig2dec || die + rm -r jpeg || die + rm -r lcms2mt || die + rm -r libpng || die + rm -r tiff || die + rm -r zlib || die + rm -r openjpeg || die + # Remove internal CMaps (CMaps from poppler-data are used instead) + rm -r Resource/CMap || die + + if ! use gtk ; then + sed -e "s:\$(GSSOX)::" \ + -e "s:.*\$(GSSOX_XENAME)$::" \ + -i base/unix-dll.mak || die "sed failed" + fi + + # Force the include dirs to a neutral location. + sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + -i configure.ac || die + # Some files depend on zlib.h directly. Redirect them. #573248 + # Also make sure to not define OPJ_STATIC to avoid linker errors due to + # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) + sed -e '/^zlib_h/s:=.*:=:' \ + -e 's|-DOPJ_STATIC ||' \ + -i base/lib.mak || die + + # Search path fix + # put LDFLAGS after BINDIR, bug #383447 + sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \ + -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ + -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ + -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ + -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ + -i Makefile.in base/*.mak || die "sed failed" + + # Remove incorrect symlink, bug 590384 + rm ijs/ltmain.sh || die + eautoreconf + + cd ijs || die + eautoreconf +} + +src_configure() { + # Unsupported upstream, bug #884841 + filter-lto + + # bug #899952 + append-lfs-flags + + local FONTPATH + for path in \ + "${EPREFIX}"/usr/share/fonts/urw-fonts \ + "${EPREFIX}"/usr/share/fonts/Type1 \ + "${EPREFIX}"/usr/share/fonts + do + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" + done + + # Do not add --enable-dynamic here, it's not supported fully upstream + # https://bugs.ghostscript.com/show_bug.cgi?id=705895 + # bug #884707 + # + # leptonica and tesseract are bundled but modified upstream, like in + # mujs/mupdf. + PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \ + --enable-freetype \ + --enable-fontconfig \ + --enable-openjpeg \ + --disable-compile-inits \ + --with-drivers=ALL \ + --with-fontpath="${FONTPATH}" \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper \ + --with-system-libtiff \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable gtk) \ + $(use_with cups pdftoraster) \ + $(use_with unicode libidn) \ + $(use_with X x) \ + DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/" + + cd "${S}/ijs" || die + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake so all + emake -C ijs +} + +src_install() { + emake DESTDIR="${D}" install-so install + + # move gsc to gs, bug #343447 + # gsc collides with gambit, bug #253064 + mv -f "${ED}"/usr/bin/{gsc,gs} || die + + cd "${S}/ijs" || die + emake DESTDIR="${D}" install + + # Sometimes the upstream versioning deviates from the tarball(!) + # bug #844115#c32 + local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die) + my_gs_version=${my_gs_version##*/} + + # Install the CMaps from poppler-data properly, bug #409361 + dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml index 3570f4ae29c0..dd57cc77263a 100644 --- a/app-text/ghostscript-gpl/metadata.xml +++ b/app-text/ghostscript-gpl/metadata.xml @@ -14,6 +14,7 @@ </slots> <upstream> <remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id> + <remote-id type="github">ArtifexSoftware/ghostpdl</remote-id> <remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id> <bugs-to>https://bugs.ghostscript.com/</bugs-to> </upstream> diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild index 2cb5c978541c..e768dd0948e2 100644 --- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild +++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-python3.patch" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest deleted file mode 100644 index fcea4e26ef4d..000000000000 --- a/app-text/gocr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gocr-0.52.tar.gz 445401 BLAKE2B 1f22f5377bb95053e3ab4ede074b3fceca4065f9ca0ede05a8023ebe807f41074f5ead84e133281e98be7f68f13b036dc759cccaf4a5688bf776f62f2de1970a SHA512 e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d diff --git a/app-text/gocr/gocr-0.52.ebuild b/app-text/gocr/gocr-0.52.ebuild deleted file mode 100644 index 018149ea83b3..000000000000 --- a/app-text/gocr/gocr-0.52.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An OCR (Optical Character Recognition) reader" -HOMEPAGE="http://jocr.sourceforge.net" -SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc scanner tk" - -DEPEND=" - >=media-libs/netpbm-9.12 - doc? ( - >=media-gfx/transfig-3.2 - app-text/ghostscript-gpl - ) - tk? ( dev-lang/tk )" -RDEPEND="${DEPEND} - tk? ( - media-gfx/xli - scanner? ( media-gfx/xsane ) - )" - -src_compile() { - local targets=( src man ) - use doc && targets+=( doc examples ) - - emake "${targets[@]}" -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install - einstalldocs - dodoc HISTORY REMARK.txt REVIEW - - # remove the tk frontend if tk is not selected - if ! use tk; then - rm "${ED}"/usr/bin/gocr.tcl || die - fi - - # and install the documentation and examples - if use doc; then - dodoc doc/gocr.html doc/examples.txt doc/unicode.txt - - docinto examples - dodoc examples/*.{fig,tex,pcx} - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest index 4364ae48615f..a0889b63e8c2 100644 --- a/app-text/grip/Manifest +++ b/app-text/grip/Manifest @@ -1 +1 @@ -DIST grip-4.6.1.tar.gz 147894 BLAKE2B e4f6b5c72e98b5d8ec443c794e95ff0a4250526dd7381f5a28da7d1119b607970593c4b3c22a49ec7da7d772e984abb2a0984ed7290b007e48cddf49bfc290ae SHA512 73eb80995457faa10ba5f174c8151c821f4bd9cda066099ba249cc5aad668e6adef267410ddd24fefa1d1e444c276a10a0881ec5e528bc616d3c4d98a8427b3d +DIST grip-4.6.2.tar.gz 152280 BLAKE2B 02a5fb21190fe167428fb36390a087094c064fc11bc2016579391b3568bd421c8f0920f7b325e5be8140ebd8e7f7a0c0e20085f9d8899daf3ee85f27f33ffa9d SHA512 e4dc38d25198a1670df7ecf950fc2c815c3e8507571d54d3df844547ee7db0d1a7cbbbaa23fd7daa1391eea12a2788890d5cee09aa64b8bf1039beeb78a5d25f diff --git a/app-text/grip/grip-4.6.1.ebuild b/app-text/grip/grip-4.6.2.ebuild index 316839a468c0..7e8469d79e06 100644 --- a/app-text/grip/grip-4.6.1.ebuild +++ b/app-text/grip/grip-4.6.2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( pypy3 python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them" @@ -14,7 +15,6 @@ SLOT="0" KEYWORDS="amd64" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND=" !media-sound/grip >=dev-python/docopt-0.4.0[${PYTHON_USEDEP}] diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest index a0160ea233ad..3365de78b855 100644 --- a/app-text/groonga/Manifest +++ b/app-text/groonga/Manifest @@ -1 +1,2 @@ +DIST groonga-13.0.1.tar.gz 24694524 BLAKE2B 326ca810bdf4634b778eb6efc7a6c56626b0c5b563d9b896da23a103399e51ca57e8d1dd87aa05dbbe527f67cb6875924ca073f007698f5077437e2b191b995a SHA512 54eda0c70f932f249dbf58f01367d9a05a9d8e6e9a1df92e0a9070f452596cfc38da59b02c5128a585f9e19d460ce8100dd2677aaba7049e129a963491b22362 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1 diff --git a/app-text/groonga/groonga-13.0.1.ebuild b/app-text/groonga/groonga-13.0.1.ebuild new file mode 100644 index 000000000000..670474842073 --- /dev/null +++ b/app-text/groonga/groonga-13.0.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool + +DESCRIPTION="An Embeddable Fulltext Search Engine" +HOMEPAGE="https://groonga.org/" +SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="benchmark debug doc +exact-alloc-count examples futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd" +REQUIRED_USE=" + sphinx? ( doc ) +" + +DEPEND=" + acct-group/groonga + acct-user/groonga + >=dev-libs/onigmo-6.1.1:0= + dev-libs/rapidjson + dev-libs/xxhash + benchmark? ( >=dev-libs/glib-2.8 ) + jemalloc? ( dev-libs/jemalloc:0= ) + libedit? ( >=dev-libs/libedit-3 ) + libevent? ( dev-libs/libevent:0= ) + lzo? ( dev-libs/lzo ) + mecab? ( >=app-text/mecab-0.80 ) + msgpack? ( dev-libs/msgpack:= ) + sphinx? ( >=dev-python/sphinx-1.0.1 ) + zeromq? ( net-libs/zeromq:0= ) + zlib? ( sys-libs/zlib:0= ) + zstd? ( app-arch/zstd:0= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + sphinx? ( dev-python/sphinx ) +" + +src_prepare() { + default + + elibtoolize +} + +src_configure() { + # httpd is a bundled copy of nginx; disabled for security reasons + # prce only is used with httpd + # Apache arrow, kytea and libstemmer are not available in Gentoo repo + # ruby is only used for an http test + local econfopts=( + --disable-groonga-httpd + --without-pcre + --without-kytea + --without-libstemmer + --disable-arrow + --with-log-path="${EPREFIX}"/var/log/${PN}.log + --without-luajit + --without-ruby + --with-shared-onigmo + --with-onigmo=system + --with-xxhash + $(use_enable benchmark) + $(use_enable debug memory-debug) + $(use_enable doc document) + $(use_enable exact-alloc-count) + $(use_enable futex) + $(use_with jemalloc) + $(use_enable libedit) + $(use_with libevent) + $(use_with lzo) + $(use_with mecab) + $(use_enable msgpack message-pack) + $(use_with msgpack message-pack "${ESYSROOT}/usr") + $(use_enable nfkc) + $(use_with sphinx sphinx-build) + $(use_enable static-libs static) + $(use_enable uyield) + $(use_enable zeromq) + $(use_with zlib) + $(use_with zstd) + ) + + econf "${econfopts[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + + keepdir /var/{log,lib}/${PN} + fowners groonga:groonga /var/{log,lib}/${PN} + + if ! use examples ; then + rm -r "${ED}/usr/share/${PN}" || die + fi +} diff --git a/app-text/groonga/groonga-8.0.2-r1.ebuild b/app-text/groonga/groonga-8.0.2-r2.ebuild index 34c3b85d328f..b4a0b1ae286c 100644 --- a/app-text/groonga/groonga-8.0.2-r1.ebuild +++ b/app-text/groonga/groonga-8.0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,7 +27,7 @@ DEPEND=" libevent? ( dev-libs/libevent:0= ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) - msgpack? ( dev-libs/msgpack ) + msgpack? ( dev-libs/msgpack:= ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq:0= ) zlib? ( sys-libs/zlib:0= ) diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild index 8ff1c9379a9a..f9d512ab0d7e 100644 --- a/app-text/grutatxt/grutatxt-2.200.0.ebuild +++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild @@ -15,4 +15,4 @@ SRC_URI="https://triptico.com/download/${PN}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos" diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest index 5eaefc3e7ffd..dee73ee1e7f6 100644 --- a/app-text/gspell/Manifest +++ b/app-text/gspell/Manifest @@ -1 +1 @@ -DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549 +DIST gspell-1.12.2.tar.xz 442824 BLAKE2B 6a574339dfa4930e5506d63d5f0cf27d8433c2914ce1204edc8366992ebf05bf78d4777029fa17f05be73291510897862c63479e59e72522a4c4943647f66539 SHA512 c13df805f6128cfd19c41e4936fbb49516f80e09d27e79380d5638cbd1a8a3bfc6aae5ef8a4faa748495fe529bde92805bbd5530610b113c58daa36f273a5af8 diff --git a/app-text/gspell/gspell-1.12.0.ebuild b/app-text/gspell/gspell-1.12.2.ebuild index 99217800bdd3..8a3f1d0034a9 100644 --- a/app-text/gspell/gspell-1.12.0.ebuild +++ b/app-text/gspell/gspell-1.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,13 +10,13 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell" LICENSE="LGPL-2.1+" SLOT="0/2" # subslot = libgspell-1 soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="+introspection +vala" REQUIRED_USE="vala? ( introspection )" RDEPEND=" - >=app-text/enchant-2.1.3:2 + >=app-text/enchant-2.2:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= @@ -28,7 +28,7 @@ DEPEND="${RDEPEND} BDEPEND=" dev-libs/libxml2:2 dev-util/glib-utils - >=dev-util/gtk-doc-am-1.25 + >=dev-build/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( $(vala_depend) ) diff --git a/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild index 9c1e7acb2a2f..a1eabd0729d5 100644 --- a/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild +++ b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,14 +10,14 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0" DEPEND="${RDEPEND}" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig" diff --git a/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild index 153df285a40b..5570bc4fc961 100644 --- a/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild +++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,12 +9,12 @@ MY_P="${PN}3-${PV}" DESCRIPTION="Spell checking widget for GTK" HOMEPAGE="http://gtkspell.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="3/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="+introspection vala" REQUIRED_USE="vala? ( introspection )" @@ -27,7 +27,7 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.30:= )" DEPEND="${RDEPEND}" BDEPEND=" - >=dev-util/gtk-doc-am-1.17 + >=dev-build/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( $(vala_depend) )" diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest index ca4fc44f4a70..d67f3279c6c4 100644 --- a/app-text/gtranslator/Manifest +++ b/app-text/gtranslator/Manifest @@ -1 +1 @@ -DIST gtranslator-42.0.tar.xz 1526376 BLAKE2B 3d6834c201601415a1fb761bcef471a6c63aae311d22cb1ef5d615e20d124d05b165abb92590da2502b79456c9130e14dd7733746f5006a3c219aaf7f0505ba7 SHA512 785f2757360425b735948faca9eb8ef5f4433394f4fd99ff6e1f78f41d382c7769318ad8d329906910bcdd5a64b4ee0aa2df2e218a3c4b7576938e3d870077b6 +DIST gtranslator-45.3.tar.xz 1524700 BLAKE2B 5437f479d5276ef405cbd82c37aaa34b1cc4fe1ffa01d32e1e946adb65da0668ac6eb7359cb374a968367a16564959efb6d260dbeb148d34aca3c69cd545926e SHA512 6b4db2f12ec57db6b0ee7ae0030f2fe5bc748e0b501e3ea6f529e47e5e77196a47cf5bf6333fe84c314eaec20d353e7a2bf9a8bea75bbbcd7da438c2dc5e22c9 diff --git a/app-text/gtranslator/files/gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch index 5aa8047c58e0..78a7ac9b67d1 100644 --- a/app-text/gtranslator/files/gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch +++ b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch @@ -14,15 +14,15 @@ diff --git a/meson.build b/meson.build index 076812bd..f734e496 100644 --- a/meson.build +++ b/meson.build -@@ -111,7 +111,7 @@ gtr_deps = [ - glib_dep, +@@ -119,7 +119,7 @@ gtr_deps = [ gtk_dep, - libhandy_dep, + libadwaita_dep, + libspell_dep, - dependency('libgda-6.0'), + dependency('libgda-5.0'), dependency('gio-2.0', version: '>= 2.36.0'), dependency('gsettings-desktop-schemas'), - dependency('gspell-1', version: '>= 1.2.0'), + dependency('gthread-2.0', version: '>= 2.13.0'), -- 2.35.1 diff --git a/app-text/gtranslator/gtranslator-42.0.ebuild b/app-text/gtranslator/gtranslator-45.3.ebuild index c0153cbc9a0b..ef91db5918ed 100644 --- a/app-text/gtranslator/gtranslator-42.0.ebuild +++ b/app-text/gtranslator/gtranslator-45.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,12 +15,11 @@ IUSE="gtk-doc" DEPEND=" >=dev-libs/glib-2.71.3:2 - >=x11-libs/gtk+-3.22.20:3 - >=gui-libs/libhandy-1.5.0:1 + >=gui-libs/gtk-4.6.0:4 + >=gui-libs/libadwaita-1.1.0 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas - >=app-text/gspell-1.2.0:= - >=x11-libs/gtksourceview-4.0.2:4 + >=gui-libs/gtksourceview-5.4.0:5 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:3.0 >=dev-libs/json-glib-1.2.0 @@ -40,7 +39,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${P}-Revert-Add-GDA-6-compatibility.patch + "${FILESDIR}"/${PN}-45.2-Revert-Add-GDA-6-compatibility.patch ) src_configure() { diff --git a/app-text/halibut/Manifest b/app-text/halibut/Manifest new file mode 100644 index 000000000000..f285e42d4109 --- /dev/null +++ b/app-text/halibut/Manifest @@ -0,0 +1 @@ +DIST halibut-1.3.tar.gz 995916 BLAKE2B 78a4409ff1f787134f7cd4eb307e77c81865a2591b55b359b0ef7a45b303cd361f85d344972714dfe8b3e823345de715d99ea542bf3cdf63d6d92548d027c27b SHA512 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a diff --git a/app-text/halibut/halibut-1.3.ebuild b/app-text/halibut/halibut-1.3.ebuild new file mode 100644 index 000000000000..5370336f4d85 --- /dev/null +++ b/app-text/halibut/halibut-1.3.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="yet another free document preparation system" +HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/" +SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86" diff --git a/app-text/reed/metadata.xml b/app-text/halibut/metadata.xml index 85e4ed814fa2..85e4ed814fa2 100644 --- a/app-text/reed/metadata.xml +++ b/app-text/halibut/metadata.xml diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest index 9afe1785b1df..003099220e62 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -1 +1,7 @@ DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731 +DIST highlight-4.6.tar.bz2 1488327 BLAKE2B 952171929aa021c80690b2ddcd5adba3b6c7e54425cfc851368b768a53c749e34495b0832d4ce5546b5bc68c0ea4e3b5bd6df4f379e02702fd3a497adc52d60b SHA512 0214f2141ecf2ab350368ff165dc5f58eb3a23b31142b9d1c443a35f8ea72b9e33770c2de185cd2e3645e298ad41ec1fd45db5ebf546da3144e1dc93da32b811 +DIST highlight-4.8.tar.bz2 1492966 BLAKE2B f0bc746cb671037c2a5f1557c6114c143448de8fe295f4b74d38daecc615bfb50e50b5f3f3ee488488f1bc52dc11b283f13cbaa956959946d2dcaca91a6ef804 SHA512 c04e94b2fdb1ebda37937a8bdcdb1bb5afe171a74ca58ddf40b1972bc62a07dc02d628bc962b1db654805a446f32da8d7af41a0c162476cf47a3535128ca6ace +DIST highlight-4.8.tar.bz2.asc 488 BLAKE2B 466905e2a4b1b577feba593e2d6e855e09764cdb08ddbd5aa3b4c62c4b06bc19a013df16aa1dfc81d4e52765641d5f98615233609d7b4f039f6f8c6a929d345a SHA512 929c5b0a25a2f5a0b9204afb03b5456b2b62d07e519799602b06a0ad2d4bc1d9eac92965571732b0eaffe780904321ebffb31cdf61b6fe644ecc39ddb983c7b8 +DIST highlight-4.9.tar.bz2 1498248 BLAKE2B 09ff0a5cc81da45270a8382dc6b2a2d3b44d1f084e661fae4a3d39d2ded9af6c77b1fb0d51d32c59f22ccba1612ab7faf68b5e918dda70c9f2e25b29b5c44ecd SHA512 280abd98182c5b95f629ca126e8a59ca6bf6f9e301fc7678aa3e4cb37b714827dfdfab1e008c798e203c7408355be63e01e88f93eacfcf2c5fad95afc6e22112 +DIST highlight-4.9.tar.bz2.asc 488 BLAKE2B cbd3541f65ec714ff1fda17fb141aa19f53952634a2027819fdbf50f7cf781f875b76ebd9a82119347f17940d8200f856082dfff51ff994a71a2ece04d654764 SHA512 04c2aca4050cae0dde97340a1ebafd968526e2d811e4551e8895acca50613f7e5902e31d735a0da1427d69e85e152530776fa1b9f5896efe410d8f9437768298 +DIST highlight-test-suite-a3479468672cdbc570a17ae84e047fe8f0b88798.tar.bz2 33310 BLAKE2B a06f2503fc571f5978f648fdc677f58f3fdfa759f9b5cf31a85d03589bbbfd2b56c7055517c59292369653503047af63d9c3bfbbe541a50bd2ea2adede28f60c SHA512 9583fe0af315e0dd1e37e137adf5c97a83832885a5a8a12b91790d7d7b0758c03fd76c02fbda368a2481eaec98f7b010a530bc31da98337d6fa7201aadb023ce diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild index 7a8b44f56b5c..9271ef7b7f6f 100644 --- a/app-text/highlight/highlight-4.1.ebuild +++ b/app-text/highlight/highlight-4.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) +LUA_COMPAT=( lua5-{1..4} luajit ) -inherit lua-single qmake-utils toolchain-funcs +inherit lua-single qmake-utils toolchain-funcs xdg DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" HOMEPAGE="http://www.andre-simon.de/" diff --git a/app-text/highlight/highlight-4.6.ebuild b/app-text/highlight/highlight-4.6.ebuild new file mode 100644 index 000000000000..d6d49225f645 --- /dev/null +++ b/app-text/highlight/highlight-4.6.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit lua-single qmake-utils toolchain-funcs xdg + +DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" +HOMEPAGE="http://www.andre-simon.de/" +SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples gui" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig + gui? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch +) + +myhlopts=( + CXX="$(tc-getCXX)" + AR="$(tc-getAR)" + LDFLAGS="${LDFLAGS}" + CFLAGS="${CXXFLAGS} -DNDEBUG" + DESTDIR="${D}" + PREFIX="${EPREFIX}/usr" + HL_CONFIG_DIR="${EPREFIX}/etc/highlight/" + HL_DATA_DIR="${EPREFIX}/usr/share/highlight/" + doc_dir="${EPREFIX}/usr/share/doc/${PF}/" + conf_dir="${EPREFIX}/etc/highlight/" + examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras" +) + +src_prepare() { + default + + # Disable man page compression + sed \ + -e "/GZIP/d" \ + -e "/COPYING/d" \ + -i makefile || die + + sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ + -i src/core/datadir.cpp || die + + sed -r -i \ + -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \ + "${S}"/extras/tcl/makefile \ + "${S}"/extras/swig/makefile \ + || die "Failed to set Lua implementation" + + # We set it via eqmake5, otherwise it forces clang... + sed -e "s/QMAKE_CC/#QMAKE_CC/g" \ + -e "s/QMAKE_CXX /#QMAKE_CXX /g" \ + -i src/gui-qt/highlight.pro || die +} + +src_configure() { + if use gui ; then + pushd src/gui-qt > /dev/null || die + eqmake5 \ + 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' + popd > /dev/null || die + fi +} + +src_compile() { + emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}" + if use gui ; then + emake -C src/gui-qt + fi +} + +src_install() { + emake -f makefile "${myhlopts[@]}" install + + if use gui; then + emake -f makefile "${myhlopts[@]}" install-gui + docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} + fi + + if ! use examples ; then + rm -r "${ED}"/usr/share/doc/${PF}/extras || die + fi +} diff --git a/app-text/highlight/highlight-4.8.ebuild b/app-text/highlight/highlight-4.8.ebuild new file mode 100644 index 000000000000..8f8dade1af5b --- /dev/null +++ b/app-text/highlight/highlight-4.8.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc +inherit lua-single qmake-utils toolchain-funcs verify-sig xdg + +DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" +HOMEPAGE="http://www.andre-simon.de/" +SRC_URI=" + http://www.andre-simon.de/zip/${P}.tar.bz2 + verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc ) +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples gui" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig + gui? ( dev-qt/linguist-tools:5 ) + verify-sig? ( sec-keys/openpgp-keys-andresimon ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch +) + +myhlopts=( + CXX="$(tc-getCXX)" + AR="$(tc-getAR)" + LDFLAGS="${LDFLAGS}" + CFLAGS="${CXXFLAGS} -DNDEBUG" + DESTDIR="${D}" + PREFIX="${EPREFIX}/usr" + HL_CONFIG_DIR="${EPREFIX}/etc/highlight/" + HL_DATA_DIR="${EPREFIX}/usr/share/highlight/" + doc_dir="${EPREFIX}/usr/share/doc/${PF}/" + conf_dir="${EPREFIX}/etc/highlight/" + examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras" +) + +src_prepare() { + default + + # Disable man page compression + sed \ + -e "/GZIP/d" \ + -e "/COPYING/d" \ + -i makefile || die + + sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ + -i src/core/datadir.cpp || die + + sed -r -i \ + -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \ + "${S}"/extras/tcl/makefile \ + "${S}"/extras/swig/makefile \ + || die "Failed to set Lua implementation" + + # We set it via eqmake5, otherwise it forces clang... + sed -e "s/QMAKE_CC/#QMAKE_CC/g" \ + -e "s/QMAKE_CXX /#QMAKE_CXX /g" \ + -i src/gui-qt/highlight.pro || die +} + +src_configure() { + if use gui ; then + pushd src/gui-qt > /dev/null || die + eqmake5 \ + 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' + popd > /dev/null || die + fi +} + +src_compile() { + emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}" + if use gui ; then + emake -C src/gui-qt + fi +} + +src_install() { + emake -f makefile "${myhlopts[@]}" install + + if use gui; then + emake -f makefile "${myhlopts[@]}" install-gui + docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} + fi + + if ! use examples ; then + rm -r "${ED}"/usr/share/doc/${PF}/extras || die + fi +} diff --git a/app-text/highlight/highlight-4.9.ebuild b/app-text/highlight/highlight-4.9.ebuild new file mode 100644 index 000000000000..b7e7bd01dd57 --- /dev/null +++ b/app-text/highlight/highlight-4.9.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc +inherit lua-single qmake-utils toolchain-funcs verify-sig xdg + +DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight" +HOMEPAGE="http://www.andre-simon.de/" +# This is arbitrary; upstream uses master. Update when possible. +TESTSUITE_COMMIT="a3479468672cdbc570a17ae84e047fe8f0b88798" +SRC_URI=" + http://www.andre-simon.de/zip/${P}.tar.bz2 + test? ( https://gitlab.com/tajmone/${PN}-test-suite/-/archive/${TESTSUITE_COMMIT}/${PN}-test-suite-${TESTSUITE_COMMIT}.tar.bz2 ) + verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc ) +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="examples gui test" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig + gui? ( dev-qt/linguist-tools:5 ) + verify-sig? ( sec-keys/openpgp-keys-andresimon ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch +) + +myhlopts=( + CXX="$(tc-getCXX)" + AR="$(tc-getAR)" + LDFLAGS="${LDFLAGS}" + CFLAGS="${CXXFLAGS} -DNDEBUG" + DESTDIR="${D}" + PREFIX="${EPREFIX}/usr" + HL_CONFIG_DIR="${EPREFIX}/etc/highlight/" + HL_DATA_DIR="${EPREFIX}/usr/share/highlight/" + doc_dir="${EPREFIX}/usr/share/doc/${PF}/" + conf_dir="${EPREFIX}/etc/highlight/" + examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras" +) + +src_prepare() { + default + + # Disable man page compression + sed \ + -e "/GZIP/d" \ + -e "/COPYING/d" \ + -i makefile || die + + sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \ + -i src/core/datadir.cpp || die + + sed -r -i \ + -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \ + "${S}"/extras/tcl/makefile \ + "${S}"/extras/swig/makefile \ + || die "Failed to set Lua implementation" + + # We set it via eqmake5, otherwise it forces clang... + sed -e "s/QMAKE_CC/#QMAKE_CC/g" \ + -e "s/QMAKE_CXX /#QMAKE_CXX /g" \ + -i src/gui-qt/highlight.pro || die +} + +src_configure() { + if use gui ; then + pushd src/gui-qt > /dev/null || die + eqmake5 \ + 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"' + popd > /dev/null || die + fi +} + +src_compile() { + emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}" + if use gui ; then + emake -C src/gui-qt + fi +} + +src_test() { + find "../${PN}-test-suite-${TESTSUITE_COMMIT}" -mindepth 1 -maxdepth 1 -type d | sort | while read line + do + "${SHELL}" "${line}/regression.sh" || die "Regression tests failed for language $(basename "${line}")" + done +} + +src_install() { + emake -f makefile "${myhlopts[@]}" install + + if use gui; then + emake -f makefile "${myhlopts[@]}" install-gui + docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} + fi + + if ! use examples ; then + rm -r "${ED}"/usr/share/doc/${PF}/extras || die + fi +} diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest index 518c6a491b1f..b789100379d5 100644 --- a/app-text/html-xml-utils/Manifest +++ b/app-text/html-xml-utils/Manifest @@ -1,2 +1,3 @@ DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930 DIST html-xml-utils-8.5.tar.gz 421376 BLAKE2B 8fa959104db2d5765ceaf49be815f16c1422a3c7b94e0e8cd91e3bd0a8b18dfc33dff5d98204d7fe5694cfb711d213a5d82f58159b6d493fc78336d8dae1824d SHA512 f1140a81e66cc2f46dd0507a8948b2c267230fa8aed3dc79e91eeb2b6bcfe7053378da9d35fd053f8a8bc25c46491388aa7fd519c7e1c7757e73a7e1b1c67d87 +DIST html-xml-utils-8.6.tar.gz 421530 BLAKE2B 8c13a36798c5bb2e325f0df38696a9428b6c3ca087bbb4d1e7d9f2dd372e0aff386b7747e117016ad733ac07ab56a38b5ad0bcb1a0aa6b5ffd58de0ba2d8027d SHA512 0050b789a4921fa66b863255f1fd1ef9826e4b778ebc6dc67592fe854ec314b13cd8b162af67dae204018867966cfd5cb9822345917d3de3dc76c797bc0d2ec1 diff --git a/app-text/html-xml-utils/html-xml-utils-8.6.ebuild b/app-text/html-xml-utils/html-xml-utils-8.6.ebuild new file mode 100644 index 000000000000..e57cdbeb6610 --- /dev/null +++ b/app-text/html-xml-utils/html-xml-utils-8.6.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A number of simple utilities for manipulating HTML and XML files" +HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/" +SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz" + +LICENSE="W3C" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos" + +RDEPEND=" + net-dns/libidn2:= + net-misc/curl +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die +} + +src_test() { + # Lots of tests lack a shebang and use bashisms + # (seems to be better wrt bashisms as of 8.6, but still no shebang. recheck?) + emake check SHELL="${BROOT}"/bin/bash +} diff --git a/app-text/html-xml-utils/metadata.xml b/app-text/html-xml-utils/metadata.xml index bd8bcb2854e0..115e9d64a669 100644 --- a/app-text/html-xml-utils/metadata.xml +++ b/app-text/html-xml-utils/metadata.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest index e728da0cc0dd..910122596915 100644 --- a/app-text/html2text/Manifest +++ b/app-text/html2text/Manifest @@ -1,5 +1,2 @@ -DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5 -DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4 -DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1 -DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376 +DIST html2text-2.2.3.tar.gz 329841 BLAKE2B 311defd6aa6affc6f1ad59d9971f0315b6f2d748b4ae26e2c5f61cbd090ff76f0f0df7155acb1ec5c0114a6b6253eb27fc73d327162dca2a144afae74cdf4afa SHA512 ff851abdc0f672d6bf8de494d6595362d5b71eeb03f4f761e32afb50bb75fe12c0cede8c7ca4ca7290b1c9e0f08aaff9821946dd272e1a30ce3b585e452cf6ec diff --git a/app-text/html2text/files/html2text-1.3.2a-compiler.patch b/app-text/html2text/files/html2text-1.3.2a-compiler.patch deleted file mode 100644 index 19a1341209d4..000000000000 --- a/app-text/html2text/files/html2text-1.3.2a-compiler.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure -+++ b/configure -@@ -38,8 +38,8 @@ - return 0; - } - EOF --CXX=unknown; --for i in "CC" "g++" "cc" "$CC"; do -+CXX=${CXX-unknown} -+for i in "$CXX" "CC" "g++" "cc"; do - if $i -c $tmp_file.C 2>/dev/null; then - CXX="$i"; - break; diff --git a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch deleted file mode 100644 index 949d8958a449..000000000000 --- a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/urlistream.C -+++ b/urlistream.C -@@ -362,7 +362,7 @@ - int - urlistream::get() - { -- char ch; -+ unsigned char ch; - int ret = ::read(fd_, &ch, 1); - return (ret > 0 ? ch : -1); - } diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild deleted file mode 100644 index 16360f5083c1..000000000000 --- a/app-text/html2text/html2text-1.3.2a-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="HTML to text converter" -HOMEPAGE="http://www.mbayer.de/html2text/" -SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz - http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff - http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -PATCHES=( - "${FILESDIR}/${P}-compiler.patch" - "${FILESDIR}/${P}-urlistream-get.patch" - "${DISTDIR}/patch-utf8-${P}.diff" - "${DISTDIR}/patch-amd64-${P}.diff" -) - -src_prepare() { - default - gunzip html2text.1.gz html2textrc.5.gz || die - tc-export CXX -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}" -} - -src_install() { - dobin html2text - doman html2text.1 html2textrc.5 - dodoc CHANGES CREDITS KNOWN_BUGS README TODO -} diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild deleted file mode 100644 index 124d0962c321..000000000000 --- a/app-text/html2text/html2text-2.0.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/grobian/html2text.git" -else - SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="HTML to text converter" -HOMEPAGE="https://github.com/grobian/html2text" - -LICENSE="GPL-2" -SLOT="0" - -src_configure() { - # non-autoconf configure - tc-export CXX - ./configure || die -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - MANDIR="${EPREFIX}/usr/share/man" \ - DOCDIR="${EPREFIX}/usr/share/doc/${P}" \ - install -} diff --git a/app-text/html2text/html2text-2.1.1.ebuild b/app-text/html2text/html2text-2.1.1.ebuild index 8e084b811071..2a2be554d110 100644 --- a/app-text/html2text/html2text-2.1.1.ebuild +++ b/app-text/html2text/html2text-2.1.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/grobian/html2text.git" else SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="HTML to text converter" diff --git a/app-text/html2text/html2text-2.2.3.ebuild b/app-text/html2text/html2text-2.2.3.ebuild new file mode 100644 index 000000000000..990f9f594abc --- /dev/null +++ b/app-text/html2text/html2text-2.2.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/grobian/html2text.git" +else + SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="HTML to text converter" +HOMEPAGE="https://github.com/grobian/html2text" + +LICENSE="GPL-2" +SLOT="0" + +DEPEND="virtual/libiconv" +RDEPEND="${DEPEND}" + +src_test() { + emake check +} diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild deleted file mode 100644 index eb8aef7abf0b..000000000000 --- a/app-text/html2text/html2text-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/grobian/html2text.git" -else - SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="HTML to text converter" -HOMEPAGE="https://github.com/grobian/html2text" - -LICENSE="GPL-2" -SLOT="0" - -src_configure() { - # non-autoconf configure - tc-export CXX - default -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - MANDIR="${EPREFIX}/usr/share/man" \ - DOCDIR="${EPREFIX}/usr/share/doc/${P}" \ - install -} diff --git a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild index 717e80f671fd..c57dc344d252 100644 --- a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild +++ b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + inherit distutils-r1 # upstream doesn't do tags much @@ -18,7 +19,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" distutils_enable_tests setup.py diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch new file mode 100644 index 000000000000..22d716f01561 --- /dev/null +++ b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch @@ -0,0 +1,29 @@ +https://github.com/htacg/tidy-html5/issues/1012 +https://bugs.gentoo.org/916074 + +commit e411ad0d2582471fe0961900b2789ee8b5b9cc4c +Author: Markus Pister <pister@absint.com> +Date: Wed Jan 5 08:30:10 2022 +0100 + + Attribute 'type' in tag 'ol' allowed for (X)HTML5 + + Mark the attribute 'type' as allowed for tag 'ol' in (X)HTML5. + + The attribute type was deprecated in HTML4. This decision was reverted + for HTML5, see + + https://www.w3.org/TR/2014/NOTE-html5-diff-20141209/#changed-attributes + + This fixes htacg#1012. + +--- a/src/attrdict.c ++++ b/src/attrdict.c +@@ -2321,7 +2321,7 @@ const AttrVersion TY_(W3CAttrsFor_OL)[] = + { TidyAttr_START, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, + { TidyAttr_STYLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */ + { TidyAttr_TITLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */ +- { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx }, ++ { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 }, + { TidyAttr_XMLNS, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|XH11|XB10|HT50|XH50 }, /* CORE override */ + { TidyAttr_XML_LANG, xxxx|xxxx|xxxx|xxxx|X10T|xxxx|xxxx|X10F|xxxx|xxxx|X10S|XH11|XB10|xxxx|XH50 }, /* CORE override */ + INCLUDE_CORE_ATTRIBS diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild index 8d6b8e76e9ce..a0d767ef3275 100644 --- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild +++ b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,6 +25,7 @@ ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )" PATCHES=( "${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch + "${FILESDIR}"/${PN}-5.8.0-ol_type.patch ) DOCS=( README.md README/CHANGELOG.md ) diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml index cf0b468ab054..88aa1fd61eb2 100644 --- a/app-text/htmltidy/metadata.xml +++ b/app-text/htmltidy/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> - <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> diff --git a/app-text/htp/files/htp-1.19-fix-perl-5.26.patch b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch new file mode 100644 index 000000000000..b3adff7db2be --- /dev/null +++ b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/668250 +--- a/homepage/ref/pphtp.pl ++++ b/homepage/ref/pphtp.pl +@@ -6,7 +6,7 @@ + # -n include line numbers + # -s include EBNF like syntax + +-require "hlhtp.pl"; ++require "./hlhtp.pl"; + + + while ($ARGV[0] =~ /^-(.*)/) { diff --git a/app-text/htp/files/htp-1.19-no-prestrip.patch b/app-text/htp/files/htp-1.19-no-prestrip.patch new file mode 100644 index 000000000000..c47b9e4d4241 --- /dev/null +++ b/app-text/htp/files/htp-1.19-no-prestrip.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.sub ++++ b/src/Makefile.sub +@@ -46,7 +46,7 @@ install: install-bin + + install-bin: $(HTP) + mkdir -p $(bindir) +- $(INSTALL) -s $(HTP) $(bindir) ++ $(INSTALL) $(HTP) $(bindir) + + # + # explicit dependency: final executable diff --git a/app-text/htp/files/htp-1.19-parallel-make.patch b/app-text/htp/files/htp-1.19-parallel-make.patch new file mode 100644 index 000000000000..850b1d18e330 --- /dev/null +++ b/app-text/htp/files/htp-1.19-parallel-make.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/827173 +https://sources.debian.org/patches/htp/1.19-8/0004-Parallel-ftbfs.patch/ + +Description: Fix occasional parallel FTBFS + Various source files indirectly include $(d)/version.inc, + don't regenerate it in the middle of the build. +Author: Adrian Bunk <bunk@debian.org> + +--- htp-1.19.orig/src/Makefile.sub ++++ htp-1.19/src/Makefile.sub +@@ -57,14 +57,12 @@ $(HTP) : $(OBJ$(d)) + # + # implicit dependencies for source code + # +-$(OBJ$(d)) : %.$(OBJEXT) : %.c ++$(OBJ$(d)) : %.$(OBJEXT) : %.c $(d)/version.inc + ifdef WIN32DMC + cd $(dir $<); $(CC) $(CCOPT) $(DEFINES) $(notdir $<) + else + $(CC) $(CCOPT) $(DEFINES) -o $*.$(OBJEXT) $< + endif + +-$(d)/htp.$(OBJEXT) $(d)/ver.$(OBJEXT): $(d)/version.inc +- + # restore parent dir + d := $(p$(d)) + diff --git a/app-text/htp/htp-1.19.ebuild b/app-text/htp/htp-1.19-r1.ebuild index da6613e0dfbc..6977a567ef4a 100644 --- a/app-text/htp/htp-1.19.ebuild +++ b/app-text/htp/htp-1.19-r1.ebuild @@ -1,23 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="An HTML preprocessor" HOMEPAGE="http://htp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="Clarified-Artistic" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -RESTRICT="test" - -QA_PRESTRIPPED="/usr/bin/htp" +PATCHES=( + "${FILESDIR}"/${PN}-1.19-no-prestrip.patch + "${FILESDIR}"/${PN}-1.19-parallel-make.patch + "${FILESDIR}"/${PN}-1.19-fix-perl-5.26.patch +) src_compile() { + # TOOD: Tests are always run by the Makefile right now emake \ CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \ CC="$(tc-getCC)" \ diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index 1abaa146cd13..6cdfe356aec2 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,2 +1 @@ -DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808 DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac diff --git a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch index c45b9cc8a154..52696b968608 100644 --- a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch +++ b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch @@ -14,7 +14,6 @@ https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files --- src/tools/Makefile.am | 14 +++++++------- src/tools/chmorph.cxx | 6 +++--- - src/tools/example.cxx | 4 ++-- src/tools/munch.cxx | 4 ++-- src/tools/unmunch.cxx | 4 ++-- tests/Makefile.am | 2 +- @@ -77,22 +76,6 @@ index 6e5add6..163186d 100644 " (convert informal Hungarian second person texts to formal third " "person texts)\n"); exit(1); -diff --git a/src/tools/example.cxx b/src/tools/example.cxx -index 8213a5f..c3cc76a 100644 ---- a/src/tools/example.cxx -+++ b/src/tools/example.cxx -@@ -48,9 +48,9 @@ int main(int argc, char** argv) { - /* first parse the command line options */ - - if (argc < 4) { -- fprintf(stderr, "example (now it works with more dictionary files):\n"); -+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n"); - fprintf(stderr, -- "example affix_file dictionary_file(s) file_of_words_to_check\n"); -+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n"); - exit(1); - } - diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx index 5f51fc6..c8f8beb 100644 --- a/src/tools/munch.cxx diff --git a/app-text/hunspell/hunspell-1.7.1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild index e9b14d2c4b84..97635c6a1145 100644 --- a/app-text/hunspell/hunspell-1.7.1.ebuild +++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,17 +11,20 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool HOMEPAGE="https://hunspell.github.io/" SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz" -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" +LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0/$(ver_cut 1-2)" IUSE="ncurses nls readline static-libs" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" + virtual/libiconv ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) " DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext" +BDEPEND=" + >=sys-devel/gettext-0.18 +" PDEPEND="" for lang in ${LANGS}; do @@ -41,9 +44,9 @@ PATCHES=( # Upstream package creates some executables which names are too generic # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'. # It modifies a Makefile.am file, hence eautoreconf. - "${FILESDIR}/${PN}-1.7.0-renameexes.patch" + "${FILESDIR}/hunspell-1.7.2-renameexes.patch" - "${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614 + "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614 ) src_prepare() { @@ -60,23 +63,19 @@ src_configure() { # You can do that, libreoffice can find them anywhere, just # ping me when you do so ; -- scarabeus local myeconfargs=( - $(use_enable nls) - $(use_with ncurses ui) - $(use_with readline readline) - $(use_enable static-libs static) + "$(use_enable nls)" + "$(use_with ncurses ui)" + "$(use_with readline readline)" + "$(use_enable static-libs static)" ) econf "${myeconfargs[@]}" } src_install() { default - - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die + einstalldocs - # bug #342449 - pushd "${ED}"/usr/$(get_libdir)/ >/dev/null || die - ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} || die - popd >/dev/null || die + # Bug #908872 + keepdir "/usr/share/myspell" } diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild index ec1d75efbbdf..2b5009ebd494 100644 --- a/app-text/hunspell/hunspell-1.7.2.ebuild +++ b/app-text/hunspell/hunspell-1.7.2.ebuild @@ -11,10 +11,10 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool HOMEPAGE="https://hunspell.github.io/" SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz" -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" +LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0/$(ver_cut 1-2)" IUSE="ncurses nls readline static-libs" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" ncurses? ( sys-libs/ncurses:= ) @@ -41,9 +41,9 @@ PATCHES=( # Upstream package creates some executables which names are too generic # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'. # It modifies a Makefile.am file, hence eautoreconf. - "${FILESDIR}/${PN}-1.7.0-renameexes.patch" + "${FILESDIR}/hunspell-1.7.2-renameexes.patch" - "${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614 + "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614 ) src_prepare() { diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml index 527d24169a89..8c5ebb71fbc5 100644 --- a/app-text/hunspell/metadata.xml +++ b/app-text/hunspell/metadata.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> + <maintainer type="person" proxied="yes"> + <email>zurabid2016@gmail.com</email> + <name>Zurab Kvachadze</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> - <remote-id type="sourceforge">hunspell</remote-id> <remote-id type="github">hunspell/hunspell</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest index 8108cfab629e..0f1bd88a2f75 100644 --- a/app-text/iso-codes/Manifest +++ b/app-text/iso-codes/Manifest @@ -1,2 +1 @@ -DIST iso-codes-v4.12.0.tar.gz 14977180 BLAKE2B 23590e9a4f246a0879e68c521ae7f72f4dd8d41ef85e7b6efaa4e4a29b7bf2e45d5e200ae14523e4ef8d3d4c8f45e783d4231a2a1c679be1898aa04528da30d3 SHA512 d0cdac626728e4de7c5bb2f8edd968a29380d49ba2b43ebe3820756591e46d4301859da7961ec9fc9e6832e18a9a0d5562ec02dd3d8a52bec7f7cbfc3190869e -DIST iso-codes-v4.13.0.tar.gz 14990054 BLAKE2B e9e9a166675c09ecfe62da92608e91d4d6aeb53306e6162ea432bba418d074ef54cf510071aae6407bdc1fe59c295e52e2c7862e0d5b8962f467834c117f4912 SHA512 fd180b8462eb1ee2fd49bc144fd8b1b866067512a5deec3f580689641c596f623a11f0384e8c05cb48de520e1ce7c0270a649ef37542ba51f93e244b45bc5bba +DIST iso-codes-v4.16.0.tar.gz 15163129 BLAKE2B 8fcdb3c12c502c1e14169765db9c9dd7778fc5d4bb0da37aa6b27efeebd5ce9f3e825e5b1a7ae8d659babf2d6b9124af08b40ed8a2a1235e88df50be9c204ca5 SHA512 04d93eb37ff309c850a1af6d4cf6bb92a16e25ee35ee12e16325f6e7b476ba40bbf5d11e2f4c425111220480911b1dbc9e244189ea7487f1f0ea4dbce2307c96 diff --git a/app-text/iso-codes/iso-codes-4.13.0.ebuild b/app-text/iso-codes/iso-codes-4.13.0.ebuild deleted file mode 100644 index 2cb3270120b4..000000000000 --- a/app-text/iso-codes/iso-codes-4.13.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu" - -inherit python-any-r1 - -DESCRIPTION="ISO language, territory, currency, script codes and their translations" -HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes" -SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" - -BDEPEND="${PYTHON_DEPS} - sys-devel/gettext -" -S="${WORKDIR}/${PN}-v${PV}" - -# This ebuild does not install any binaries. -RESTRICT="binchecks strip" - -DOCS=( CHANGELOG.md README.md ) - -# plocale_find_changes doesn't support multiple directories, -# so need to do the update scan ourselves. -check_existing_locales() { - local std loc all_locales=() - - ebegin "Looking for new locales" - for std in "${all_stds[@]}"; do - pushd "${std}" >/dev/null || die - for loc in *.po; do - all_locales+=( "${loc%.po}" ) - done - popd >/dev/null - done - - all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u)) - if [[ ${PLOCALES} != "${all_locales}" ]]; then - eend 1 - eerror "There are changes in locales! This ebuild should be updated to:" - eerror "PLOCALES=\"${all_locales}\"" - die "Update PLOCALES in the ebuild" - else - eend 0 - fi -} - -src_prepare() { - default - - local std loc mylinguas - local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} ) - - check_existing_locales - - # Modify the Makefiles so they only install requested locales. - for std in "${all_stds[@]}"; do - einfo "Preparing ${std} ..." - pushd "${std}" >/dev/null || die - mylinguas=() - for loc in *.po; do - if has ${loc%.po} ${LINGUAS-${loc%.po}}; then - mylinguas+=( "${loc}" ) - fi - done - - sed \ - -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \ - -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \ - -i Makefile.am Makefile.in || die "sed in ${std} folder failed" - popd >/dev/null - done -} diff --git a/app-text/iso-codes/iso-codes-4.12.0.ebuild b/app-text/iso-codes/iso-codes-4.16.0.ebuild index 063a3ca9adca..4aad8abc0e5a 100644 --- a/app-text/iso-codes/iso-codes-4.12.0.ebuild +++ b/app-text/iso-codes/iso-codes-4.16.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu" +PYTHON_COMPAT=( python3_{10..12} ) +PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mr ms mt my na nah nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ro_MD ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu" inherit python-any-r1 @@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV} LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="${PYTHON_DEPS} sys-devel/gettext diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml index 05de60192e40..db23b120593e 100644 --- a/app-text/iso-codes/metadata.xml +++ b/app-text/iso-codes/metadata.xml @@ -5,6 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <stabilize-allarches/> <longdescription lang="en"> This package provides the ISO-639 Language code list, the ISO-3166 Territory code list, and ISO-3166-2 sub-territory lists, and all their diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest index b3afe26bca2a..9adc3f1a1118 100644 --- a/app-text/itex2mml/Manifest +++ b/app-text/itex2mml/Manifest @@ -1 +1 @@ -DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171 +DIST itexToMML-1.6.1.tar.gz 513185 BLAKE2B d3bf94a0eb95b7c448e0691e4ae5bd6ba37de97f86331ebaad5dea034d0bb259514b3acee0c926b711500ce0f7069ec95838a172385d9459167a7a3b29200d77 SHA512 6d35c5d2b5c5bbf8e1a938c5a7005dd32af85896df812e305931b4d8aafd57c2c4b31311495477109d53a6447ddfa9ffa2af3c92fb8176157d651851a2383409 diff --git a/app-text/itex2mml/itex2mml-1.5.6.ebuild b/app-text/itex2mml/itex2mml-1.6.1.ebuild index 16120ff44755..4b5b27122fed 100644 --- a/app-text/itex2mml/itex2mml-1.5.6.ebuild +++ b/app-text/itex2mml/itex2mml-1.6.1.ebuild @@ -1,23 +1,26 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -DESCRIPTION="A LaTeX into XHTML/MathML converter" +DESCRIPTION="LaTeX to XHTML/MathML converter" HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html" SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz" -LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )" +S="${WORKDIR}/itexToMML/itex-src" +LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="" -S="${WORKDIR}/itexToMML/itex-src" +src_configure() { + # fix bug #719070 + sed -i -e "s/\$(CXX) \$(CFLAGS)/ \$(CXX) ${CFLAGS} ${LDFLAGS}/" Makefile || die +} src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" } src_install() { diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild index b051ca390114..5c18657e730a 100644 --- a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild +++ b/app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit desktop java-pkg-2 @@ -11,19 +11,17 @@ MY_URI_PV_1="${PV/rc/}" MY_URI_PV="${MY_URI_PV_1//_/%20}" DESCRIPTION="Java GUI for managing BibTeX and other bibliographies" -HOMEPAGE="http://www.jabref.org/" -# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar" +HOMEPAGE="https://www.jabref.org/" +# SRC_URI="https://downloads.sourceforge.net/jabref/JabRef-${MY_PV}.jar" SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" +S="${WORKDIR}" -LICENSE="MIT" +LICENSE="MIT JSON" SLOT="0" KEYWORDS="amd64 x86" -DEPEND="app-arch/unzip" - RDEPEND="virtual/jre:1.8" - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_unpack() { cp -v "${DISTDIR}/${A}" . || die diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild index 475c086168ea..ce903d0506ad 100644 --- a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild +++ b/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 JAVA_PKG_WANT_TARGET=1.8 @@ -13,21 +13,19 @@ MY_URI_PV_1="${PV/rc/}" MY_URI_PV="${MY_URI_PV_1//_/%20}" DESCRIPTION="Java GUI for managing BibTeX and other bibliographies" -HOMEPAGE="http://www.jabref.org/" +HOMEPAGE="https://www.jabref.org/" SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" +S="${WORKDIR}" -LICENSE="MIT" +LICENSE="MIT JSON" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/unzip" - RDEPEND=" dev-java/openjdk:8[javafx] virtual/jre:1.8 " - -S="${WORKDIR}" +BDEPEND="app-arch/unzip" src_unpack() { cp -v "${DISTDIR}/${A}" . || die diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild b/app-text/jabref-bin/jabref-bin-4.9999.ebuild deleted file mode 100644 index 6ad4e16b1e25..000000000000 --- a/app-text/jabref-bin/jabref-bin-4.9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop java-pkg-2 - -DESCRIPTION="Java GUI manages bibliographies in a BibTeX database" -HOMEPAGE="http://www.jabref.org/" -S="${WORKDIR}" -PROPERTIES="live" - -LICENSE="MIT" -SLOT="0" - -DEPEND="app-arch/unzip" - -RDEPEND=" - dev-java/openjdk:8[javafx] - virtual/jre:1.8 -" - -src_unpack() { - einfo "Downloading the latest Jabref development snapshot." - einfo "Upstream updates these a few times per day." - wget "https://builds.jabref.org/master/JabRef--master--latest.jar" -O ${P}.jar || die "wget failed" - unzip ${P}.jar images/external/JabRef-icon-48.png || die "icon extraction failed" -} - -src_install() { - java-pkg_newjar "${P}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/external/JabRef-icon-48.png JabRef-bin-icon.png - make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office - ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format." - ewarn "The conversion is irreversible, backup .bib files before starting Jabref." - ewarn "Jabref 4.x is under heavy development and very unstable." -} diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest index 682a1a0e30d6..c44092fd5cf1 100644 --- a/app-text/kbibtex/Manifest +++ b/app-text/kbibtex/Manifest @@ -1 +1 @@ -DIST kbibtex-0.9.3.1.tar.xz 4219496 BLAKE2B dc57f8f54ec6cbadc1b0b529387a47524f3ceb9e69a79e777a9b69c14c8cd2f240a6153bf9f95f5f5c57483a93c84505d6673625ccb38233c3a3b177bc20b4c4 SHA512 2e7406c16e1e520973166d6a4d27f4e3d51a4276ea25de611d09010ca40e3b0ea56fce6c29589ae51c58096c362cab11b439df0d80ff1b6951d4b92d46262e27 +DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d diff --git a/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch new file mode 100644 index 000000000000..33fb8ebb4542 --- /dev/null +++ b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,7 @@ + LANGUAGES CXX + ) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(QT_MIN_VERSION 5.9.0) + # Somewhat arbitrary chosen version number ... + set(KF5_MIN_VERSION 5.51) diff --git a/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch b/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch deleted file mode 100644 index 2235498bbe7a..000000000000 --- a/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f12d17d38011fd8b432ed4ba8952eb9241b152a6 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 24 Jan 2023 20:17:55 +0100 -Subject: [PATCH] Revert "Fixing minore build system issues" - -This reverts commit 6860474d423c47f0633d537851b793fda76ae223. ---- - CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c375a34b..48196146 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,8 +43,6 @@ include(KDECMakeSettings) - include(ECMInstallIcons) - include(ECMSetupVersion) - include(ECMAddAppIcon) --include(ECMQtDeclareLoggingCategory) --include(ECMGenerateHeaders) - include(GenerateExportHeader) - - find_package( -@@ -54,7 +52,6 @@ find_package( - Core - Widgets - Network -- NetworkAuth - XmlPatterns - Concurrent - ) --- -2.39.1 - diff --git a/app-text/kbibtex/kbibtex-0.9.3.1.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild index 30394d6ef420..aa8b9929c2d5 100644 --- a/app-text/kbibtex/kbibtex-0.9.3.1.ebuild +++ b/app-text/kbibtex/kbibtex-0.10.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" -ECM_TEST="true" +ECM_TEST="optional" KFMIN=5.82.0 QTMIN=5.15.5 inherit ecm kde.org optfeature @@ -13,23 +13,23 @@ DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX" HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX" if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/KBibTeX/$(ver_cut 1-3)/${P}.tar.xz" + SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz" KEYWORDS="amd64 x86" fi LICENSE="GPL-2" SLOT="5" -IUSE="webengine zotero" +IUSE="webengine" RESTRICT="test" -DEPEND=" +COMMON_DEPEND=" app-text/poppler[qt5] dev-libs/icu:= - >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=dev-qt/qtxmlpatterns-${QTMIN}:5 @@ -52,22 +52,20 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) - zotero? ( - >=app-crypt/qca-2.3.0:2[qt5(+)] - dev-libs/qoauth:5 - ) " -RDEPEND="${DEPEND} +RDEPEND="${COMMON_DEPEND} dev-tex/bibtex2html " +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" -PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" ) +PATCHES=( "${FILESDIR}"/${P}-cxx17.patch ) src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON $(cmake_use_find_package webengine Qt5WebEngineWidgets) - $(cmake_use_find_package zotero Qca-qt5) ) ecm_src_configure @@ -75,7 +73,7 @@ src_configure() { pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}" + optfeature "PDF or PostScript document previews" "media-gfx/okularpart:5" "kde-apps/okular:5" fi ecm_pkg_postinst } diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml index b150cc0faf58..32ff49f58c38 100644 --- a/app-text/kbibtex/metadata.xml +++ b/app-text/kbibtex/metadata.xml @@ -7,9 +7,9 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">office/kbibtex</remote-id> </upstream> <use> <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag> - <flag name="zotero">Enable support for synchronisation with zotero.org web service</flag> </use> </pkgmetadata> diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild index 188a1ca12bc0..23823fd53382 100644 --- a/app-text/kchmviewer/kchmviewer-8.0.ebuild +++ b/app-text/kchmviewer/kchmviewer-8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}/kchmviewer-RELEASE_8_0" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="" DEPEND=" diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest index ce9d679bdbbc..27a4f377995e 100644 --- a/app-text/kjots/Manifest +++ b/app-text/kjots/Manifest @@ -1 +1 @@ -DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62 +DIST kjots-5.1.1.tar.xz 232816 BLAKE2B e90f0d4964a939898bd484ce691a0586725705d27e65af513ebfcd7b2bd1eec731e2374e550e92def736c72bad12e272c9cae1c32eabda67a2c1c45cb6655b69 SHA512 b0b4c3f9e11d5cc91b6667bc0483e1e3c62535473e99abbe6fb8e5e4519c1a2b72372de42f63fa2f6e730b40e03fcbc99cd0e189084f0122bfccf45185d2b088 diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch deleted file mode 100644 index 3f0c4e52779b..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Wed, 8 Sep 2021 00:58:25 +0200 -Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++ - namespace as prefix - -GIT_SILENT ---- - src/kjotsedit.cpp | 5 +++++ - src/kjotsmodel.cpp | 6 ++++++ - src/kjotsmodel.h | 6 ++++++ - src/kjotswidget.cpp | 20 +++++++++++++++++++- - src/kjotswidget.h | 5 +++++ - src/noteshared/notecreatorandselector.cpp | 7 +++++++ - src/noteshared/notecreatorandselector.h | 6 ++++++ - src/noteshared/notelockattribute.h | 6 ++++++ - src/noteshared/notepinattribute.h | 6 ++++++ - src/noteshared/standardnoteactionmanager.cpp | 8 ++++++++ - src/noteshared/standardnoteactionmanager.h | 9 +++++++-- - src/notesortproxymodel.cpp | 5 +++++ - 12 files changed, 86 insertions(+), 3 deletions(-) - -diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp -index f1d61bd..c20bc42 100644 ---- a/src/kjotsedit.cpp -+++ b/src/kjotsedit.cpp -@@ -33,7 +33,12 @@ - #include <KPIMTextEdit/RichTextComposerActions> - #include <KPIMTextEdit/RichTextComposerImages> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/Item> -+#else - #include <AkonadiCore/Item> -+#endif - - #include "kjotslinkdialog.h" - #include "kjotsmodel.h" -diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp -index e35c94f..99ee14f 100644 ---- a/src/kjotsmodel.cpp -+++ b/src/kjotsmodel.cpp -@@ -13,8 +13,14 @@ - #include <QTextDocument> - #include <QIcon> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/ChangeRecorder> -+#include <Akonadi/EntityDisplayAttribute> -+#else - #include <AkonadiCore/ChangeRecorder> - #include <AkonadiCore/EntityDisplayAttribute> -+#endif - #include <Akonadi/Notes/NoteUtils> - - #include <KMime/Message> -diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h -index 71e0ca6..ec564a7 100644 ---- a/src/kjotsmodel.h -+++ b/src/kjotsmodel.h -@@ -10,7 +10,13 @@ - #ifndef KJOTSMODEL_H - #define KJOTSMODEL_H - -+#include <akonadi_version.h> -+#include <QtGlobal> // for QT_VERSION_CHECK -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/EntityTreeModel> -+#else - #include <AkonadiCore/EntityTreeModel> -+#endif - - class QTextDocument; - -diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp -index 3a3abd0..834fc33 100644 ---- a/src/kjotswidget.cpp -+++ b/src/kjotswidget.cpp -@@ -35,6 +35,24 @@ - - // Akonadi - #include <Akonadi/Notes/NoteUtils> -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/AttributeFactory> -+#include <Akonadi/CollectionCreateJob> -+#include <Akonadi/CollectionDeleteJob> -+#include <Akonadi/ChangeRecorder> -+#include <Akonadi/EntityDisplayAttribute> -+#include <Akonadi/EntityMimeTypeFilterModel> -+#include <Akonadi/Item> -+#include <Akonadi/ItemCreateJob> -+#include <Akonadi/ItemModifyJob> -+#include <Akonadi/ItemDeleteJob> -+#include <Akonadi/ItemFetchScope> -+#include <Akonadi/EntityOrderProxyModel> -+#include <Akonadi/EntityTreeView> -+#include <Akonadi/ETMViewStateSaver> -+#include <Akonadi/ControlGui> -+#else - #include <AkonadiCore/AttributeFactory> - #include <AkonadiCore/CollectionCreateJob> - #include <AkonadiCore/CollectionDeleteJob> -@@ -50,7 +68,7 @@ - #include <AkonadiWidgets/EntityTreeView> - #include <AkonadiWidgets/ETMViewStateSaver> - #include <AkonadiWidgets/ControlGui> -- -+#endif - // Grantlee - #include <grantlee/template.h> - #include <grantlee/engine.h> -diff --git a/src/kjotswidget.h b/src/kjotswidget.h -index 7fe91ed..00a41b5 100644 ---- a/src/kjotswidget.h -+++ b/src/kjotswidget.h -@@ -18,7 +18,12 @@ - #include <QAbstractItemDelegate> - #include <QPrinter> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/Collection> -+#else - #include <AkonadiCore/Collection> -+#endif - - #include <grantlee/templateloader.h> - -diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp -index 2172cbf..6d58c83 100644 ---- a/src/noteshared/notecreatorandselector.cpp -+++ b/src/noteshared/notecreatorandselector.cpp -@@ -14,9 +14,16 @@ - - #include <KMime/Message> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/EntityDisplayAttribute> -+#include <Akonadi/EntityTreeModel> -+#include <Akonadi/ItemCreateJob> -+#else - #include <AkonadiCore/EntityDisplayAttribute> - #include <AkonadiCore/EntityTreeModel> - #include <AkonadiCore/ItemCreateJob> -+#endif - #include <Akonadi/Notes/NoteUtils> - - #include "noteshared_debug.h" -diff --git a/src/noteshared/notecreatorandselector.h b/src/noteshared/notecreatorandselector.h -index 90055cf..986d042 100644 ---- a/src/noteshared/notecreatorandselector.h -+++ b/src/noteshared/notecreatorandselector.h -@@ -14,8 +14,14 @@ - #include <QItemSelectionModel> - #include <QTimer> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/Collection> -+#include <Akonadi/Item> -+#else - #include <AkonadiCore/Collection> - #include <AkonadiCore/Item> -+#endif - - class KJob; - -diff --git a/src/noteshared/notelockattribute.h b/src/noteshared/notelockattribute.h -index 9bdd8a2..b0ee819 100644 ---- a/src/noteshared/notelockattribute.h -+++ b/src/noteshared/notelockattribute.h -@@ -11,7 +11,13 @@ - #ifndef KJOTS_LOCK_ATTRIBUTE_H - #define KJOTS_LOCK_ATTRIBUTE_H - -+#include <akonadi_version.h> -+#include <QtGlobal> // for QT_VERSION_CHECK -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/Attribute> -+#else - #include <AkonadiCore/Attribute> -+#endif - - namespace NoteShared - { -diff --git a/src/noteshared/notepinattribute.h b/src/noteshared/notepinattribute.h -index 3026dea..5f3903c 100644 ---- a/src/noteshared/notepinattribute.h -+++ b/src/noteshared/notepinattribute.h -@@ -9,7 +9,13 @@ - #ifndef NOTE_PIN_ATTRIBUTE_H - #define NOTE_PIN_ATTRIBUTE_H - -+#include <akonadi_version.h> -+#include <QtGlobal> // for QT_VERSION_CHECK -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/Attribute> -+#else - #include <AkonadiCore/Attribute> -+#endif - - namespace NoteShared - { -diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp -index a3f4b8b..2a2f4ce 100644 ---- a/src/noteshared/standardnoteactionmanager.cpp -+++ b/src/noteshared/standardnoteactionmanager.cpp -@@ -13,10 +13,18 @@ - #include <QColorDialog> - #include <QItemSelectionModel> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/EntityDisplayAttribute> -+#include <Akonadi/EntityTreeModel> -+#include <Akonadi/CollectionModifyJob> -+#include <Akonadi/ItemModifyJob> -+#else - #include <AkonadiCore/EntityDisplayAttribute> - #include <AkonadiCore/EntityTreeModel> - #include <AkonadiCore/CollectionModifyJob> - #include <AkonadiCore/ItemModifyJob> -+#endif - #include <Akonadi/Notes/NoteUtils> - - #include <KXmlGui/KActionCollection> -diff --git a/src/noteshared/standardnoteactionmanager.h b/src/noteshared/standardnoteactionmanager.h -index fe80dae..6605820 100644 ---- a/src/noteshared/standardnoteactionmanager.h -+++ b/src/noteshared/standardnoteactionmanager.h -@@ -10,10 +10,15 @@ - #ifndef AKONADI_STANDARDNOTESACTIONMANAGER_H - #define AKONADI_STANDARDNOTESACTIONMANAGER_H - --#include <AkonadiWidgets/StandardActionManager> -- - #include <QObject> - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/StandardActionManager> -+#else -+#include <AkonadiWidgets/StandardActionManager> -+#endif -+ - class QAction; - class KActionCollection; - class QItemSelectionModel; -diff --git a/src/notesortproxymodel.cpp b/src/notesortproxymodel.cpp -index 89def1c..dbe582f 100644 ---- a/src/notesortproxymodel.cpp -+++ b/src/notesortproxymodel.cpp -@@ -8,7 +8,12 @@ - - #include "notesortproxymodel.h" - -+#include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include <Akonadi/EntityTreeModel> -+#else - #include <AkonadiCore/EntityTreeModel> -+#endif - - #include "noteshared/notepinattribute.h" - --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch deleted file mode 100644 index a5ef2cc2cdf9..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Tue, 1 Mar 2022 23:33:19 +0100 -Subject: [PATCH] Fix akonadi includes - ---- - src/kjotsmodel.cpp | 2 +- - src/kjotswidget.cpp | 2 +- - src/noteshared/notecreatorandselector.cpp | 2 +- - src/noteshared/standardnoteactionmanager.cpp | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - - -From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <wbauer@tmo.at> -Date: Fri, 1 Apr 2022 08:00:34 +0000 -Subject: [PATCH] Fix build with Akonadi 21.12 - ---- - src/kjotsmodel.cpp | 4 ++++ - src/kjotswidget.cpp | 6 +++++- - src/noteshared/notecreatorandselector.cpp | 4 ++++ - src/noteshared/standardnoteactionmanager.cpp | 4 ++++ - 4 files changed, 17 insertions(+), 1 deletion(-) - -diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp ---- a/src/kjotsmodel.cpp -+++ b/src/kjotsmodel.cpp -@@ -21,7 +21,11 @@ - #include <AkonadiCore/ChangeRecorder> - #include <AkonadiCore/EntityDisplayAttribute> - #endif -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) -+#include <Akonadi/NoteUtils> -+#else - #include <Akonadi/Notes/NoteUtils> -+#endif - - #include <KMime/Message> - #include <KPIMTextEdit/TextUtils> -diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp ---- a/src/kjotswidget.cpp -+++ b/src/kjotswidget.cpp -@@ -34,8 +34,12 @@ - #include <QDebug> - - // Akonadi --#include <Akonadi/Notes/NoteUtils> - #include <akonadi_version.h> -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) -+#include <Akonadi/NoteUtils> -+#else -+#include <Akonadi/Notes/NoteUtils> -+#endif - #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) - #include <Akonadi/AttributeFactory> - #include <Akonadi/CollectionCreateJob> -diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp ---- a/src/noteshared/notecreatorandselector.cpp -+++ b/src/noteshared/notecreatorandselector.cpp -@@ -24,7 +24,11 @@ - #include <AkonadiCore/EntityTreeModel> - #include <AkonadiCore/ItemCreateJob> - #endif -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) -+#include <Akonadi/NoteUtils> -+#else - #include <Akonadi/Notes/NoteUtils> -+#endif - - #include "noteshared_debug.h" - -diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp ---- a/src/noteshared/standardnoteactionmanager.cpp -+++ b/src/noteshared/standardnoteactionmanager.cpp -@@ -25,7 +25,11 @@ - #include <AkonadiCore/CollectionModifyJob> - #include <AkonadiCore/ItemModifyJob> - #endif -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) -+#include <Akonadi/NoteUtils> -+#else - #include <Akonadi/Notes/NoteUtils> -+#endif - - #include <KXmlGui/KActionCollection> - #include <KLocalizedString> diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch deleted file mode 100644 index fc5240105b02..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 14 Jul 2022 14:27:55 +0200 -Subject: [PATCH] Adapt to new KontactInterface::Plugin ctor - ---- - src/kontact_plugin/kjots_plugin.cpp | 5 +++++ - src/kontact_plugin/kjots_plugin.h | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp -index 1146ab3..c75faac 100644 ---- a/src/kontact_plugin/kjots_plugin.cpp -+++ b/src/kontact_plugin/kjots_plugin.cpp -@@ -40,8 +40,13 @@ - - EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json") - -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) -+KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &/*args*/) -+ : KontactInterface::Plugin(core, core, md, "kjots") -+#else - KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &/*args*/) - : KontactInterface::Plugin(core, core, "kjots") -+#endif - { - setComponentName(QStringLiteral("kjots"), i18n("KJots")); - -diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h -index 28a793b..03ff500 100644 ---- a/src/kontact_plugin/kjots_plugin.h -+++ b/src/kontact_plugin/kjots_plugin.h -@@ -34,7 +34,11 @@ class KJotsPlugin : public KontactInterface::Plugin - Q_OBJECT - - public: -+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41) -+ KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &); -+#else - KJotsPlugin(KontactInterface::Core *core, const QVariantList &); -+#endif - - int weight() const override - { --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch deleted file mode 100644 index b81bafc1889f..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8803636bf4e0238d0f23bedebdcb4d1e6283ffb7 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 26 Apr 2021 17:09:51 +0200 -Subject: [PATCH] Make dependency on KI18n explicit - -It already pulled in by KParts, but we better not rely on that ---- - src/kontact_plugin/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt -index dec4b8b..f1d56ec 100644 ---- a/src/kontact_plugin/CMakeLists.txt -+++ b/src/kontact_plugin/CMakeLists.txt -@@ -13,7 +13,7 @@ set(kontact_kjots_PART_SRCS - ) - - add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS}) --target_link_libraries(kontact_kjotsplugin KF5::KontactInterface) -+target_link_libraries(kontact_kjotsplugin KF5::I18n KF5::KontactInterface) - kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop) - - install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5) --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch deleted file mode 100644 index 28418717d3be..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3d3cee8caeec813802a1af54c14805203fb1ddf6 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Tue, 7 Sep 2021 23:21:34 +0200 -Subject: [PATCH] noteshared: add missing library to link list - -GIT_SILENT ---- - src/noteshared/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/noteshared/CMakeLists.txt b/src/noteshared/CMakeLists.txt -index 5de60ab..6aa0b0a 100644 ---- a/src/noteshared/CMakeLists.txt -+++ b/src/noteshared/CMakeLists.txt -@@ -16,6 +16,7 @@ target_link_libraries(noteshared - Qt5::Core - Qt5::Widgets - KF5::I18n -+ KF5::AkonadiWidgets - KF5::AkonadiCore - KF5::AkonadiNotes - KF5::XmlGui --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch deleted file mode 100644 index 95c3309bd5b9..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c552b158e46ccdefc5c8382911aca907e177d63d Mon Sep 17 00:00:00 2001 -From: Igor Poboiko <igor.poboiko@gmail.com> -Date: Sat, 19 Mar 2022 15:44:50 +0100 -Subject: [PATCH] Allow compiling without KPIMTextEdit/TextToSpeech - ---- - src/kjotsbrowser.cpp | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/src/kjotsbrowser.cpp b/src/kjotsbrowser.cpp -index fd6e6dd..8864f79 100644 ---- a/src/kjotsbrowser.cpp -+++ b/src/kjotsbrowser.cpp -@@ -15,9 +15,13 @@ - #include "kjotsmodel.h" - - #include <KPIMTextEdit/RichTextEditFindBar> --#include <KPIMTextEdit/TextToSpeechWidget> - #include <KPIMTextEdit/SlideContainer> - -+#include <kpimtextedit/kpimtextedit-texttospeech.h> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH -+#include <KPIMTextEdit/TextToSpeechWidget> -+#endif -+ - #include <QHelpEvent> - #include <QToolTip> - #include <QVBoxLayout> -@@ -37,14 +41,18 @@ public: - : mBrowser(std::move(browser)) - , mSliderContainer(widget) - , mFindBar(mBrowser.get(), &mSliderContainer) -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - , mTextToSpeechWidget(widget) -+#endif - { - } - - std::unique_ptr<KJotsBrowser> mBrowser; - KPIMTextEdit::SlideContainer mSliderContainer; - KPIMTextEdit::RichTextEditFindBar mFindBar; -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget; -+#endif - }; - - KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QWidget *parent) -@@ -56,11 +64,15 @@ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QW - d->mFindBar.setHideWhenClose(false); - - connect(&d->mFindBar, &KPIMTextEdit::RichTextEditFindBar::hideFindBar, this, &KJotsBrowserWidget::slotHideFindBar); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - connect(d->mBrowser.get(), &KJotsBrowser::say, &d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -+#endif - - QVBoxLayout *lay = new QVBoxLayout(this); - lay->setContentsMargins(0, 0, 0, 0); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - lay->addWidget(&d->mTextToSpeechWidget); -+#endif - lay->addWidget(d->mBrowser.get()); - lay->addWidget(&d->mSliderContainer); - } -@@ -129,6 +141,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event) - popup->addSeparator(); - popup->addAction(m_actionCollection->action(QString::fromLatin1(KStandardAction::name(KStandardAction::Find)))); - popup->addSeparator(); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - if (!document()->isEmpty() && KPIMTextEdit::TextToSpeech::self()->isReady()) { - QAction *speakAction = popup->addAction(i18nc("@info:action", "Speak Text")); - speakAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech"))); -@@ -137,6 +150,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event) - Q_EMIT say(text); - }); - } -+#endif - popup->exec(event->globalPos()); - delete popup; - } --- -GitLab - diff --git a/app-text/kjots/files/kjots-5.1.0-unused-dep.patch b/app-text/kjots/files/kjots-5.1.0-unused-dep.patch deleted file mode 100644 index 466bc3c62a2a..000000000000 --- a/app-text/kjots/files/kjots-5.1.0-unused-dep.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1aa82d97c3140ebb93e642c48d187d37cea2e537 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Sat, 20 Feb 2021 22:00:41 +0100 -Subject: [PATCH] Drop unused libkdepim dependency - ---- - CMakeLists.txt | 2 -- - src/CMakeLists.txt | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d79806..5204908 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ set(KDEPIMLIBS_LIB_VERSION "5.1.0") - set(KMIME_LIB_VERSION "4.87.0") - set(KPIMTEXTEDIT_LIB_VERSION "5.14.44") - set(KONTACTINTERFACE_LIB_VERSION "4.82.0") --set(LIBKDEPIM_LIB_VERSION "5.14.1") - - #Qt Packages - set(QT_REQUIRED_VERSION "5.6.0") -@@ -45,7 +44,6 @@ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED) --find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) - - find_package(Grantlee5 "5.0" CONFIG REQUIRED) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a512dab..e66e805 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -49,7 +49,6 @@ target_link_libraries(kjots_common - KF5::PimTextEdit - KF5::XmlGui - KF5::KIOWidgets -- KF5::Libkdepim - Grantlee5::Templates - Grantlee5::TextDocument - ) --- -GitLab - diff --git a/app-text/kjots/kjots-5.1.0-r3.ebuild b/app-text/kjots/kjots-5.1.1.ebuild index 19a1d1ab13f5..39834da4447e 100644 --- a/app-text/kjots/kjots-5.1.0-r3.ebuild +++ b/app-text/kjots/kjots-5.1.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 KDE_ORG_CATEGORY="pim" -KFMIN=5.102.0 +KFMIN=5.103.0 QTMIN=5.15.5 inherit ecm kde.org @@ -21,16 +21,17 @@ SLOT="5" IUSE="speech" DEPEND=" - dev-libs/grantlee:5 + >=dev-libs/grantlee-5.3:5 + dev-libs/ktextaddons:5[speech?] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-22.08.3:5 - >=kde-apps/akonadi-notes-22.08.3:5 - >=kde-apps/kmime-22.08.3:5 - >=kde-apps/kontactinterface-22.08.3:5 - >=kde-apps/kpimtextedit-22.08.3:5[speech(+)=] + >=kde-apps/akonadi-23.04.0:5 + >=kde-apps/akonadi-notes-23.04.0:5 + >=kde-apps/kmime-23.04.0:5 + >=kde-apps/kontactinterface-23.04.0:5 + >=kde-apps/kpimtextedit-23.04.0:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -44,15 +45,13 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND} - >=kde-apps/kdepim-runtime-22.08.3:5 + >=kde-apps/kdepim-runtime-23.04.0:5 " -PATCHES=( - "${FILESDIR}/${P}-unused-dep.patch" - "${FILESDIR}/${P}-implicit-dep.patch" - "${FILESDIR}/${P}-missing-lib.patch" - "${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 - "${FILESDIR}/${P}-speech-optional.patch" # bug 835128 - "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 - "${FILESDIR}/${P}-akonadi-22.08.0.patch" # bug 867082 -) +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package speech KF5TextEditTextToSpeech) + ) + + ecm_src_configure +} diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml index fa80953797d0..8e5041d0d9ff 100644 --- a/app-text/kjots/metadata.xml +++ b/app-text/kjots/metadata.xml @@ -7,8 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">pim/kjots</remote-id> </upstream> - <use> - <flag name="speech">Enable text-to-speech support</flag> - </use> </pkgmetadata> diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest index 399877930869..fb204db40447 100644 --- a/app-text/kramdown-rfc/Manifest +++ b/app-text/kramdown-rfc/Manifest @@ -1,4 +1,2 @@ -DIST kramdown-rfc2629-1.6.17.gem 55808 BLAKE2B 7b3d8359eab9dc9ac9a2beeba74c541a75a9d92418f8f2f16798fb893a45c8347d4c51f11eb9d3032adae71324c5c67a0dcd809c8be06acd831a3615759f3b55 SHA512 e2284db908fa1ef5aa9b36ff6868b11d87a7e6622dce3c540878661eae837b378ed913af12df35d86b5cc8c233ae55e3ad981471390717b2ead3fcd0f3ca781e -DIST kramdown-rfc2629-1.6.18.gem 55808 BLAKE2B 536906e3f54d202808a06e8e86f4f431b3d30349056644c30fea7e9e57b5586d0a97f9e7e2a1511ddc68a33bf6115c94edc20d98057d333384840871fba00a9d SHA512 911a7a898567f5e085a788d8fbf135d8323af9d2e587ab302a43719f5a7abc820604c2d36eb6ac569dd999e7d08a3ee7a058eeb41c156ec1e295ce3ce9ed194c -DIST kramdown-rfc2629-1.6.21.gem 56320 BLAKE2B 80946169b6041d4f8011a93dc9c8fba82ef32a117d11fd9002704bf80a68caab21991edf9e74440e90853e2bcc41f13cd37256b15c8775d6cdf2b1a60ddf3d90 SHA512 3c5ad31d302a0b6ea87b2380aa95a2d1410b50fc6708623ec691e4dfe1dac71b27c5a79aae9f275ffeca577049eb615bdbe03481d5cb6036ca46ed5b8404355c -DIST kramdown-rfc2629-1.6.22.gem 56320 BLAKE2B 8871ae9c854dc3de3f954863ce7631f6a18e8a501850ca068373edf9e3a794b7f7ead729b357eacfed9a58152153fb87dd746d4602ea998e1770d8dec34ec990 SHA512 bc080b9ce477a199621b6f57164ffcf59c7d941e1daeaf1496446152c31c5e959a7fb218b2ddda74d1df241bb8df8d9516b069dfae265b10629d346e0d5f3b00 +DIST kramdown-rfc2629-1.6.36.gem 60928 BLAKE2B e1f5a3299ddca462b7ab3935019b95f58aebfc5de52271142b41cbf03102a574181b0d29d5701e0f6b710eb7c8b85dda0f9700b8e47698b6d079cd8c07d720b0 SHA512 d3c32bd0e692ebf5dfb428617ce6ae37ac91ff99021a59e11df205e88c76699c8fabd8dd7922f6e9a5653b12e3c113eeedbb38b6edd656d67cd16b5f03a3136e +DIST kramdown-rfc2629-1.6.39.gem 62464 BLAKE2B 4063bab5ef8081c5a2aba3d881990d9ea4e6dd5ce01bf85e0ce6bc63b0fc6c1e8e9be413b00588c5e6e473ee26dfb6060aa8767ce6b4053c1b8750f79182e540 SHA512 bdfc611895f734a28e65b8d6b750fec387bb504d35feb8c6bbf4dbaf83b19b65fb61187e9b5e58ec64dbe72cbc9cc6efa78a349752340634ef2dc565bb096589 diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch new file mode 100644 index 000000000000..65a5fbed234f --- /dev/null +++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch @@ -0,0 +1,31 @@ +From 8e7bd5a8b95e06568af75f3268529434ea989b2b Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Mon, 27 Mar 2023 11:18:37 +0200 +Subject: [PATCH] Drop dependency on certified + +--- a/kramdown-rfc2629.gemspec ++++ b/kramdown-rfc2629.gemspec +@@ -6,7 +6,6 @@ spec = Gem::Specification.new do |s| + "kramdown" markdown parser. Mostly useful for RFC writers.} + s.add_dependency('kramdown', '~> 2.4.0') + s.add_dependency('kramdown-parser-gfm', '~> 1.1') +- s.add_dependency('certified', '~> 1.0') + s.add_dependency('json_pure', '~> 2.0') + s.add_dependency('unicode-name', '~> 1.0') + s.add_dependency('unicode-blocks', '~> 1.0') +--- a/lib/kramdown-rfc/command.rb ++++ b/lib/kramdown-rfc/command.rb +@@ -134,9 +134,7 @@ def do_the_tls_dance + warn "** Configuration problem with OpenSSL certificate store." + warn "** You may want to examine #{OpenSSL::X509::DEFAULT_CERT_FILE}" + warn "** and #{OpenSSL::X509::DEFAULT_CERT_DIR}." +- warn "** Activating suboptimal workaround." +- warn "** Occasionally run `certified-update` to maintain that workaround." +- require 'certified' ++ exit 1 + end + end + end +-- +2.39.2 + diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch new file mode 100644 index 000000000000..089ca1f4dea3 --- /dev/null +++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch @@ -0,0 +1,27 @@ +From 4e64df2e00dec244fe1f44233553e1936004b98d Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Sun, 25 Jun 2023 17:32:52 +0200 +Subject: [PATCH] Remove bin/echars + +--- a/kramdown-rfc2629.gemspec ++++ b/kramdown-rfc2629.gemspec +@@ -8,14 +8,10 @@ spec = Gem::Specification.new do |s| + s.add_dependency('kramdown-parser-gfm', '~> 1.1') + s.add_dependency('certified', '~> 1.0') + s.add_dependency('json_pure', '~> 2.0') +- s.add_dependency('unicode-name', '~> 1.0') +- s.add_dependency('unicode-blocks', '~> 1.0') +- s.add_dependency('unicode-scripts', '~> 1.0') + s.add_dependency('net-http-persistent', '~> 4.0') +- s.add_dependency('differ', '~>0.1') +- s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/echars bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm bin/kramdown-rfc-clean-svg-ids) ++ s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm bin/kramdown-rfc-clean-svg-ids) + s.require_path = 'lib' +- s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars', ++ s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', + 'kramdown-rfc-extract-markdown', + 'kramdown-rfc-extract-sourcecode', + 'kdrfc', 'kramdown-rfc-cache-i-d-bibxml', +-- +2.39.3 + diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild deleted file mode 100644 index 3156d56315c1..000000000000 --- a/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27" - -# The software got renamed from kramdown-rfc2629 to kramdown-rfc, -# however the gem coordinate is still kramdown-rfc2629. -RUBY_FAKEGEM_NAME="${PN}2629" -RUBY_FAKEGEM_RECIPE_TEST="none" -RUBY_FAKEGEM_EXTRADOC="README.md" -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser" -HOMEPAGE="https://github.com/cabo/kramdown-rfc" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -ruby_add_rdepend " - >=dev-ruby/certified-1.0.0 - >=dev-ruby/json-2.0.0 - >=dev-ruby/kramdown-2.4.0 - >=dev-ruby/kramdown-parser-gfm-1.1.0 -" - -all_ruby_prepare() { - sed -i 's/json_pure/json/' ../metadata || die -} diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild deleted file mode 100644 index f1767b5f8329..000000000000 --- a/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27" - -# The software got renamed from kramdown-rfc2629 to kramdown-rfc, -# however the gem coordinate is still kramdown-rfc2629. -RUBY_FAKEGEM_NAME="${PN}2629" -RUBY_FAKEGEM_RECIPE_TEST="none" -RUBY_FAKEGEM_EXTRADOC="README.md" -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser" -HOMEPAGE="https://github.com/cabo/kramdown-rfc" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -ruby_add_rdepend " - >=dev-ruby/certified-1.0.0 - >=dev-ruby/json-2.0.0 - >=dev-ruby/kramdown-2.4.0 - >=dev-ruby/kramdown-parser-gfm-1.1.0 -" - -all_ruby_prepare() { - sed -i 's/json_pure/json/' ../metadata || die -} diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild index 554ab06bc4c8..eca764b9c1dd 100644 --- a/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild +++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild @@ -3,7 +3,7 @@ EAPI=8 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31" # The software got renamed from kramdown-rfc2629 to kramdown-rfc, # however the gem coordinate is still kramdown-rfc2629. @@ -11,6 +11,9 @@ RUBY_FAKEGEM_NAME="${PN}2629" RUBY_FAKEGEM_RECIPE_TEST="none" RUBY_FAKEGEM_EXTRADOC="README.md" RUBY_FAKEGEM_EXTRAINSTALL="data" +# Explicitly use the gemspec file over the metadata file of the gem, as +# the latter contains dependencies that we patched out. +RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec" inherit ruby-fakegem @@ -21,13 +24,18 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64" +PATCHES=( + "${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch + "${FILESDIR}"/${PN}-1.6.35-Remove-bin-echars.patch +) + ruby_add_rdepend " - >=dev-ruby/certified-1.0.0 >=dev-ruby/json-2.0.0 >=dev-ruby/kramdown-2.4.0 >=dev-ruby/kramdown-parser-gfm-1.1.0 + >=dev-ruby/net-http-persistent-4.0 " all_ruby_prepare() { - sed -i 's/json_pure/json/' ../metadata || die + sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die } diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.21.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild index f1767b5f8329..eca764b9c1dd 100644 --- a/app-text/kramdown-rfc/kramdown-rfc-1.6.21.ebuild +++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild @@ -3,7 +3,7 @@ EAPI=8 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31" # The software got renamed from kramdown-rfc2629 to kramdown-rfc, # however the gem coordinate is still kramdown-rfc2629. @@ -11,6 +11,9 @@ RUBY_FAKEGEM_NAME="${PN}2629" RUBY_FAKEGEM_RECIPE_TEST="none" RUBY_FAKEGEM_EXTRADOC="README.md" RUBY_FAKEGEM_EXTRAINSTALL="data" +# Explicitly use the gemspec file over the metadata file of the gem, as +# the latter contains dependencies that we patched out. +RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec" inherit ruby-fakegem @@ -19,15 +22,20 @@ HOMEPAGE="https://github.com/cabo/kramdown-rfc" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch + "${FILESDIR}"/${PN}-1.6.35-Remove-bin-echars.patch +) ruby_add_rdepend " - >=dev-ruby/certified-1.0.0 >=dev-ruby/json-2.0.0 >=dev-ruby/kramdown-2.4.0 >=dev-ruby/kramdown-parser-gfm-1.1.0 + >=dev-ruby/net-http-persistent-4.0 " all_ruby_prepare() { - sed -i 's/json_pure/json/' ../metadata || die + sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die } diff --git a/app-text/krop/files/krop-0.6.0-links.patch b/app-text/krop/files/krop-0.6.0-links.patch new file mode 100644 index 000000000000..c311b10cf88e --- /dev/null +++ b/app-text/krop/files/krop-0.6.0-links.patch @@ -0,0 +1,64 @@ +From a39f8328cf59492e68643f499c0d0fbda910444c Mon Sep 17 00:00:00 2001 +From: Armin Straub <31167361+arminstraub@users.noreply.github.com> +Date: Sun, 17 Jan 2021 15:50:49 -0600 +Subject: [PATCH] Preserve links within a PDF (thanks to chrthi) + +--- + ChangeLog | 4 ++++ + krop/mainwindow.py | 1 + + krop/pdfcropper.py | 11 +++++++++++ + 3 files changed, 16 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index eb7dbb1..4ffbedb 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++krop (0.6.1) 2021-00-00 -- Armin Straub ++ ++ * Preserve links within a PDF (thanks to chrthi for doing this). ++ + krop (0.6.0) 2020-06-09 -- Armin Straub + + + Fixed aspect ratios, like letter size, can be chosen for selections. +diff --git a/krop/mainwindow.py b/krop/mainwindow.py +index fd1ae32..e8adadf 100644 +--- a/krop/mainwindow.py ++++ b/krop/mainwindow.py +@@ -413,6 +413,7 @@ def slotKrop(self): + pdf = PdfFile() + pdf.loadFromFile(inputFileName) + cropper = PdfCropper() ++ cropper.copyDocumentRoot(pdf) + for nr in pages: + c = self.viewer.cropValues(nr) + cropper.addPageCropped(pdf, nr, c, alwaysinclude, rotation) +diff --git a/krop/pdfcropper.py b/krop/pdfcropper.py +index 679c6fc..db30646 100644 +--- a/krop/pdfcropper.py ++++ b/krop/pdfcropper.py +@@ -55,6 +55,8 @@ def writeToFile(self, filename): + stream.close() + def addPageCropped(self, pdffile, pagenumber, croplist, rotate=0): + pass ++ def copyDocumentRoot(self, pdffile): ++ pass + + + class PyPdfFile(AbstractPdfFile): +@@ -110,6 +112,15 @@ def cropPage(self, page, crop, rotate): + if rotate != 0: + page.rotateClockwise(rotate) + ++ def copyDocumentRoot(self, pdffile): ++ # Sounds promising in PyPDF2 (see PdfFileWriter.cloneDocumentFromReader), ++ # but doesn't seem to produce a readable PDF: ++ # self.output.cloneReaderDocumentRoot(pdffile.reader) ++ # Instead, this copies at least the named destinations for links: ++ for dest in pdffile.reader.namedDestinations.values(): ++ self.output.addNamedDestinationObject(dest) ++ ++ + def optimizePdfGhostscript(oldfilename, newfilename): + import subprocess + subprocess.check_call(('gs', '-sDEVICE=pdfwrite', '-sOutputFile=' + newfilename, diff --git a/app-text/krop/files/krop-0.6.0-pikepdf.patch b/app-text/krop/files/krop-0.6.0-pikepdf.patch new file mode 100644 index 000000000000..17f59f2f72b3 --- /dev/null +++ b/app-text/krop/files/krop-0.6.0-pikepdf.patch @@ -0,0 +1,150 @@ +From b1d17b605088e118a8799fd027a892310e00d29e Mon Sep 17 00:00:00 2001 +From: Hongzhuo Liang <lianghongzhuo@126.com> +Date: Fri, 27 Jan 2023 17:57:04 +0100 +Subject: [PATCH] support pikepdf instead of pypdf2 + +--- + krop/mainwindow.py | 1 - + krop/pdfcropper.py | 79 ++++++++++++++-------------------------------- + 2 files changed, 24 insertions(+), 56 deletions(-) + +diff --git a/krop/mainwindow.py b/krop/mainwindow.py +index e8adadf..fd1ae32 100644 +--- a/krop/mainwindow.py ++++ b/krop/mainwindow.py +@@ -413,7 +413,6 @@ def slotKrop(self): + pdf = PdfFile() + pdf.loadFromFile(inputFileName) + cropper = PdfCropper() +- cropper.copyDocumentRoot(pdf) + for nr in pages: + c = self.viewer.cropValues(nr) + cropper.addPageCropped(pdf, nr, c, alwaysinclude, rotation) +diff --git a/krop/pdfcropper.py b/krop/pdfcropper.py +index db30646..42500de 100644 +--- a/krop/pdfcropper.py ++++ b/krop/pdfcropper.py +@@ -15,23 +15,8 @@ + + import copy + import sys ++from pikepdf import Pdf + +-# Unless specified otherwise, use PyPDF2 instead of pyPdf if available. +-usepypdf2 = '--no-PyPDF2' not in sys.argv +-if usepypdf2: +- try: +- from PyPDF2 import PdfFileReader, PdfFileWriter +- except ImportError: +- usepypdf2 = False +-if not usepypdf2: +- try: +- from pyPdf import PdfFileReader, PdfFileWriter +- except ImportError: +- _msg = "Please install PyPDF2 (or its predecessor pyPdf) first."\ +- "\n\tOn recent versions of Ubuntu, the following should do the trick:"\ +- "\n\tsudo apt-get install python-pypdf2"\ +- "\n\t(or, if using python3) sudo apt-get install python3-pypdf2" +- raise RuntimeError(_msg) + + class PdfEncryptedError(Exception): + pass +@@ -55,8 +40,6 @@ def writeToFile(self, filename): + stream.close() + def addPageCropped(self, pdffile, pagenumber, croplist, rotate=0): + pass +- def copyDocumentRoot(self, pdffile): +- pass + + + class PyPdfFile(AbstractPdfFile): +@@ -64,23 +47,16 @@ class PyPdfFile(AbstractPdfFile): + def __init__(self): + self.reader = None + def loadFromStream(self, stream): +- if usepypdf2: +- self.reader = PdfFileReader(stream, strict=False) +- else: +- self.reader = PdfFileReader(stream) +- if self.reader.isEncrypted: +- try: +- if not self.reader.decrypt(''): +- raise PdfEncryptedError +- except: +- raise PdfEncryptedError +- def getPage(self, nr): +- page = self.reader.getPage(nr-1) ++ self.reader = Pdf.open(stream) ++ if self.reader.is_encrypted: ++ raise PdfEncryptedError ++ + + class PyPdfCropper(AbstractPdfCropper): + """Implementation of PdfCropper using pyPdf""" + def __init__(self): +- self.output = PdfFileWriter() ++ self.pdf = Pdf.new() ++ + def writeToStream(self, stream): + # For certain large pdf files, PdfFileWriter.write() causes the error: + # maximum recursion depth exceeded while calling a Python object +@@ -88,37 +64,31 @@ def writeToStream(self, stream): + # We therefore temporarily increase the recursion limit. + old_reclimit = sys.getrecursionlimit() + sys.setrecursionlimit(10000) +- self.output.write(stream) ++ self.pdf.save(stream) + sys.setrecursionlimit(old_reclimit) ++ + def addPageCropped(self, pdffile, pagenumber, croplist, alwaysinclude, rotate=0): +- page = pdffile.reader.getPage(pagenumber) ++ page = pdffile.reader.pages[pagenumber] + if not croplist and alwaysinclude: +- self.output.addPage(page) ++ self.pdf.pages.append(page) + for c in croplist: +- newpage = copy.copy(page) +- self.cropPage(newpage, c, rotate) +- self.output.addPage(newpage) +- def cropPage(self, page, crop, rotate): ++ new_box = self.getCropPageParm(page, c) ++ # Update the various PDF boxes ++ new_page = copy.copy(page) ++ new_page.mediabox = new_box ++ new_page.cropbox = new_box ++ new_page.trimbox = new_box ++ if rotate != 0: ++ new_page.rotate(rotate, True) ++ self.pdf.pages.append(new_page) ++ ++ def getCropPageParm(self, page, crop): + # Note that the coordinate system is up-side down compared with Qt. +- x0, y0 = page.cropBox.lowerLeft +- x1, y1 = page.cropBox.upperRight ++ x0, y0, x1, y1 = page.cropbox + x0, y0, x1, y1 = float(x0), float(y0), float(x1), float(y1) + x0, x1 = x0+crop[0]*(x1-x0), x1-crop[2]*(x1-x0) + y0, y1 = y0+crop[3]*(y1-y0), y1-crop[1]*(y1-y0) +- # Update the various PDF boxes +- for box in (page.artBox, page.bleedBox, page.cropBox, page.mediaBox, page.trimBox): +- box.lowerLeft = (x0, y0) +- box.upperRight = (x1, y1) +- if rotate != 0: +- page.rotateClockwise(rotate) +- +- def copyDocumentRoot(self, pdffile): +- # Sounds promising in PyPDF2 (see PdfFileWriter.cloneDocumentFromReader), +- # but doesn't seem to produce a readable PDF: +- # self.output.cloneReaderDocumentRoot(pdffile.reader) +- # Instead, this copies at least the named destinations for links: +- for dest in pdffile.reader.namedDestinations.values(): +- self.output.addNamedDestinationObject(dest) ++ return [x0, y0, x1, y1] + + + def optimizePdfGhostscript(oldfilename, newfilename): +@@ -128,4 +98,3 @@ def optimizePdfGhostscript(oldfilename, newfilename): + + PdfFile = PyPdfFile + PdfCropper = PyPdfCropper +- diff --git a/app-text/krop/krop-0.6.0-r1.ebuild b/app-text/krop/krop-0.6.0-r2.ebuild index 05b5670d6f04..e7d983914683 100644 --- a/app-text/krop/krop-0.6.0-r1.ebuild +++ b/app-text/krop/krop-0.6.0-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_{9,10,11} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit desktop distutils-r1 xdg-utils @@ -22,8 +22,13 @@ LICENSE="GPL-3" SLOT="0" IUSE="" +PATCHES=( + "${FILESDIR}/${P}-links.patch" + "${FILESDIR}/${P}-pikepdf.patch" +) + RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}] - dev-python/PyPDF2[${PYTHON_USEDEP}] + dev-python/pikepdf[${PYTHON_USEDEP}] dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]" src_install() { diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-0.6.0-r3.ebuild index 4f84c4f4237b..21c3bf034087 100644 --- a/app-text/krop/krop-9999.ebuild +++ b/app-text/krop/krop-0.6.0-r3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 -inherit desktop distutils-r1 xdg-utils +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop distutils-r1 xdg if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -17,26 +18,21 @@ fi DESCRIPTION="A tool to crop PDF files" HOMEPAGE="http://arminstraub.com/software/krop" - -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -IUSE="" -RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}] - dev-python/PyPDF2[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]" +PATCHES=( + "${FILESDIR}/${P}-links.patch" + "${FILESDIR}/${P}-pikepdf.patch" +) + +RDEPEND=" + dev-python/python-poppler-qt5[${PYTHON_USEDEP}] + dev-python/pikepdf[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] +" src_install() { distutils-r1_src_install domenu "${WORKDIR}/${P}/${PN}.desktop" } - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/app-text/krop/metadata.xml b/app-text/krop/metadata.xml index cb675f253c1d..0581997322f1 100644 --- a/app-text/krop/metadata.xml +++ b/app-text/krop/metadata.xml @@ -8,4 +8,7 @@ <email>printing@gentoo.org</email> <name>Gentoo Printing Project</name> </maintainer> +<upstream> + <remote-id type="github">arminstraub/krop</remote-id> +</upstream> </pkgmetadata> diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest index 56717604ad5c..8a8532d979be 100644 --- a/app-text/languagetool/Manifest +++ b/app-text/languagetool/Manifest @@ -1 +1,2 @@ DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883 +DIST LanguageTool-6.3.zip 231674701 BLAKE2B 1499f28602de9eaa41760e7329394f8c9ee26022ec97e0fb63944a7ad5002a829dcb6377d33df5a4668359a498907a2df06722a38869fbde190f2b3c95523e8c SHA512 c5c3726ef358ad6ad5e984c7b65192ff6f2858bd5bd6e9d3ad935409b17135d84eec5e660accd097de93fbd16ecfc428d70458d2ea28a6875361d87a0219cefc diff --git a/app-text/languagetool/files/languagetool.initd b/app-text/languagetool/files/languagetool.initd index 30a72a91a932..79568f20051a 100644 --- a/app-text/languagetool/files/languagetool.initd +++ b/app-text/languagetool/files/languagetool.initd @@ -7,13 +7,13 @@ depend() { start() { ebegin "Starting languagetool [server]" - start-stop-daemon --start --background --exec /bin/bash /usr/bin/languagetool-server \ - --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081 + start-stop-daemon --start --background --exec /bin/bash -- /usr/bin/languagetool-server \ + --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081 eend $? } stop() { ebegin "Stopping languagetool [server]" - start-stop-daemon --stop --exec /bin/bash /usr/bin/languagetool-server + start-stop-daemon --stop --exec /bin/bash -- /usr/bin/languagetool-server eend $? } diff --git a/app-text/languagetool/languagetool-5.4.ebuild b/app-text/languagetool/languagetool-5.4-r2.ebuild index 34da42ede96b..d7a7b86d7aef 100644 --- a/app-text/languagetool/languagetool-5.4.ebuild +++ b/app-text/languagetool/languagetool-5.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,13 +13,13 @@ SRC_URI="https://www.languagetool.org/download/${MY_P}.zip" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" CP_DEPEND=" dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 - dev-java/commons-lang:2.1 + dev-java/commons-lang:3.6 dev-java/commons-logging:0 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 @@ -37,7 +37,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { default - rm libs/commons-{cli,collections4,io,logging}.jar || die + rm libs/commons-{cli,collections4,io,lang3,logging}.jar || die rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die # Loads of bundled stuff :( diff --git a/app-text/languagetool/languagetool-6.3.ebuild b/app-text/languagetool/languagetool-6.3.ebuild new file mode 100644 index 000000000000..ddcbe701a0a1 --- /dev/null +++ b/app-text/languagetool/languagetool-6.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit java-pkg-2 desktop xdg-utils + +MY_PN=LanguageTool +MY_P=${MY_PN}-${PV} + +DESCRIPTION="A proof-reading tool for many languages" +HOMEPAGE="https://languagetool.org/" +SRC_URI="https://languagetool.org/download/${MY_P}.zip" + +S=${WORKDIR}/${MY_P} + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +CP_DEPEND=" + dev-java/commons-cli:1 + dev-java/commons-collections:4 + dev-java/commons-io:1 + dev-java/commons-lang:3.6 + dev-java/commons-logging:0 + dev-java/hamcrest-core:1.3 + dev-java/jcommander:0 + dev-java/jna:4 + dev-java/slf4j-api:0 +" + +RDEPEND=" + >=virtual/jre-1.8 + ${CP_DEPEND}" + +BDEPEND="app-arch/unzip" + +src_prepare() { + default + rm libs/commons-{cli,collections4,io,lang3,logging}.jar || die + rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die + + # Loads of bundled stuff :( + #java-pkg-2_src_prepare +} + +src_compile() { :; } + +src_install() { + java-pkg_dojar *.jar libs/*.jar + + local DIR=/usr/share/${PN}/lib/language-modules + java-pkg_addcp "${EPREFIX}${DIR}" + insinto ${DIR} + doins -r org META-INF + + java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main + java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main + java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer --config /etc/languagetool.cfg + newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg + domenu "${FILESDIR}"/${PN}.desktop + newinitd "${FILESDIR}/languagetool.initd" languagetool + + dodoc CHANGES.md README.md + + unset MY_DEPEND + java-pkg_gen-cp MY_DEPEND + java-pkg_register-dependency "${MY_DEPEND}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml index 2e4c5182444f..df66ee78e0a6 100644 --- a/app-text/languagetool/metadata.xml +++ b/app-text/languagetool/metadata.xml @@ -5,4 +5,7 @@ <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <upstream> + <remote-id type="github">languagetool-org/languagetool</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest index c8759f88c1a0..dc0ce03ce646 100644 --- a/app-text/lcdf-typetools/Manifest +++ b/app-text/lcdf-typetools/Manifest @@ -1 +1,2 @@ DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0 +DIST lcdf-typetools-2.110.tar.gz 674355 BLAKE2B 17bd88039648285d7010cd3e2d20aa0192c3dfb9343ebb60e988ae50c8cd22d7690d538760e3e503ed8cfa30218b048b317e8f5c01e7f7adc74ed9140a557fb4 SHA512 691c2a6c7aadace4741ad8d991575ea81fa56f243cf8eb37a8639dfced06daf565c82a1601f0d7e4490f868179ce7a83551000395fa17da214b7eb1344738c0c diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild index 254bfe7e8b3d..85540689e1c1 100644 --- a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild +++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,15 @@ EAPI=7 inherit toolchain-funcs flag-o-matic DESCRIPTION="Font utilities for eg manipulating OTF" -HOMEPAGE="https://lcdf.org/type/#typetools" +HOMEPAGE=" + https://lcdf.org/type/#typetools + https://github.com/kohler/lcdf-typetools +" SRC_URI="https://lcdf.org/type/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+kpathsea" RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )" @@ -19,6 +22,9 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" src_configure() { + # gcc ICE with LTO: https://gcc.gnu.org/PR100010 + filter-flags -fdevirtualize-at-ltrans + use kpathsea && has_version 'dev-libs/kpathsea' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" econf $(use_with kpathsea) } diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild new file mode 100644 index 000000000000..18ff420fc49b --- /dev/null +++ b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Font utilities for eg manipulating OTF" +HOMEPAGE=" + https://lcdf.org/type/#typetools + https://github.com/kohler/lcdf-typetools +" +SRC_URI="https://lcdf.org/type/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+kpathsea" + +RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( NEWS.md README.md ONEWS ) + +src_configure() { + # gcc ICE with LTO: https://gcc.gnu.org/PR100010 + filter-flags -fdevirtualize-at-ltrans + + if use kpathsea; then + has_version 'dev-libs/kpathsea' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" + fi + econf $(use_with kpathsea) +} diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml index e56e1b213eb0..6fe6129930ca 100644 --- a/app-text/lcdf-typetools/metadata.xml +++ b/app-text/lcdf-typetools/metadata.xml @@ -9,6 +9,9 @@ <email>fonts@gentoo.org</email> <name>Fonts</name> </maintainer> +<upstream> + <remote-id type="github">kohler/lcdf-typetools</remote-id> +</upstream> <longdescription lang="en"> The LCDF Typetools package contains several programs for manipulating PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest index 8c235e3842dd..2deb7f2d7be7 100644 --- a/app-text/lesspipe/Manifest +++ b/app-text/lesspipe/Manifest @@ -1,2 +1,2 @@ -DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d -DIST lesspipe-2.07.tar.gz 168973 BLAKE2B b9be5968d808dc57caa00551cdf663be75dff1c9662b585ddd2e1891f6f66fce0b71a468d9b9172af2833bd6ee255ad9b5fb917dac527eeb8b57427c568cd620 SHA512 6fa5debfa5b72fa5826294eca158a935a0b49dc431bd27eb7dc598315592d575ad302bb94fcdb86409dce1cb7055242ff10eb09cbf3708e472b8dbe8286d5511 +DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f +DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e diff --git a/app-text/lesspipe/files/all-completions.patch b/app-text/lesspipe/files/all-completions.patch new file mode 100644 index 000000000000..dfd8ed90dd34 --- /dev/null +++ b/app-text/lesspipe/files/all-completions.patch @@ -0,0 +1,51 @@ +From 621e2897c19155df8d0a5931a0c862bfdac22a0a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Wed, 17 Jan 2024 22:08:29 -0500 +Subject: [PATCH] add configure option to always install all completions + +This is useful for distro packaging. Many distros have a policy that +shell completions shall always be installed, even if the shell they are +for is not installed at the time. + +This is useful because buildbot chroots often don't have additional +shells installed, so users will *never* get zsh completions. +--- + configure | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 68d03a1..d521962 100755 +--- a/configure ++++ b/configure +@@ -10,10 +10,10 @@ use Getopt::Long; + # find sxw2txt and other scripts in current dir, if scripts not installed yet + $ENV{PATH} .= ':.'; + +-use vars qw($opt_help $opt_prefix $opt_nomake $opt_shell); ++use vars qw($opt_help $opt_prefix $opt_nomake $opt_shell $opt_all_completions); + + Getopt::Long::Configure("prefix_pattern=--"); +-my $result = GetOptions('help+', 'prefix=s', 'shell=s', 'nomake+'); ++my $result = GetOptions('help+', 'prefix=s', 'shell=s', 'nomake+', 'all-completions+'); + if ( $ARGV[0] or ! $result or $opt_help) { + print << 'EOF'; + Usage: configure [options] +@@ -21,6 +21,7 @@ Options: + --help print this message + --shell=<filename> specify an alternative shell path (zsh/bash) to use + --nomake do not generate a Makefile ++ --all-completions always install all completions + Directory and file names: + --prefix=PREFIX install lesspipe.sh in PREFIX/bin (/usr/local) + +@@ -47,8 +48,8 @@ if ( $opt_shell and -f $opt_shell and $opt_shell =~ /^\// ) { + my @bad = (); + my $shell = check_shell_vers(); + if ( ! $opt_nomake ) { +- my $no_bash = grep {/bash/} @bad; +- my $no_zsh = grep {/zsh/} @bad; ++ my $no_bash = (grep {/bash/} @bad and ! $opt_all_completions); ++ my $no_zsh = (grep {/zsh/} @bad and ! $opt_all_completions); + open OUT, ">Makefile"; + while (<DATA>) { + next if /bash_complete_dir/ and $no_bash; diff --git a/app-text/lesspipe/lesspipe-2.06.ebuild b/app-text/lesspipe/lesspipe-2.06.ebuild deleted file mode 100644 index 6ed6c94558a6..000000000000 --- a/app-text/lesspipe/lesspipe-2.06.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 - -DESCRIPTION="A preprocessor for less" -HOMEPAGE="https://github.com/wofr06/lesspipe" -SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -# Please check again on bumps! -# bug #734896 -RESTRICT="!test? ( test ) test" - -RDEPEND="dev-lang/perl" -BDEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( app-editors/vim ) -" - -src_configure() { - # Not an autoconf script. - ./configure --fixed || die -} - -src_compile() { - # Nothing to build (avoids the "all" target) - : -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install - einstalldocs - - rm -r "${ED}"/etc/bashcompletion.d || die - newbashcomp less_completion less -} - -pkg_preinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'." - elog "The latter is the Gentoo-specific version. Make sure to update your" - elog "LESSOPEN environment variable if you wish to use this copy." - fi -} diff --git a/app-text/lesspipe/lesspipe-2.07.ebuild b/app-text/lesspipe/lesspipe-2.11-r1.ebuild index 18b503b3b928..975d91af0d67 100644 --- a/app-text/lesspipe/lesspipe-2.07.ebuild +++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit edo bash-completion-r1 +inherit edo -DESCRIPTION="A preprocessor for less" +DESCRIPTION="Preprocessor for less" HOMEPAGE="https://github.com/wofr06/lesspipe" SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" -# Please check again on bumps! -# bug #734896 +# Please check again on bumps! (bug #734896) RESTRICT="!test? ( test ) test" RDEPEND="dev-lang/perl" @@ -25,9 +24,21 @@ BDEPEND=" test? ( app-editors/vim ) " +PATCHES=( + # Backport patch to allow installing completions for shells that aren't + # yet installed. + # + # https://github.com/wofr06/lesspipe/pull/142 + "${FILESDIR}"/all-completions.patch +) + src_configure() { # Not an autoconf script. - edo ./configure --prefix="${EPREFIX}"/usr + # + # PG0301 + # By default, only completions for installed shells are installed. + # Unconditionally install zsh too. + edo ./configure --prefix="${EPREFIX}"/usr --all-completions } src_compile() { @@ -39,8 +50,13 @@ src_install() { emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install einstalldocs + # The upstream Makefile intentionally installs to the wrong directory, then prints: + # In bash, please preload the completion, dynamic invocation does not work + # . /usr/share/bash-completion/less_completion + # Or consider installing the file less_completion in /etc/bashcompletion.d rm "${ED}"/usr/share/bash-completion/less_completion || die - newbashcomp less_completion less + insinto /etc/bash_completion.d + doins less_completion } pkg_preinst() { diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild new file mode 100644 index 000000000000..9b06994b07f0 --- /dev/null +++ b/app-text/lesspipe/lesspipe-2.12.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo + +DESCRIPTION="Preprocessor for less" +HOMEPAGE="https://github.com/wofr06/lesspipe" +SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" + +# Please check again on bumps! (bug #734896) +RESTRICT="!test? ( test ) test" + +RDEPEND=" + dev-lang/perl + dev-perl/Text-CSV +" +BDEPEND=" + ${RDEPEND} + virtual/pkgconfig + test? ( app-editors/vim ) +" + +src_configure() { + # Not an autoconf script. + # + # PG0301 + # By default, only completions for installed shells are installed. + # Unconditionally install zsh too. + edo ./configure --prefix="${EPREFIX}"/usr --all-completions +} + +src_compile() { + # Nothing to build (avoids the "all" target) + : +} + +src_install() { + emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install + einstalldocs + + # The upstream Makefile intentionally installs to the wrong directory, then prints: + # In bash, please preload the completion, dynamic invocation does not work + # . /usr/share/bash-completion/less_completion + # Or consider installing the file less_completion in /etc/bashcompletion.d + rm "${ED}"/usr/share/bash-completion/less_completion || die + insinto /etc/bash_completion.d + doins less_completion +} + +pkg_preinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'." + elog "The latter is the Gentoo-specific version. Make sure to update your" + elog "LESSOPEN environment variable if you wish to use this copy." + fi +} diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild index 0ba96d0d749c..a7f464e8e4d7 100644 --- a/app-text/libabw/libabw-0.1.3.ebuild +++ b/app-text/libabw/libabw-0.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,12 +11,12 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="doc static-libs" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-libs/librevenge @@ -25,7 +25,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - sys-devel/libtool + dev-build/libtool " src_configure() { diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest index 640e6982bbfd..105c5030daaf 100644 --- a/app-text/libebook/Manifest +++ b/app-text/libebook/Manifest @@ -1 +1 @@ -DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21 +DIST libe-book-0.1.3.tar.xz 416268 BLAKE2B 569bb68603bec5635a7ecdc8312f759816aff3d8e45e0ea9a14dc8c291ebb4dfd8ed430994d255e6be95a6ef4407f459c8d9c3d3945d4fd63841e0401f1c70a2 SHA512 56dfa93816b8a1b7e223bda517ff81547fd7b311c3fe2bea64b12c4290642d4b9ed3778df06c4ee7a65f2b9db57702c00c32aec819efb7820115165af3d5ebdc diff --git a/app-text/libebook/libebook-0.1.3-r2.ebuild b/app-text/libebook/libebook-0.1.3-r3.ebuild index 017194d774fa..03461a6ea21e 100644 --- a/app-text/libebook/libebook-0.1.3-r2.ebuild +++ b/app-text/libebook/libebook-0.1.3-r3.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="libe-book-${PV}" -inherit autotools flag-o-matic +inherit autotools DESCRIPTION="Library parsing various ebook formats" HOMEPAGE="https://sourceforge.net/projects/libebook/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="doc test tools" RESTRICT="!test? ( test )" @@ -30,12 +31,10 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-util/cppunit ) " -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) src_prepare() { @@ -45,7 +44,6 @@ src_prepare() { src_configure() { local myeconfargs=( - --disable-static --disable-werror $(use_with doc docs) $(use_enable test tests) diff --git a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild index 55726e6a867c..8a42b9ad5d22 100644 --- a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild +++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="EPUB generator for librevenge" HOMEPAGE="https://sourceforge.net/projects/libepubgen/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="debug doc test" RESTRICT="!test? ( test )" @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild index a9dcc430864c..4cad77ca17f5 100644 --- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild +++ b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -if [[ ${PV} == *9999 ]]; then - MDDS_VER="9999" +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" inherit autotools git-r3 else - MDDS_VER="2.0" SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" fi + DESCRIPTION="Library parsing Apple Keynote presentations" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" @@ -20,38 +19,43 @@ SLOT="0" IUSE="doc static-libs test" RESTRICT="!test? ( test )" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" RDEPEND=" app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 - >=dev-util/mdds-${MDDS_VER}:1= + >=dev-util/mdds-2.0:1= sys-libs/zlib " DEPEND="${RDEPEND} dev-libs/boost media-libs/glm - sys-devel/libtool + dev-build/libtool test? ( dev-util/cppunit ) " +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) +" src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == *9999 ]] && eautoreconf + [[ ${PV} == *9999* ]] && eautoreconf } src_configure() { local myeconfargs=( --disable-werror - --with-mdds="${MDDS_VER}" $(use_with doc docs) $(use_enable static-libs static) $(use_enable test tests) ) + if has_version ">=dev-util/mdds-2.1"; then + myeconfargs+=( --with-mdds=2.1 ) + else + myeconfargs+=( --with-mdds=2.0 ) + fi + econf "${myeconfargs[@]}" } diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild index e45ff9f68680..874395b30224 100644 --- a/app-text/libetonyek/libetonyek-9999.ebuild +++ b/app-text/libetonyek/libetonyek-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -MDDS_VER="2.1" +MDDS_VER="3.0" if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" @@ -31,12 +31,12 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/boost media-libs/glm - sys-devel/libtool + dev-build/libtool test? ( dev-util/cppunit ) " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest index 000e00b163d0..16f844a8ca24 100644 --- a/app-text/libexttextcat/Manifest +++ b/app-text/libexttextcat/Manifest @@ -1 +1 @@ -DIST libexttextcat-3.4.6.tar.xz 1111320 BLAKE2B d89b69450a66e8c0f2c4f42ca8d08f2f571d6d7c28e78e43c056c454cee09b95be3f9b32ab445be4c676225b5604535c8948b6942e9c366b94f9773a7b614781 SHA512 5fe7b9b78d2d81b26ba07ce16c6dae490369a0a8b11561cc1260d893c86ef54cf76982751927eed71ac792cdbb47bac0f7acc71939a38c93310ee2bda174448b +DIST libexttextcat-3.4.7.tar.xz 1122804 BLAKE2B 45d4fab17d66ede2a32cf65a8ee79c85ccb9993b1b5a5260f77a468c67478a28a9a45bf5fc9c5e6f6eb9f21407dff861d08649c6398373f00b036dd49f9cd4ee SHA512 ccd95061419aedd651c3b899fade6d3cc8ebf87ddfea622edecacd810798de8257829255e3cb3325fa2a0b9f54bc20d4e24b6596ae37891ed3fbe7c0425ff864 diff --git a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild index f39780be7b80..4a99457d295e 100644 --- a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild +++ b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Library implementing N-gram-based text categorization" -HOMEPAGE="https://software.wise-guys.nl/libtextcat/" -SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" +HOMEPAGE="https://wiki.documentfoundation.org/Libexttextcat" +SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz" LICENSE="BSD-2" SLOT="0" diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest index 78a6730119c1..e5454b6256c0 100644 --- a/app-text/libgepub/Manifest +++ b/app-text/libgepub/Manifest @@ -1 +1 @@ -DIST libgepub-0.7.0.tar.xz 28536 BLAKE2B beeab3d3911353cb0cac78207cc9e18e3341afce94213757c8d246a2d01c42aa0eb37618cc066307ce2ec8f21dbb89982271f25a9552d6872d5e86a4345407c6 SHA512 2ab661a6379899ff818313205d818ef1239654afde9ebcc22fa55b5d961aee20dd9c8295a58ff1d1fb1ea281ddb6ee8644942a860b3ee9f6a4ba9d7447efc517 +DIST libgepub-0.7.1.tar.xz 28576 BLAKE2B a65ecdd13bfcc96fbf0e1998d24cc565f0bd60213f278fdf592dcdf1ad6a1b40c9c10e3ffc3fe9ac500d92f5471619432badd746dfc57538e96a2b6a138b0a26 SHA512 9a9c56cffab485b78f0fdf115e655c4f395ee6e3f00b203fee5dfbb2054aa58540ca1fe8dc9dd82460ae3b39e89471e128086be10e77b247d0ce7b195bfbe8e3 diff --git a/app-text/libgepub/libgepub-0.7.0.ebuild b/app-text/libgepub/libgepub-0.7.1.ebuild index 9e0e8105418c..b11faee98b41 100644 --- a/app-text/libgepub/libgepub-0.7.0.ebuild +++ b/app-text/libgepub/libgepub-0.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest index 807aa173a3e3..0d9dc5a7892a 100644 --- a/app-text/liblangtag/Manifest +++ b/app-text/liblangtag/Manifest @@ -1,2 +1 @@ -DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf -DIST liblangtag-0.6.4.tar.bz2 764946 BLAKE2B 1d94f341359f880acb8a0a0526da625cb39d85b33665b861c0fbd94064228a3d5328f3a3b7d62bffd29c6ff8161fa499b6565010ba3065c90f87b5902969e81f SHA512 6c6dd3e6b0fc8d6f10cafd74112cbaf2a2342a88a908ad2f7ae759b3f5fb0cf6d788504c1de072e9ef019f2f5a284daeb2d2393036b6b402c5bc87f32b55f271 +DIST liblangtag-0.6.7.tar.bz2 757041 BLAKE2B 456fe453624dbdeb5a1cad621b4f1a28a9f8b3bc4b33a89efb22dfc006d36f8b634db4b085cac665d517c5bf56d750c81d0d201679480f1a0c180f0ab1dc3c49 SHA512 3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68 diff --git a/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch b/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch deleted file mode 100644 index 86d7a651bbb9..000000000000 --- a/app-text/liblangtag/files/liblangtag-0.6.3-fix-for-gtk-doc-1.32.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix build with gtk-doc-1.32 - -This bug was reported here: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939956 - -The issue is that gtk-doc-1.32 no longer generates empty tree_index -files. The recommendation is that liblangtag be modified to no longer -reference what used to be an empty tree_index, but is now a missing -file. The same bug report contained the patch implemented here, which -removes the reference to a now-missing tree_index file. - -The fix should already be provided in newer versions of liblangtag. - -diff --git a/docs/liblangtag-docs.sgml b/docs/liblangtag-docs.sgml -index 1234567..1234567 100644 ---- a/docs/liblangtag-docs.sgml -+++ b/docs/liblangtag-docs.sgml -@@ -58,10 +58,6 @@ - </section> - - </chapter> -- <chapter id="object-tree"> -- <title>Object Hierarchy</title> -- <xi:include href="xml/tree_index.sgml"/> -- </chapter> - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild deleted file mode 100644 index 78e75c1e5a1b..000000000000 --- a/app-text/liblangtag/liblangtag-0.6.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="An interface library to access tags for identifying languages" -HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home" -SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" - -LICENSE="|| ( LGPL-3 MPL-2.0 )" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" -IUSE="debug doc introspection static-libs test" - -BDEPEND=" - sys-devel/gettext - sys-devel/libtool - doc? ( dev-util/gtk-doc ) - introspection? ( dev-libs/gobject-introspection-common ) -" -RDEPEND=" - dev-libs/libxml2 - introspection? ( dev-libs/gobject-introspection ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) -" - -# Upstream expect liblangtag to be installed when one runs tests... -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${P}-fix-for-gtk-doc-1.32.patch" -) - -src_prepare() { - default - xdg_environment_reset - if [[ -d docs/html ]]; then - rm -r docs/html || die "Failed to remove existing gtk-doc" - fi -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_enable introspection) - $(use_enable static-libs static) - $(use_enable test) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/app-text/liblangtag/liblangtag-0.6.4.ebuild b/app-text/liblangtag/liblangtag-0.6.7.ebuild index 68bf99b2752b..7d8e6ddb24f1 100644 --- a/app-text/liblangtag/liblangtag-0.6.4.ebuild +++ b/app-text/liblangtag/liblangtag-0.6.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" LICENSE="|| ( LGPL-3 MPL-2.0 )" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" IUSE="debug doc introspection test" # Upstream expect liblangtag to be installed when one runs tests... @@ -26,7 +26,7 @@ DEPEND="${RDEPEND} " BDEPEND=" sys-devel/gettext - sys-devel/libtool + dev-build/libtool doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection-common ) " diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild index a38d69537cb2..78d0df1963cf 100644 --- a/app-text/libmspub/libmspub-0.1.4.ebuild +++ b/app-text/libmspub/libmspub-0.1.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic @@ -19,18 +19,18 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="doc static-libs" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" RDEPEND=" dev-libs/icu:= dev-libs/librevenge sys-libs/zlib " DEPEND="${RDEPEND} + dev-build/libtool dev-libs/boost - sys-devel/libtool +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) " PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) @@ -44,8 +44,8 @@ src_prepare() { } src_configure() { - # bug 619044 - append-cxxflags -std=c++14 + # bug 619044, 932494 + append-cxxflags -std=c++17 local myeconfargs=( --disable-werror diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild index 529a9929ca51..f42bebd2d32f 100644 --- a/app-text/libmspub/libmspub-9999.ebuild +++ b/app-text/libmspub/libmspub-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git" inherit git-r3 else @@ -19,18 +19,18 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="doc static-libs" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" RDEPEND=" dev-libs/icu:= dev-libs/librevenge sys-libs/zlib " DEPEND="${RDEPEND} + dev-build/libtool dev-libs/boost - sys-devel/libtool +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) " src_prepare() { @@ -42,8 +42,8 @@ src_prepare() { } src_configure() { - # bug 619044 - append-cxxflags -std=c++14 + # bug 619044, 932494 + append-cxxflags -std=c++17 local myeconfargs=( --disable-werror diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest index 0331262c6c56..e0a19edb5676 100644 --- a/app-text/libmwaw/Manifest +++ b/app-text/libmwaw/Manifest @@ -1 +1 @@ -DIST libmwaw-0.3.21.tar.xz 1457212 BLAKE2B 19e0893c186f273f5743a397da895f653cca1300febcac90353951c6ca66405c2481aac6083017f4ec00a31ee0f08e8e77dc579019396e23930a091de2d8903a SHA512 1b6aab4f3e76d1d7a3c15cc175642c62f826172c9fdef558617b87a98d056a05d817caaccdc199197670f84ada448b65cce61f5254ed8e1d7634a637d3367384 +DIST libmwaw-0.3.22.tar.xz 1476620 BLAKE2B 8133dbd06fdde5caabe9284fd0535e97335385a96ceea4ea9bc1d6f2a28f14f22f6943d71ee6631cb8d67c8791b56ed3d928bb18c723c7aec0b8cf7faf8427d7 SHA512 8682e7006430764cb825cd0bf4822ff42ea3035606e13a804afb9fa3c6dc583f34ae24cea226c1d31eae95224525289801c0afa3853adc6ab396bb9df34a60b4 diff --git a/app-text/libmwaw/libmwaw-0.3.21.ebuild b/app-text/libmwaw/libmwaw-0.3.22.ebuild index c576261ecb7c..167928a4dd0b 100644 --- a/app-text/libmwaw/libmwaw-0.3.21.ebuild +++ b/app-text/libmwaw/libmwaw-0.3.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,8 +9,8 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw" inherit git-r3 else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Library parsing many pre-OSX MAC text formats" @@ -26,9 +26,9 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild index 52053156b9ad..19e7cff79243 100644 --- a/app-text/libmwaw/libmwaw-9999.ebuild +++ b/app-text/libmwaw/libmwaw-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,8 +9,8 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw" inherit git-r3 else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library parsing many pre-OSX MAC text formats" @@ -26,9 +26,9 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { diff --git a/app-text/libnumbertext/libnumbertext-1.0.11.ebuild b/app-text/libnumbertext/libnumbertext-1.0.11.ebuild index 34a73ca3acd8..7784c1d2d893 100644 --- a/app-text/libnumbertext/libnumbertext-1.0.11.ebuild +++ b/app-text/libnumbertext/libnumbertext-1.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" src_configure() { diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild index f494e1c15687..13c381630736 100644 --- a/app-text/libodfgen/libodfgen-0.1.8.ebuild +++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit edo + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen" inherit autotools git-r3 else - SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Library to generate ODF documents from libwpd and libwpg" @@ -16,7 +18,8 @@ HOMEPAGE="http://libwpd.sourceforge.net/" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -IUSE="doc" +IUSE="doc test" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/librevenge @@ -25,7 +28,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { @@ -36,7 +39,17 @@ src_prepare() { src_configure() { econf \ --disable-static \ - $(use_with doc docs) + $(use_with doc docs) \ + $(use_enable test) +} + +src_test() { + cd test || die + + # TODO: send patch upstream to have 'make check' run these + while read -r test_name ; do + edo "${test_name}" + done < <(find . -maxdepth 1 -type f -executable || die) } src_install() { diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild index d3f5e575b856..f8631363a5bc 100644 --- a/app-text/libodfgen/libodfgen-9999.ebuild +++ b/app-text/libodfgen/libodfgen-9999.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit edo + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen" inherit autotools git-r3 else - SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Library to generate ODF documents from libwpd and libwpg" @@ -16,7 +18,8 @@ HOMEPAGE="http://libwpd.sourceforge.net/" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -IUSE="doc" +IUSE="doc test" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/librevenge @@ -25,7 +28,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { @@ -36,7 +39,16 @@ src_prepare() { src_configure() { econf \ --disable-static \ - $(use_with doc docs) + $(use_with doc docs) \ + $(use_enable test) +} + +src_test() { + cd test || die + + while read -r test_name ; do + edo "${test_name}" + done < <(find . -maxdepth 1 -type f -executable || die) } src_install() { diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest index fdb78efc81b3..e8ed3c20daac 100644 --- a/app-text/libpaper/Manifest +++ b/app-text/libpaper/Manifest @@ -1,3 +1,3 @@ -DIST libpaper-2.0.10.tar.gz 1304460 BLAKE2B 89c0ab7348cff01e278a64fe984f51102146c38699d1036ae265343cc7174a2954974770384e625582669217f57992ed28dd1755867e2f7d00b7e423323f500c SHA512 629d357b4946aca324ca95024dbfd5d49a9e7110b6163eac72482c010c4cb84b50a50b5b119399090a49eaef58329bf3c497d3d871b7c9e46ae5c8e71364c2ce -DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcff15acbac126535f526312900650e25fa0a4d68ceebc5d718f5135be22a9f9407d690dc5d5e22eab9dc55b040fc8 SHA512 d603a807c8fdc57b704cdfdc90bedf05c54c8a7b67e8cf52f26298c22a6cee5291fcadc6e67d28b00cf9d68f4890a394e56c8e91f0b97c8edfac4662fe4dc8f0 +DIST libpaper-2.1.2.tar.gz 1264200 BLAKE2B d931c70ea1b26e57ef5cf120189dbf089d7b122ab195b154e6dc100845f63acd051195662d1b019a2f738ebe65047207b39609f4db0e748eaabc3868f3a2ccb0 SHA512 29c5d8074c10f6413b4eaf779153828e59b4b7353e6b380b37ed6cac04a92dc367da775a62e561b47064728f4173cb526d05a8abd80334ad229ee2a42039ac7b +DIST libpaper-2.1.3.tar.gz 1263513 BLAKE2B 920fa9857cef5773a3570bd613152f09726cfeb8e07f8152460b37ee863b76ea28ef4c2d80d010e10368e952281e5138b1412c22e1cbfa27053bb3b6067bbcbf SHA512 7ebd469b7d6f22cd98e5811cf87403d066974dc2624d35653803c318258cb68506dc2abeb7129b03231aa32c36a7461275b20f4a43c51f0cd70b2db59a1a2988 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild index 77ad56322488..99fc37a02be5 100644 --- a/app-text/libpaper/libpaper-1.1.28.ebuild +++ b/app-text/libpaper/libpaper-1.1.28.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" DOCS=( README ChangeLog debian/changelog ) diff --git a/app-text/libpaper/libpaper-2.0.4.ebuild b/app-text/libpaper/libpaper-2.1.2.ebuild index 36348bb3139b..842963ab584e 100644 --- a/app-text/libpaper/libpaper-2.0.4.ebuild +++ b/app-text/libpaper/libpaper-2.1.2.ebuild @@ -11,12 +11,13 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar. # paperspecs is public-domain LICENSE="LGPL-2.1+ GPL-3+ public-domain" SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -BDEPEND="sys-apps/help2man" - -# False positive (runs within a conditional) -QA_AM_MAINTAINER_MODE=".*help2man.*" +QA_CONFIG_IMPL_DECL_SKIP=( + # Gnulib false positives #898346 + # These are all tested without an #include first + MIN alignof static_assert +) src_configure() { econf --enable-relocatable diff --git a/app-text/libpaper/libpaper-2.0.10.ebuild b/app-text/libpaper/libpaper-2.1.3.ebuild index 5e23bb0110c8..06d8f269983b 100644 --- a/app-text/libpaper/libpaper-2.0.10.ebuild +++ b/app-text/libpaper/libpaper-2.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,13 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar. # paperspecs is public-domain LICENSE="LGPL-2.1+ GPL-3+ public-domain" SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +QA_CONFIG_IMPL_DECL_SKIP=( + # Gnulib false positives #898346 + # These are all tested without an #include first + MIN alignof static_assert +) src_configure() { econf --enable-relocatable diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild index 24521e600966..ecc2644ca8e3 100644 --- a/app-text/libqxp/libqxp-0.0.2.ebuild +++ b/app-text/libqxp/libqxp-0.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest index 83a532983584..6311d5b76c16 100644 --- a/app-text/libspectre/Manifest +++ b/app-text/libspectre/Manifest @@ -1 +1,2 @@ DIST libspectre-0.2.11.tar.gz 435887 BLAKE2B 46e289553dafe520c76a779ce64f8f5e320541221d885e5707284dd6d89ace7985a0a658fcf26c5ea750fd2751dd2bab0913333cda563ab5ee29c4132f8c99a5 SHA512 97335bc927006031fad8be55befae44bec33347f058f5b1fcf828a8a8d45a6fae2d51ceae4aaffcfa563c7592fdffe1e5a4993f145d6832ec81019c00ae0e37f +DIST libspectre-0.2.12.tar.gz 436264 BLAKE2B 932f934e4ef66c4319d60ea88842d01caf3663262f6b67606dfc5750eba7d9e13a1e3e0b15764215e703ff1542c3c09387ee4f572075e828ae2f3680d002821c SHA512 3a4045c1e94e7de23b437393389397dd2448363458023b5aa8e43fa0553a160216f038e157374cefc1d09fa74711ad4899aac1fc353c482bd5fe970d9a97461f diff --git a/app-text/libspectre/libspectre-0.2.11.ebuild b/app-text/libspectre/libspectre-0.2.11.ebuild index b7007809eeb6..9ca5e16ca44f 100644 --- a/app-text/libspectre/libspectre-0.2.11.ebuild +++ b/app-text/libspectre/libspectre-0.2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ RDEPEND=">=app-text/ghostscript-gpl-9.53.0:=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen[doc] ) + doc? ( app-text/doxygen[doc] ) " # does not actually test anything, see bug 362557 diff --git a/app-text/libspectre/libspectre-0.2.12.ebuild b/app-text/libspectre/libspectre-0.2.12.ebuild new file mode 100644 index 000000000000..9ca5e16ca44f --- /dev/null +++ b/app-text/libspectre/libspectre-0.2.12.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for rendering Postscript documents" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre" +SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="debug doc" + +RDEPEND=">=app-text/ghostscript-gpl-9.53.0:=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen[doc] ) +" + +# does not actually test anything, see bug 362557 +RESTRICT="test" + +src_configure() { + local myeconfargs=( + $(use_enable debug asserts) + $(use_enable debug checks) + --disable-test + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + if use doc; then + doxygen || die + fi +} + +src_install() { + use doc && local HTML_DOCS=( doc/html/. ) + default + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild index c7ab602d09c0..05ec38fcf6d5 100644 --- a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild +++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 autotools else SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Import filter for old StarOffice documents" @@ -19,7 +19,7 @@ SLOT="0" IUSE="debug doc tools +zlib" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" dev-libs/librevenge diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild index 3c514f0b343e..a4cfd8260b1e 100644 --- a/app-text/libstaroffice/libstaroffice-9999.ebuild +++ b/app-text/libstaroffice/libstaroffice-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ SLOT="0" IUSE="debug doc tools +zlib" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DEPEND=" dev-libs/librevenge diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild index 44444cce76ee..2238642043ba 100644 --- a/app-text/libwpd/libwpd-0.10.3.ebuild +++ b/app-text/libwpd/libwpd-0.10.3.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="WordPerfect Document import/export library" HOMEPAGE="http://libwpd.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0.10" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86" IUSE="doc +tools" RDEPEND="dev-libs/librevenge" @@ -18,7 +18,7 @@ DEPEND="${RDEPEND} " BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " PATCHES=( "${FILESDIR}/${P}-gcc-4.8.patch" ) diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest index 37d0f698e130..ba88efdcccdd 100644 --- a/app-text/libwpg/Manifest +++ b/app-text/libwpg/Manifest @@ -1 +1 @@ -DIST libwpg-0.3.3.tar.xz 328664 BLAKE2B 02ffaf8ea96e66dea94d847c85e17db5b7efcc5891bb1bf4069e664ece09f808b7462fcbb08a75d6ab17fff4ea51a8e494c48fba1540aed132f47d05b746e1a5 SHA512 99f8346b336eb902626fe07836c73870a57e100620ddd242ce7c2866e564483ed024a3a0b2804f81a0f59a0873310c3a93c005d306437a27818a6f4374c0c491 +DIST libwpg-0.3.4.tar.xz 340428 BLAKE2B 68df99682307811e7bf376ff1329aaf18313e447b8dcdd2229cedc30afa122eafcf6a527c375cf547b88600129460ff2db2390124200f4ee100367ea534cea83 SHA512 dcc34abc3cf8793dca579b2233e7c84d0ea53a7372c325678d81fbe52c700e6a8af32c4b17e490a39873a692d44ba7b3af68d605d87cef0be8ea13d2f7b95c0e diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.4.ebuild index 577828356722..38056bcdefcb 100644 --- a/app-text/libwpg/libwpg-0.3.3.ebuild +++ b/app-text/libwpg/libwpg-0.3.4.ebuild @@ -1,37 +1,39 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="C++ library to read and parse graphics in WPG" HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0.3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86" -IUSE="doc static-libs" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86" +IUSE="doc" RDEPEND=" app-text/libwpd:0.10[tools] dev-libs/librevenge " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { local myeconfargs=( --program-suffix=-${SLOT} $(use_with doc docs) - $(use_enable static-libs static) ) econf "${myeconfargs[@]}" } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest index 49ba31d03455..c90c80ccfba6 100644 --- a/app-text/libwps/Manifest +++ b/app-text/libwps/Manifest @@ -1 +1 @@ -DIST libwps-0.4.13.tar.xz 717188 BLAKE2B 966d0e57668577620fc5fe8c222096fa1b51f3d2c149dab7fc182c2fe81b69363cfbcc2ff930d2719f9fcf735306d612a00ae863ff1a0d2f03fcd6c67b054489 SHA512 c88357cdb11a68148c9344cf3688d57d793089732ee9828d6ea5e86536eb5f60668326fa520e7609a48298051435f6cc570d0c58aa4aa96581a51c16f914a1d0 +DIST libwps-0.4.14.tar.xz 719016 BLAKE2B 9f89b8534851760bb2cc3453e75840dea22eb09fd51a1d8ec7b7308fbb63ef7e34416ccfdbb5b1abc87616b7da17edc0bcf1e7fcc93414bf197dd904f6de759b SHA512 bbf9047f35d1b42c2da8deee24116d6a3fb20749a4255d369b62967a99185f52f21dda3e1b385056c1924995f2a72b670960bb476f38c3bf78933e25ff4a5779 diff --git a/app-text/libwps/libwps-0.4.13.ebuild b/app-text/libwps/libwps-0.4.14.ebuild index c8b28c975363..a085ae2e0252 100644 --- a/app-text/libwps/libwps-0.4.13.ebuild +++ b/app-text/libwps/libwps-0.4.14.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Microsoft Works file word processor format import filter library" HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="debug doc tools" DEPEND="dev-libs/librevenge" RDEPEND="${DEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild index d38ce9c286df..0cdcccc08cd3 100644 --- a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild +++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A set of tools to create and apply patch to XML files using XPath" HOMEPAGE="http://xmlpatch.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN/lib}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch index 941d7eac1dc6..28e6b697a3ad 100644 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch @@ -243,4 +243,3 @@ Signed-off-by: Sam James <sam@gentoo.org> -- 2.38.1 - diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild index 7c6cbf38b441..f0cd0dfe61eb 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ RDEPEND=" sys-apps/groff " DEPEND="${RDEPEND} - sys-devel/flex + app-alternatives/lex app-alternatives/awk doc? ( dev-texlive/texlive-fontsrecommended diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild index b6da8848f4c7..3bf30133b667 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" app-alternatives/awk - sys-devel/flex + app-alternatives/lex doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml index 85e4ed814fa2..6554536432ea 100644 --- a/app-text/llpp/metadata.xml +++ b/app-text/llpp/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">moosotc/llpp</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest index e8087ff30be1..c01019b38596 100644 --- a/app-text/lowdown/Manifest +++ b/app-text/lowdown/Manifest @@ -1 +1 @@ -DIST lowdown-1.0.0.tar.gz 576167 BLAKE2B fec9857ef1110f4767ff6244dcf06fa9c69a56d4b8709217cf05a148757512e2cb8c141b112673f0cffa260d7e2c376b9905bb16092e3f97f97007dcef922bcb SHA512 fe18db1f3d6dbc4fe0ae33ebcdeb1646b20d6fedd265e29d53475f7931b5b60329a653f9af864a39ff4caa0131751fcbffff0d94cb9519401a3479ada29bd7b8 +DIST lowdown-1.1.0.tar.gz 599219 BLAKE2B f623399cb41c5eaf180550283c5b2738993563ff30be4cfa1a471df036ed4289057d3f886a7727d85283896fbfe1316e9cc86d32c629cea1fd775af16cf58839 SHA512 b7b788694abf6760ca4abbd8d5d2c226d5406067ebf9b55307f136e1ab373e517fb20187659c09029463872310a5b39a0129842d1bc6b7bd64f2d440390e2676 diff --git a/app-text/lowdown/files/lowdown-0.11.1-linking.patch b/app-text/lowdown/files/lowdown-0.11.1-linking.patch deleted file mode 100644 index 2aa5cb1fe58e..000000000000 --- a/app-text/lowdown/files/lowdown-0.11.1-linking.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Makefile b/Makefile -index ccc163d..d148da6 100644 ---- a/Makefile -+++ b/Makefile -@@ -173,8 +173,8 @@ installwww: www - $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots - $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots - --lowdown: liblowdown.a main.o -- $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm -+lowdown: liblowdown.so main.o -+ $(CC) -o $@ main.o $(LDADD_MD5) -lm -L. -llowdown $(LDFLAGS) - - lowdown-diff: lowdown - ln -f lowdown lowdown-diff -@@ -183,10 +183,10 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS) - $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) - - liblowdown.so: $(OBJS) $(COMPAT_OBJS) -- $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-soname,$@.$(LIBVER) -+ $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,-soname,$@.$(LIBVER) - ln -sf $@.$(LIBVER) $@ - --install: bins -+install: bins install_libs - mkdir -p $(DESTDIR)$(BINDIR) - mkdir -p $(DESTDIR)$(MANDIR)/man1 - mkdir -p $(DESTDIR)$(MANDIR)/man5 -@@ -218,7 +218,7 @@ install_shared: liblowdown.so install_lib_common - install_static: liblowdown.a install_lib_common - $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR) - --install_libs: install_shared install_static -+install_libs: install_shared - - distcheck: lowdown.tar.gz.sha512 - mandoc -Tlint -Werror man/*.[135] diff --git a/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch b/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch new file mode 100644 index 000000000000..bdee817b8895 --- /dev/null +++ b/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch @@ -0,0 +1,45 @@ +diff --git a/Makefile b/Makefile +index 32acb09..552d6d3 100644 +--- a/Makefile ++++ b/Makefile +@@ -184,11 +184,11 @@ installwww: www + $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots + $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots + +-lowdown: liblowdown.a main.o +- $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) ++lowdown: liblowdown.so main.o compats.o ++ $(CC) -o $@ main.o compats.o -L. -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD) + + lowdown-diff: lowdown +- ln -f lowdown lowdown-diff ++ ln -s lowdown lowdown-diff + + liblowdown.a: $(OBJS) $(COMPAT_OBJS) + $(AR) rs $@ $(OBJS) $(COMPAT_OBJS) +@@ -206,14 +206,14 @@ uninstall: + rm -f $(MANDIR)/man$$section/$$name ; \ + done + +-install: bins ++install: bins install_libs + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man1 + mkdir -p $(DESTDIR)$(MANDIR)/man5 + mkdir -p $(DESTDIR)$(SHAREDIR)/lowdown/odt + $(INSTALL_DATA) share/odt/styles.xml $(DESTDIR)$(SHAREDIR)/lowdown/odt + $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) +- $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) ++ ln -s lowdown $(DESTDIR)$(BINDIR)/lowdown-diff + for f in $(MAN1S) $(MAN5S) ; do \ + name=`basename $$f .html` ; \ + section=$${name##*.} ; \ +@@ -256,7 +256,7 @@ install_static: liblowdown.a install_lib_common + + uninstall_libs: uninstall_shared uninstall_static + +-install_libs: install_shared install_static ++install_libs: install_shared + + distcheck: lowdown.tar.gz.sha512 + mandoc -Tlint -Werror man/*.[135] diff --git a/app-text/lowdown/lowdown-1.0.0.ebuild b/app-text/lowdown/lowdown-1.1.0.ebuild index 599195aa0080..dd3d86d63148 100644 --- a/app-text/lowdown/lowdown-1.0.0.ebuild +++ b/app-text/lowdown/lowdown-1.1.0.ebuild @@ -12,15 +12,37 @@ SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="ISC" -SLOT="0" +SLOT="0/2" KEYWORDS="amd64 ~arm64 ~x86" -DEPEND="virtual/libcrypt:=" -RDEPEND="${DEPEND}" +DEPEND=" + virtual/libcrypt:= +" +RDEPEND=" + ${DEPEND} +" + +# configure tests for a bunch of BSD functions on Linux +QA_CONFIG_IMPL_DECL_SKIP=( + crypt_newhash + crypt_checkpass + warnc + errc + getexecname + getprogname + memset_s + pledge + recallocarray + strlcat + strlcpy + strtonum + TAILQ_FOREACH_SAFE + unveil +) PATCHES=( "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch" - "${FILESDIR}/lowdown-0.11.1-linking.patch" + "${FILESDIR}/lowdown-1.1.0-shared-linking.patch" ) src_configure() { @@ -41,5 +63,5 @@ src_compile() { } src_test() { - emake regress + LD_LIBRARY_PATH="${S}" emake regress } diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild index 5bc3b9b99426..07c5d97647c2 100644 --- a/app-text/mandoc/mandoc-1.14.6.ebuild +++ b/app-text/mandoc/mandoc-1.14.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,8 +11,9 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="cgi system-man" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="cgi selinux system-man test" +RESTRICT="!test? ( test )" RDEPEND="sys-libs/zlib system-man? ( !sys-apps/man-db ) @@ -22,7 +23,9 @@ DEPEND="${RDEPEND} " BDEPEND=" cgi? ( app-text/highlight ) + test? ( dev-lang/perl ) " +RDEPEND+=" selinux? ( sec-policy/selinux-makewhatis )" PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch @@ -106,6 +109,10 @@ src_compile() { use cgi && emake man.cgi } +src_test() { + emake regress +} + src_install() { emake DESTDIR="${D}" install use cgi && emake DESTDIR="${D}" cgi-install www-install diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild index 625fe3ffedb5..e9a237b608f4 100644 --- a/app-text/manpager/manpager-1.ebuild +++ b/app-text/manpager/manpager-1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S=${WORKDIR} diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest index d4e16254e457..67f47900de21 100644 --- a/app-text/master-pdf-editor/Manifest +++ b/app-text/master-pdf-editor/Manifest @@ -1,2 +1,3 @@ DIST master-pdf-editor-5.9.35-qt5.x86_64.tar.gz 16885977 BLAKE2B 68dc3f4746e3259f64e2eeac99797b062c308291a62d79c9a070d76df6ad19c12b07108c754091464f6f5d04d287cb8fdf6335165c10232dca1d2d1ecdae4b68 SHA512 7dbfcbec7fd6f963340375e3067f4f76f2f0d2c239385652c4621574829426f09328f707bfc399901cd801f19ce0bb0d483c3dd37d48fad1b90dafeccf64559e DIST master-pdf-editor-5.9.40-qt5.x86_64.tar.gz 18902781 BLAKE2B cf72f072c5a4efce66913662d75ae95e9dd10e98945f7c38793003b0e69b7ab3945d1c01858483e7d2dc717ec2de12c659ed50b12deb9aae74eb2c3bb76f9b61 SHA512 5fd2d4b76ed25ef8cc226f2234d2a163df7135a27c80a49cee293aba5864d5759e0a22d417a4b9b35b5b0146a8f372ce8cec0652ce4d9df9f0c9c67dd2dd6beb +DIST master-pdf-editor-5.9.82-qt5.x86_64.tar.gz 80442378 BLAKE2B bd6357097451595388be3471b291ceb23b6815ed9ce68956223860c089265ae3693cee1c90f94e567e26b3a0f11b8dee8c2cf40e0184141e2539b44303d6a4c4 SHA512 d4613b5d5353e3bd39bcf953adff2d086e20de6a627e5e6dade62cb7887254b949659174ee3ba86ac525d2373fcedbdb286dc83ffca910c577cbf9ccc14ced39 diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild new file mode 100644 index 000000000000..cc47f27cf8f1 --- /dev/null +++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="A complete solution for viewing and editing PDF files" +HOMEPAGE="https://code-industry.net/free-pdf-editor/" +SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz" +S="${WORKDIR}/${PN}-${PV%%.*}" + +LICENSE="master-pdf-editor" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="mirror" + +RDEPEND=" + sys-libs/glibc + dev-libs/pkcs11-helper + >=dev-qt/qtcore-5.12.9:5 + >=dev-qt/qtgui-5.12.9:5 + >=dev-qt/qtnetwork-5.12.9:5 + >=dev-qt/qtprintsupport-5.12.9:5 + >=dev-qt/qtsvg-5.12.9:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd + >=media-gfx/sane-backends-1.0 +" + +QA_PREBUILT="opt/${PN}/masterpdfeditor5" + +src_install() { + insinto /opt/${PN} + doins -r fonts lang stamps templates masterpdfeditor5.png + + exeinto /opt/${PN} + doexe masterpdfeditor5 + dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5 + + make_desktop_entry "masterpdfeditor5 %f" \ + "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \ + "Office;Graphics;Viewer" \ + "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false" +} diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest index 2106d3330b18..e978491b4d24 100644 --- a/app-text/mdbook/Manifest +++ b/app-text/mdbook/Manifest @@ -1,223 +1,348 @@ -DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 DIST ammonia-3.3.0.crate 46061 BLAKE2B 082ee30f39ad788c9ae87888f003c2f6d08fbea7ae4983f1f5419c87c5303d860ecabf6f530bb76ff03da44c1f72f664053da79e6e3f4991e39b23104bcedd97 SHA512 8bed262b3790a5629918f188c246f0039f4e3b46908b367993e61c280a99c775b85982bb5cdce5c66781a40b8b7f8ab1ebbe2900d590ee3ba0788dd5d854b155 +DIST ammonia-4.0.0.crate 47763 BLAKE2B 6f952a8030ce2cfb9bcaf01c36d795c470f47bd7fa8e3935e058016876de04c6c43db3d56776c9ec5bb2acd83f315fd5dbd7c60373b397d70336d6926340c816 SHA512 84f523eaf7db9d98e44c7d1198fae40e59e838dcc9fc256ca7ef3f3d243a767755f318e516411b4feba4ecb26e30e77d501e9163f996b4d113804e5f2c41a65e +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 -DIST anyhow-1.0.69.crate 43576 BLAKE2B deb44b3110aee1314dd599b730df8c2f03b7d13c0d945d4ef00a0e30ca74257269e43107be19868adfea331a8c730e0aec2dff3abea704e56bc6a35b9581fe14 SHA512 d65e5c9404a70b1e0af90dd66af157f8c31ad0858f703765d5fc6c828f1fc8db690b17451c4108e3a52a7da2d6c2366e745d7b4bd7d19e6dba3485f7c3a43071 -DIST assert_cmd-2.0.8.crate 24347 BLAKE2B b69beb301a11e893ee1c7b59a08ac7860c16a598dc404d7bfd38b2554790898cfb82d1e602750e9b720b4122154e4da140c7b077645786f0a788796d5dafe272 SHA512 886d789af9fe7f8155d393e2742c7982d5c0bb8d44a09f66e5552faed2effcedd000d567f9f00e08ad6d7c17fac9374d7a234ba001f38c9cf444ee41dbe07428 +DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 +DIST anstream-0.6.14.crate 29160 BLAKE2B 1120895a51ed7a285c5d5a03d2f7e26dc956d95f39cf500ba9f547d71a62ed0326f519860ddcf8db77cb09e9119e914a62693369eca51cbf9c01ef874ade9112 SHA512 65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anstyle-1.0.7.crate 15709 BLAKE2B 872e0ed09e7e94c6f6b812349e39f949aff4d7cbb87744ab26fe49f57a7d330e0f79447213374f7f862ea276aab2dd1077dc8df3f7c5f34079ef30c4d17eeeba SHA512 e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-parse-0.2.4.crate 23069 BLAKE2B e80bd81e351326a222238b3f559020a2430ac37293e61b6b6309b37bbb8bdb78ec11ca9c0fd270098af5e5ffb2f5660cfbfda949d20fd2efd336ed1c143215b2 SHA512 c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a +DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc +DIST anstyle-query-1.0.3.crate 9742 BLAKE2B cfcba0a2773f07b9292279afd70832c5d4eb441ed61bcacdbeeda9184c63b7e01af70a8744d6efceb7f74a2c2dfa5672b873255cc1d273bd6a2d3d7ee08c2d2b SHA512 38637f49e547836a4958d9f528cb270abfc81c5ca644d6d43b0f3aaef8c6f1301a8bc30a23afec5e71722c3afe7eb0f48f9fdea88b73e36f597b74531da84226 +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST anstyle-wincon-3.0.3.crate 12179 BLAKE2B 37793975a05ad60bb2b670c208db11c5cda8a2a456242cd118748709d0a220b541b6f088676eccd19870cfb8f910d4aa1e7764393785a6db0531af4a3ffc8047 SHA512 55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179 +DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 +DIST anyhow-1.0.83.crate 45650 BLAKE2B 522121300f10688756aac1c39e83e867e20b9f142fdc1bb87732d8a64f6bf67411f1e35542fae7aa036d9221412a29b47acc75de8a2bb019bab90fece55e2c86 SHA512 4e4b29fd0a97ac55269d23efa399a372ef6128e1909ce464f178ae91fc61dc90a5867cd2a7218205f53988aea8cff6649302f7f6f12e07d1b5d3472d4c5eaaf3 +DIST assert_cmd-2.0.13.crate 23917 BLAKE2B 72fbb8afc12429a96c89b07dce8b2a969a1c2656aedf19ac9cd2bd1e5d5f29b3c558616858ad01a86807b787c88efc556ad432a55b59b0df5b4bdbeb9b6ab05e SHA512 3599483d28f1893945b63d693f38d656724f382ac7a0c2cb0773d72e6bba3dcc9137cca51575fca984c2435b081cd6ad68ed5d1fa04e606484926528cc41a305 +DIST assert_cmd-2.0.14.crate 24591 BLAKE2B 2a25812480770ce8549700b6c5afd0e3fc230c280c66b5b61480a2db0dc6c5a95b6a564ca7eb6024fa43498168d8bd3511a6cd659498540bf1a5a3bdbc2a3fc8 SHA512 112c3f933a013715c0dfcf29889ec023c88097a70fe212a7d98d0a5272d5f6da87df9353da006483830a0ac3c42a12e12d8fabeb90eb62453982edbc75215613 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f -DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b +DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635 +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST backtrace-0.3.71.crate 86553 BLAKE2B 15ed93574fb9e8e28d5ad901bb1f94013b5fec7a79aa96d17f13f6f11a02d29a274ec14ce51a9f515574839aa41232e5aaf6e6fa3ad9c0483591055bd0a78c8a SHA512 5d9307757349e860fb4cab7e9ba1c9d0f1faf49ebcd935ba879b85fed2a9812786c7458abb59a742842a0796fc29ce9921cf575792402486ecdbd9a2568cdd89 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f -DIST bstr-1.0.1.crate 340636 BLAKE2B 5c5c67fd6ac1d7219eb0b47fab4a32dcaca91218316a0151e8cdcda0c94dbec06623cb1ac1cc8a2203bd77bfeaaed57042b2dfb401f5f4bd8d397d64a34d9e56 SHA512 b4896364458074cf478c8df412619860858f5eb96e2228e5d083f074dd11b49ec1076df314c5d593dd4f8da1a286305793cdfecbcd9aa5f417706e545c4e8585 -DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc -DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa -DIST bytes-1.3.0.crate 57563 BLAKE2B 29abe4d9fd8583c23c5229bd81eca3b41bef01bd11bb5337d5e4a87fa34ccc8989ad9cbeb52dc66a06c0570fb2f91ba0dacb079b957f5c77fca912202535cfeb SHA512 902c9af417f7aef25e47b15ed2256da5ae171fa866f2f511d6da5cb0a9271d7da214b10c774bff5d0ce186be1eb60c88f7aed848c264e1000bcbcfe0d25f9f76 -DIST cc-1.0.77.crate 60723 BLAKE2B 93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5 SHA512 38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b +DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214 +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba +DIST bstr-1.9.1.crate 380305 BLAKE2B 52b45bd48874d052636c6b451cc36d8b012808ea5193e0188e5edd09f81d21b8306926cfebb405ad0650ec9aa710f609bacaa773bf854b21f4803dc38bb2eca7 SHA512 67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST bytes-1.6.0.crate 60605 BLAKE2B 3e4cd094443969c6062b51917ad9df314b61ec9ddcb0336cf2621d8966c568d5b1fdbf16b11b5e2fab01b43ea76f6609f753eb5c2380a5e4aa8fb6e807a2ff5d SHA512 6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cc-1.0.97.crate 76951 BLAKE2B ec2e65797dfe13223b64f28bf6d143e00362f8bdd14e4df3d16ec2c5b68b8c603968f8cf6e7ede95b527ef16a748775bf247e8bf11010a326bbac4b296d72eb5 SHA512 119d1769530ec2fcc643b9b4a0f2a45db6f0772e4df882b832f961824bbb41d101d4a507573b4e05b4627d647fa823e81bc66dafdde40146878616af96b24143 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa -DIST clap-4.0.29.crate 205982 BLAKE2B 0d57169481787bca874c25b988ea007df7a7906b06f232c7be1df56009cfb134b72a73ee6e9592e29944529312a37d135a25c9ba9af09451b203bd1469a8c689 SHA512 5706d4049a949b35e7e37c60a789337cce94f6c101e82a0a53ce1af0c7bc72da04ccff075270cdc8c37685e0bc4aecb07fdbdd420b46fe1813c3b54a408a485c -DIST clap_complete-4.0.6.crate 31933 BLAKE2B 52660cebaea67d266727a367931cb4dd8f285136b31fbdffea0eff44324fbed523a81152fcc6a969486b2b984a121dbf9be4335c5cc7c3f81f496ab871b9ab7e SHA512 8a1332d06e4d4bb4f3841a32bab774571b8bd13ec97df191bcc3d032141ce3960d39544887baa3f7a052aef8b00d4b9f40dfe0903c28f0dc3fc95382b7583b6a -DIST clap_lex-0.3.0.crate 9671 BLAKE2B 4422495226da19cb7a793d364ba5539ec77f9d327e2f1627e4b547fee0625162b57ddc6bc50585f520d31ec289a53065a2b6e0ba66111959390f756143cd5fb7 SHA512 5e601d540e46e527f6a2ea1959fa5aa035ad823008806f3a5adb4785f1928de4c9fe04e61680c64bcb87ed32b2e991951ec27c5cc5acdcfae51cdc61767ff100 -DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844 -DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82 -DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e -DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a -DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393 +DIST chrono-0.4.33.crate 221279 BLAKE2B cc7b71b996a1c15b6b013d06f57ffd8af78b72fab87c0e9123f87918d404787ade2217e8e58fb0153552e49c6e11ca6e820eb0c0f1add8c43619849fa096a214 SHA512 172996d2ccc8733957d45fcc24fefb3531c7b33a798ab9f494be23f08d6d2bc350401574c626fd8eec0191ba28c0f7b73af7bc4235ec72a4b1d437fb7e89c875 +DIST chrono-0.4.38.crate 220559 BLAKE2B ab828bfeed56eb737a1797d5e1132cafe87a1e14bf7a1fe4a5098f50e6ceead50ca2e7f041cc2ff63d5f4e41e2853322f6c345bb31ff12a5b412e3e5202f5fea SHA512 858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9 +DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 +DIST clap-4.5.4.crate 55401 BLAKE2B e9ece2eee6be16c366888f6140080c43a182aa758a971ab2f60fa5c8f5e00460c3e6ae6bface1f36445306265ce13d8145ac24cef833b68b2b2c32c13a7a4a00 SHA512 c1e88968a86598a6541cd8f8144909872fe71fc707dc5327293a71425f6ff9d4957491f93c36326a9f615c1cce1a453cc85740ff18e1ca571e91bf8f7a6ad7c0 +DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2 +DIST clap_builder-4.5.2.crate 163566 BLAKE2B 5eb81df416f3da0bb7e53c59ef4e914f03e2bb0563bb3707fbf70215f249aa523e3f5ef2205d0a8e25c23db6c6d0d344181c1c771566453505c769c55b355374 SHA512 af7eb8326a980cf461442a4dd6d224e61ae31a2fe4a45b34210a2c1f747eed49e00b6254699e82f986f441667f290a5de747b5e9d9d0360ed049504343385864 +DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b +DIST clap_complete-4.5.2.crate 37850 BLAKE2B bfaae6107890319a9717d96f5616012016fd5439c7ac7dcfb0082d797a335c7c926459c8c1db0cc0652f700366c83956d8e0447bb3e990c183133b8f26d64301 SHA512 1c9db70159681dd23011df6e804fa193f67f3dee874b2583a5c9da90db1c7283a13b330befecca91de260f70b974168652b450cf8b519a79957ac7a6373992b3 +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036 +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6 +DIST crossbeam-channel-0.5.11.crate 90434 BLAKE2B 8666f039a0e4ac6f0f8be2d08ce3349d8ad4aa7d0f38c638dfa6dc6a7f30a1629e42f87757d9e054e836941dff6a8efa53b5337706bc5958d33dee61f38e7bcd SHA512 1d37bae1c946d402c1fce37f22a82037d68896770757aa91d209387f947d39c514df52e0ce94317141513784511ac626482f16099cc3b62ca28a52f387b69c71 +DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c +DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 +DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f -DIST ctor-0.1.26.crate 10803 BLAKE2B 93627949b92651243b7a763d3d45a22fafcf2147a30661c4cc017e222bfc2bc12b4071054e3079adc431fc8a5dd8b86a8d11c53c401be6db846a3d0d2076b9b5 SHA512 3a3d60c976ec02a9edfe04470af4b04b02601c48e2a007393cedfef5c13e22bca58630e9e885e635a71aabc3e0ad8fb70995876551cdbc6a31029d8d2bc2e86d -DIST cxx-1.0.83.crate 198262 BLAKE2B 7ce2d0d9ec4682309caeb21ebe99a5d9c27ffebc4cbe31cd956d9743fb9084ff887320e8b45639861b5d32989559df72c8da4bc50bddc4cb35c2e1d18cca2125 SHA512 771d4de0d03ce3b2046fd5f714fbed235df70e4d04036eb4bd39dfc383572447c6a8bb065bff2c6af57816b1b55290c4e4d51ac83fdf93d60766b5b6ae9342fe -DIST cxx-build-1.0.83.crate 84791 BLAKE2B f1eb2f1de194b97424acc2a0ae855e688f35c2308422acb490f6325f110df9a3d9ddb9a5845a2d89073e06ae00a1f76e244383f6b2f74388c672c07082dfa3f8 SHA512 041a55366a481f1fb4aebf6a2083276d21c6bdf0a4432d5a1aa57de3140c384f4e8801a6d51cc64a2aef045344339d57cf76a9464e8cdf1458ff137ad74af57b -DIST cxxbridge-flags-1.0.83.crate 5635 BLAKE2B 40bc5b192f2045585036b175923c554822bf1d036860bad56b5b8087aadad1680890d5da187607eeb44c9d04db20d0c63ba7db19b86d562ac673528156731463 SHA512 6a46112289c6b723f5473c917a184b97cef0cac930c682c8d4f7f96e5c7166c537659ad524b6b56dd653f56ee09c3b3db92dc5e1b928279c2aa1b329e90d79b3 -DIST cxxbridge-macro-1.0.83.crate 59869 BLAKE2B 0502a4ea6677fa1a413d59b1ccb721aae59d041fab3b84cbb4c4f109462bb6d3e057c5fbebfa94ec3db4fead95554fe9e62a9093878b85d2e5ecca0d8b4d7f01 SHA512 571bb333f80a285de72ac26ce624c2da01b5b8b4f278960e764966e55d93ab3342518432d0cc2f4ab5b13dcb04152be5fb4dd206c9b5179c41ce6c4d3d48698e +DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae +DIST data-encoding-2.6.0.crate 20769 BLAKE2B 9d5713e63f6f6a4d6e5324fb0be9308a231ccefa20d69cda9e19609a2250e2cd72030ec28309068f71c932327a3ef680b749125658e27d35273354c3465f9931 SHA512 a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c +DIST dbus-0.9.7.crate 104206 BLAKE2B f08f72170fbf9af3e525c20f4f11de64368e4a5d010571bc2ed9985c13353d99466f7e98a39ac949787ee9f4d10845d6940d9dbeaf1fae2122d49eeefa5306b1 SHA512 c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 -DIST digest-0.10.6.crate 19527 BLAKE2B 402009105a6ac055be062769dd4f162aabb977b9afe29f451eeb3e6b5dd1a579c371c5ec996b9c1bdba3b4ded83830ed2e1934a0505480bffba1e0d16775a8f7 SHA512 21d3c1dc64e640300c51e8a009af464d6e3cd2b10aa67c87a038165c11409d6e5faad1967236724a9a4cab8fdd88826cac1db4798245fd53ac2ff1a9b2b68b76 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba -DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2 -DIST elasticlunr-rs-3.0.1.crate 99022 BLAKE2B baf9b4d3a1eaa0936c65985c0c9ff57fce71319a1e37b42dd7c41a122023099e516e2528a9b36dcd497456c8d73327014ef4a971ab66df125a160763fa716a1b SHA512 c5e4b7539921abcbea7d0f7e8ddc9a497929909febb013bf9d473d8649ad6bbdd84bd114b0393f4be1275e81d12ec0fc423e2574b0cb8e7e632c1f196994165c -DIST env_logger-0.10.0.crate 36574 BLAKE2B d2f387682059fe9b4566ab995be449c58c57b8df5e5d8bd5ffd153aec1648721d8a9606d3f9aa034263651f5182043e08b6cc08d2d29d0a10f6cc61df9949a06 SHA512 4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4 -DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1 -DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 -DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1 -DIST filetime-0.2.19.crate 15028 BLAKE2B f157d08993d74c7cf2051de416d5904237a4af38040fb362caf3a150511bc31d95245c892ed51da2f7269c3a43bf9cb3a8d6aab8c39a8c517627a085d5088f55 SHA512 9a30f078ceab0f24ff63cb6b80e76f357fd15aab9ec206186ddda950370b9ed738a6817b942cfc01baf518f9eb749e3b9c749718b4581ba74f65424bc226c34d +DIST elasticlunr-rs-3.0.2.crate 109533 BLAKE2B 139430cb7e7ca84a925f6eb7fbb5fc169ef1eb2704f5766a05f1574807794613679d1a9246f310afc1d57c5b5150d2be299e3c8f4583e6f6b4dbb1acf81fd774 SHA512 2f65cc09ac0a9a806fe36a617fe1fd8b6eddc2fa427012ed3fa2eee2f05743089820a801063d0fcd38bf5269b70b6b5f5ad0e6d706cfd461fcf4a62a9f956361 +DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1 +DIST env_logger-0.11.1.crate 28442 BLAKE2B a60201afe8151f8f6472bfc002ebbe6570cbf64e59c39c3e0650780a3599f3fba1f1229ded2ac23fad3c55684a9611289be302e196d7bbd3fe9a74dfa5680bfb SHA512 6b4b6a527e5145b38139f412a321972c728366388ddcdef88ffc2932a10b78e97ea50a560f6574216d1917562d193edac1df3805b56cb3cb80e69bfaa58d98f2 +DIST env_logger-0.11.3.crate 29704 BLAKE2B fd23d377d258ead87e820dd89e4175c0596b284d629563b7d04be10f80bf859d84a6e71a21d1c333a94779262608554e95bf7b44c35b3336cbedf545184ea6d1 SHA512 50df911455429a83088c87d30137fda6fc73971ffd32eb66f21e0d006bce92580c519d4a3a3fddadb7bdcce5d6dc33df853dff6373fe66f128cfd60ca26f9f02 +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104 +DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 -DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7 DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3 -DIST futures-channel-0.3.25.crate 31974 BLAKE2B b0c8f2b3ac8b0b010aab83c6e8d2d7329d49b1c9727393f81f9af8c80b232508ff475fea86448540d2e9016d645ad8afb5bbf746e618078db78631a9b3616481 SHA512 1275e91c90a060a01922747d160435c04bba4686990912e5ba0a4fbbd91ebdbf4f5abbf3530e5f842445f7482e60afdcdbd836586b42f0277e5fdb1a2fcb7239 -DIST futures-core-0.3.25.crate 14623 BLAKE2B efc97e52dd0aeee34402018897a276a68cf94bf13fe37b4c0e4d971cc2dbc8cdf54d0744f0846049ff75192c0fcba906b3556f000fa8657f89a54d9356f8f578 SHA512 3b3c758c493255024df26a763023a5d403fcf1a9fd105b08c518bdd5891ada4fddfcbfc8cde6101157a209ab6d1555831bfeb49372b17e902b4fdd8a83cded4b -DIST futures-macro-0.3.25.crate 11256 BLAKE2B 310fe02b66c014c00dac0c4795ced9ca9bf46dc48f964f50d6300009df2db8505987849823faaa3a0dc312cac7cedfea0cb892d2b0f2c4445bbdd5471953115f SHA512 603863a3249df6dea4ed249b71236526ad506faa5cdc430b3a0c96845e21ffcf800407eb31ca7f0cd45c989bdc1ea68884233ab0fd0abd1d61700830293e968e -DIST futures-sink-0.3.25.crate 7854 BLAKE2B af109917de26c608b21d2fd1be304428a6d78095168a0b14eb709136789acda0a6bee4332802c3fa3f1e65ad9057e765b43728b8aa6ebd6bebeb2f25d5f96adc SHA512 fc318461bcec3344c0658135944ce7ebf6756c9d1950c2c5e3ab3ddc7d4ef5b0f0858d09f14d7bbc9a9fec7da19236a10dec0e125e5550c965bae95255eb0089 -DIST futures-task-0.3.25.crate 11844 BLAKE2B 60635ba309e978f1b4ba72b29b9d5cce1d870d8398986eb1845d8194080ffd9845d8d2cde19ad0333843bc642cd08a8e5aa44b8c85763ef459c39de4a5cd5042 SHA512 d2278d52397390d7cc1028bcccf1aec009b16ffc33873b8a96cc4f456d7cf501b86660507489d8b284e0798e7fe68c04796471050b6fd2d0529c761d89f9efed -DIST futures-util-0.3.25.crate 155866 BLAKE2B 574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a SHA512 3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8 -DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20 -DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5 -DIST gitignore-1.0.7.crate 12148 BLAKE2B 730b52920af24a58199c8350e59154b5e71796bc44c54fbff918316dc731712bdc6045730bf9e4060f17a1e589166d17fbeb6715c51bf459b83345ab1383bdf7 SHA512 17b421257ed83cc3fd0a855b5573bd24fdeec13549280bd24b194657f579ce4494d9068aa17f09b1734467aa381289ef465142d349cc5005c7ae44eca917e0a8 -DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 -DIST h2-0.3.15.crate 162238 BLAKE2B 67f4ec2210e83e16d8a931e4c83c21b3404d826278262174da6cd034de588b944fd6f8c2a416930870b7c8c9200ee9f2b0cfbdb42a94ae2b83f29b3e50455776 SHA512 54e006a0e70448386a8a8ce57434e75352e09e2a6f4457035fad47dc793b5ed69ef9cfb31dbc91b7d0d9a58ab5c2dd18e78190410356f871c14165186d40e6c8 -DIST handlebars-4.3.6.crate 92108 BLAKE2B a6300d60ffe9acab3ccfc2efebe87fa4f5a4049f6564f33907a4acce6aea837eb2193c7f043567700ad15c6ee0c78b0bad0c0e48547ee78011241f09b6f8b810 SHA512 be3858a9550362c9ba213baf220da7fecfa0d8145a594297dd2a8fcb84d3d2200a36428280206b483b1d8b80e6a039c1eb4f1c071fa948dcaae7197eb671c43b -DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 -DIST headers-0.3.8.crate 67904 BLAKE2B 53425c36437b77bf01adcd1194e775b17031af2f47dfe5a4acd60231fdd153529b969db044403ddf454df8f2d1d1bd986e87283263a4664a750514292c903dc0 SHA512 e52fccde38dda43c351cffa9528bab517d787613a2d3185aa8fef6c83fd7d77892c98c1488f530d88ba9e594d94c986ee36a39fa07a040c3c7e556e57bbaf4d2 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee +DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc +DIST h2-0.3.24.crate 167814 BLAKE2B df25fee9f6e39f8ddcb9c1be4775d055328606b3454786a397c50564e3e8340d72d0fd58581239063e29fb80acf92444e1d588b0672817b12cc5c1322652189d SHA512 4741e2732f08c6388c112877f52d6f859088026f75bf928f90b06a521d43e8e8c10f14d088f8a17b42a0a613ee43009882077a68df9300d17365d936400f1695 +DIST h2-0.3.26.crate 168315 BLAKE2B 81c65e519bacc8570a28b82808828044d1c94f8cf9111ae432b1684f216ce51c1b583b87a2bda3c36cf206dd508084b8f0877e93d58c8d511f87eb143bc77ca9 SHA512 3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163 +DIST handlebars-5.1.0.crate 97779 BLAKE2B 584b6f710a4860168b0ca6e587adf19181ea7580a733ba2570380d0d7418fbf7551a77d5a52677704122e7ba7f2d63d3740d6f95a2731119669e6335389ff81a SHA512 6f80735c183bdfea58547329bfd72bc63aa21e6bdf74dc06782adfbb4e987ee31f0f86d9ceee4abab99b5ea2083c3d3369856ac51123e3bfaa0e4704e2406d64 +DIST handlebars-5.1.2.crate 98550 BLAKE2B 5985c189a304b6363c59145da8381f2254b537e206cf29542bd11c1166708f20efa0ac13d253b4764b19e34c236c7a8f43c5724243fe70ae78d604f78f182206 SHA512 e007f51a2fca93b0b7af9d38a696e905ff3fd20286f94b512a1ecea2d204987fa332d477576bad797de967532a9c96fe84e08bcdae49062fcf74b59b12e9b1a1 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST hashbrown-0.14.5.crate 141498 BLAKE2B 7d7f31b6377c901de12f78f0004a347e3e3b948b1336a54b6abd8dd2210db0ac415efcdded421a00723f16563a7b833b5d1db3cad5c12cac916e273bf3e588b3 SHA512 215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742 +DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd -DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28 +DIST hermit-abi-0.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5 +DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 DIST html5ever-0.26.0.crate 72921 BLAKE2B bba23709f6404afcb86dc5af8fe8c0728c4c407de7cfc679c286ef13a790077329f7df2a065eae742e7b4c2303e01793e1b936daadd73f663cf2933845d975c9 SHA512 383a25421cddb0573e41ca93131d681cfbfaf551989337845a197e939a2580751ae90e96605bfc4e187dbd5189b6c014557cc69e3d7d2d2cdfb88eeca8896089 -DIST http-0.2.8.crate 105591 BLAKE2B 254dff38c4d7dff28e4ddee0769a2f5e2e9e4abc6aab38e965cb7efa4069d1b59d422f30fdc73b5db5bb6c3fd02633dbfdbefd59bfd6ba352c3e5c9241d39d97 SHA512 8e8d01803552299807b07a9fddb45d92af089e43344eecacf2bee07b0e745f33558d26a5cde987ac0dd50f939fdac2de6855c8b44f7362e86d05efdde8a7d956 -DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5 +DIST html5ever-0.27.0.crate 72913 BLAKE2B 0a3dc8b19ec74ac5b5c1728f9112ed7513285ec47f4e3a3623b995eb9ed0aaf2c83899126268cd2b3e7388a3209952213d4fe0ea0d297e3c0f7b16aa1b5b9d4f SHA512 8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868 +DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51 +DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 +DIST http-1.1.0.crate 103144 BLAKE2B 7a8c4ffd3ce664e1f575bf4042ac0f15ff42b200fa8c6aa27a6686d77be2de7cd3df242e36f8cb45cdb822bfa96011d5d5dd7bb03122ae5bdcaa15bbf9d40051 SHA512 1c29f25a8895a69d815e21df427dfff7924e9040d01c55cc3256dd0b5e72b670fe75b1414223fb971c16082e4b26217142628be5e0905994da4f08b52e7f4a33 +DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f -DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd +DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c -DIST hyper-0.14.23.crate 186136 BLAKE2B 2f1d5a5175911e07f12bfb0f1e12f88bf2b5f895b766b2d5b483d7d60926d1e11f6ea59dde6a941f68846242f608f3b619cef004eb7b8b890718ea7b59d9d2f8 SHA512 aa2eee244461d82dd56efa1ac30f25fffe2ba881ce0623d02097237582eafd9313bbb52ee72d0c509cd1b43a10f715e9dc84dfb13c838cd7b834db565fb4c09e -DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb -DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369 -DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441 -DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85 +DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7 +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9 +DIST indexmap-2.2.2.crate 76160 BLAKE2B 1b020e3e33204e9e0cf15e0b91a600296147432002e94ae1061f1d7511e3435a29c1c0c438933eb6a56c7c522cbdfff29a106622041815cbd706b9515e2ab82d SHA512 814cffe0e586940c82c152536a970917ec8702a9b946151ccc8574188fa2cb0fab094888c0e910917c99e37f5f53723ab799999fab4bee395bca7d45adeed40c +DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da -DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 -DIST io-lifetimes-1.0.3.crate 35650 BLAKE2B 51182293d373618fdf5dbab016167a01b3e12f79bffcbcc00e1679c2f63a167f7fc291fcd8f886944a855ad5d9828aadc9aceff1a3e5c09106fb274b39e837be SHA512 afb868979d54bc99d5c8a1c31062c91ea9e920470bb1f0bce95c2ebe0ef22fe8970ba86b2ad570d789f648485ea4d75fd83bba34e5a590a443698c713a321388 -DIST is-terminal-0.4.1.crate 6892 BLAKE2B b9277429523c12964710aa21465c0b48c3742bd7b04e4de2ba66bb58349b6d7a171f1df509bc65f97ddde483c3c8d08c2a7d3dda7f3fb90afa12aaf47e658726 SHA512 40ad52218fbbdc0091a67ea9f0de6b2bd988195262ac1b06fa4284aca02b2741951414aee884fcafbda8ec111518a243430c760721c0f18d251efb30f50e1b35 -DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 -DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42 -DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665 -DIST kqueue-1.0.7.crate 12554 BLAKE2B 2302bb9a6aae077c1b69e4892614e87fd86187fc4608cea08cd510a46ddc3a06b27027bcf6a865550187c983f3f80a9c7dcd6d8a6ca891e2cb6fb2d1a5d17396 SHA512 03a1eac44bab42b683312c7f541fc235ead3ec89e7e0b6991acff431f85086df9dd8a9ee1b80f784c9c5452d3e497170b734883ed0fd117ef033079d72f6c1c1 -DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731 -DIST libc-0.2.138.crate 609081 BLAKE2B 210aa9a7ba99d69533946fb06c2ac6ca0714b3d4c0c5a80096e188f849319dc5509b3b41ec56aff7d1ee899378be2197fe9f8dc921500b11ea6cdc8b3b15df45 SHA512 986ccf0fcd18dd124fa6d3d89c3c7cfeca1046270a6a1b5c4addcdbc7f7f36216cb74094836ce8e97a9e331b97ed893d57daf39e919d24b001c4789a022f7761 -DIST link-cplusplus-1.0.7.crate 7576 BLAKE2B 9e8fc7f4b149a778c732469c6ef4663ad01aa49d6dae747b4368f827a41c62cd2f38cbd7e1efff45d8bf0ccafbff305b8ff5503f25028bef12400343b427e278 SHA512 c8fdf9ffb29cd0f8824bb4416d28f6f4fd7a024ce5056acbe63a680f975f50fc0cb408c0d0af04a37b6985bf15f78e7e7d1fc20a9c0f8b729e7ea696460d8c75 -DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768 -DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 -DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 +DIST is_terminal_polyfill-1.70.0.crate 7451 BLAKE2B 9efe76f14d61a5af6d3cd30d5e64209971d4292d8d2c12f4a621ef65324a5bccbb7e1d79d5efa75ea7456431241d6325cdeaa0af802b1480c6cd9c1bc5a35994 SHA512 c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 +DIST js-sys-0.3.67.crate 80764 BLAKE2B aee8b96c8c5811020b3ee4277524902e27d96a027add7b21a8ff94eaac7db15e8de08a9e203ff462b05ce10d0a44aff78a355c07514794e41f49fa936a3c8fb2 SHA512 590d947a869c3435166e34c25b3011351f6804b43887ee76bc2be69b7407b5181bbbc3a5bf6c50867c65d73fcd8e65ac7b0d395710ccd52000beb87f8826be96 +DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 +DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3 +DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61 +DIST libdbus-sys-0.2.5.crate 1557017 BLAKE2B 4528c792d727e71141ee2fb2bc7080b101df650121487c420c7c6f3602d2ac987deed7ad49bab850619128f258c1f3a94364f7658b83fed16167944c4ed12c88 SHA512 94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e +DIST markup5ever-0.12.1.crate 34763 BLAKE2B 8057bde6b03d3e80c920b9007462b134937c80393f7422b4182823676069c4934d0c2806007e0c42b958b2c9f1b73679f62ed1e38b5c872b917937562b9ec7bc SHA512 5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92 DIST markup5ever_rcdom-0.2.0.crate 222948 BLAKE2B 2105ceee730f5fbb3c14ddb7bfe8ee5139febc870e37e9ea169f107ac8060ee4f5782b185310bada5f646600c2b8bb7fbed144c056e5b437133443f62a04ad99 SHA512 bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4 -DIST mdbook-0.4.27.tar.gz 1518389 BLAKE2B 6eb386a48d631eb246871fe5269e0a49f008ff8395fd05a3948de7b10d663c64ca22e3ee96aa79afbeac37a0f732c988ef7620359da2c25f563859664c8313f3 SHA512 30d78b11dd1c4302c156c5a2df7b3e32de7a9d8074d9826b555c4c1cafe43692fc80273ead9bce26c85885e16f2d99c872f89919239820d420048b8a56a09193 -DIST mdbook-0.4.28.tar.gz 1518890 BLAKE2B edabc227d28e7e4e38299e5e9e1973dd8f6cf533e9f21bbda01a5357376032da2319bc86bc2077b85ddb65317c4cd5e6d03e0dd67cdf51dc10e15426febd0330 SHA512 91c82aabd9b422c3714257a2de415f74b5091ef114586281e1adfdfa9d385e416c483d4f2c2ef052e9bd86234ca78f63f26ad24abcaeae05abebac0483f824ea -DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa -DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c +DIST mdbook-0.4.37.tar.gz 1530568 BLAKE2B 42c3daa2c4169fd9baf7aa217b8f0d119b3aa9146c514af35b5d8747111ab1f44e0e66191fb7df2c650bb55fe011af9cbaec399cc7171bf8407f9843e88030f9 SHA512 f7f11ea46b6f1ca89922c0898ce5ed68711cab0e6cc1cde5654454dbd4424fdbd907787d40ac188c82b581223badd4d4d82d65c4bc1119114b3e7062d8c44e8a +DIST mdbook-0.4.40.tar.gz 1536327 BLAKE2B a4d1f3b42241fd0818515e2b0e1b5544dacf5f1e8dd29863e6856f1f55a439bcac37f109d93bef3aa99f0d3db7ac978e1389db7fdbfbcbda3e864cea3fe2089e SHA512 d73e8c8144ac8d450bc94974b64cd0519c44002c000c5a60449e49035317e24572cecdb7e41df31d3af7e1bc0f342ed64a3ed09deae8cecdbb295edd87858827 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40 +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908 -DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2 +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85 +DIST new_debug_unreachable-1.0.6.crate 2582 BLAKE2B 2ac3dd86f1a532832a40ccfda95654e43709a62faebb8182c87309827afdd23e6d3f250f2345f044cb789015c30b7907be63253b487d368e68c4fdbc7de20492 SHA512 73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea -DIST notify-5.1.0.crate 37269 BLAKE2B a11937c11bf32aa9b872e78009a5b92f04f326ef1d0c5037611a89974c0011c9656475864aba794d7b1b30635ccd01c475d250ddd1a8aa0f4adbf46f2e86ec1b SHA512 b04055d124aaac30eca9bf56d910ce2b6350967061b42cc83d2852ee6c8e99fb687dbe0569daf0aa98b1b7397b9b8970aeaef31a34cec84108f6de9fd6a88b52 -DIST notify-debouncer-mini-0.2.1.crate 4988 BLAKE2B 4b9cdc74b483b7aafa93a2d45612ef98c7719bb3ff29367f21b8a4bee10a909688887644b301b08195a5e10c6b187594494fb85c71a193f5652739e96b2ea212 SHA512 f240ca3c1e8bc1c6855bbe781d6ec04cfc57a503738ecbc2b09c5d650aae125a7dc20416e647bb820e404a0feb599d9f6b9c32836bce46286054743a1e7a3a32 -DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 -DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 -DIST num_cpus-1.14.0.crate 15673 BLAKE2B cc706b01681898799a5388fba863d2e8d13eb09644ecb92cb93a3f1c8b24527ad259c455cf56fe06d8ed6193ac1e8968d62a50824e4906e2ab66fc53e6e654be SHA512 c3b19f7cad14947c9860ed81617e2f7492f69248c8436ce83429cae9fe09d7be04c813233b54ca216e7dc2e03b76f46c5659154f89bb804e702f23b78feb3507 -DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46 -DIST opener-0.5.2.crate 16345 BLAKE2B f3c982bb56521d717fb805f0955c430e03e5cf6488242ef82d32b44307cb956b89a07fd904f1a7753c315d914f7c2a675206dd6e687a2472c712f29332427d2d SHA512 db741461b59ab6e252eb2a96b0b3ab2238595199ee396d9508532f7ab97280f27e478192a27d42a36423d34dd71f6f1d1c457a1854224c9361e47c5775c7a18a -DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e409b10a99284c7b669304c0cd701a3d20e690350018f5d7de8c6c7d38521f3413ac81d08067dc26f76b7c0e5b056b SHA512 2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43 -DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89 +DIST normpath-1.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca +DIST normpath-1.2.0.crate 20107 BLAKE2B 08a86e545ed8d0f1881645690c45c4a5fff438680a36778d938bda03e489706a1086e91e27429a414b5925b15be93a80d8dd2327cae28bd567a058cbec5b6c3c SHA512 a8e20301909e28d6b46ff388ac77c7b093c3654418f74955aaa185489fb859b79fa75b7cc303c0f6ef93b01efe18fa70628b1e85c123e143cbaee98eeb558e15 +DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69 +DIST notify-debouncer-mini-0.4.1.crate 10227 BLAKE2B 1c4427c0b0b1c995dc779c24585f88aadca3a2791e51a481189ea364b58c391a4956a76bf1cc5857d4193dbf7bcf75a40daaaf56dc772dae4fc81ebd4effccbb SHA512 3ecebffd777828e0c4fdc547f03b055742945b5a34ab4ebb735adda41944a6d5008aef9e887f88c212bf9a8406320bfd0cbe128bdd140f781016d59831b4d1f4 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 +DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST opener-0.6.1.crate 19173 BLAKE2B c235ccc8ca6f1f87a30bcf94b0014b5e1df99c6dfd942d5c3ab02f351afdc8c8fa3f7074ab87450eea939bf682d31e3a08ce90d18dcce88aefaaa7ea61425785 SHA512 bd56a5c23a3d1fc3d5828bbffc3f7df6f3d92f03cf38665587ebb5b16a716e04395ee30b239acfa8fc95f4daa67807e48d9cfcc79817f2926880832c4ea4ba2c +DIST opener-0.7.0.crate 19181 BLAKE2B dd8002be0c58619b74ba4f7e59b1b6460236c017dd400d8d86e214d7da7a5f9157ab77c5558325a196ae7800947e7b9beb7d90d146f5b93e208999d1309037de SHA512 cfd98bd864ea0a819b5d6dd5caf1851b72bb7a64318a3439439981e316fbcbc65a776265cfb6574d0c59b2d98008a65b7015665361c3501737cc0261bee6466e DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c -DIST parking_lot_core-0.9.5.crate 32396 BLAKE2B f793c855ed49476510c200d20895cd7f62e93dcb4fcadeff5528a8564f43e5e8d45f3857bac355b765d09753b554cb9af308a9a95add518d3325434ac67a6ca7 SHA512 1c430ffabfd33e8396178615829f6f623edc34d30393658b4cfaa263f4ae6e4101a9850333d3b54af058dc499bc66240a18041f31e920d5bc866d6bf66809378 -DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68 -DIST pest-2.5.1.crate 94437 BLAKE2B cc89907efac53c6b4a897fbd94a304d41e3d8d5fc793342d1e0601d36d75c1df84041646d928ce079f2f2169648feb8638705d0fa4690b83e2711d35ee1855e4 SHA512 5cc8a28bc84636c802ac2016c9873bc2c72667fad2cc520675c0f2f36de8b19571b532c08d09ae7d7585d9aad6741e81ca9705f6b02f2344a74b3bca466a4d57 -DIST pest_derive-2.5.1.crate 17682 BLAKE2B 659465e46ff816e4773d80fed3d94801dfff912a0bdc96665360244e4e13f6011232d34215b5687fbab547721df0c4e182765f4d9bc9ccd4212474e928097ed7 SHA512 bff72bec4d6ffccfe4142455ac4face8b38635e7092acff96d18f04d0fb32c6e9c9f0bdb03c902394ccec186087f410f0f4cbbafb93c8201da09368fcea26503 -DIST pest_generator-2.5.1.crate 14887 BLAKE2B 4adb74b68be06f5295372d8032a8512a7afe31a241538eed2b4a16c87d4dffbc3380ab6cb226a5ddc7c8320dae20c5d8c75726fbe0a4733cb104562cfef24fdc SHA512 a06470a0f0d28244ff980d5debb6890c74b8a8350f8d8d30148f58ed2fb1c8b1e8386f166402fda0deba83f8cf9a0fe005a1ed17a9da62d19c2460ea518460b8 -DIST pest_meta-2.5.1.crate 31871 BLAKE2B d147af2075954db167daa27c272756a4250091ae2526f0453b53215aa5f08a33e1574b6cae3071006de08b4d32b89976eabf7a697801b7f96d1dadd8e70d3bec SHA512 d18e38b98da16136ef8ba4d74f673fb1cccd4aac18eea748d224801cf9213690d955fbc052435b2f6261b028b7c05d748213981ecd27dc30948289c1ffc951c7 +DIST parking_lot-0.12.2.crate 41723 BLAKE2B 7c9a4f483b09f4e4bb25fc758c80e8259cb02960b791695a061fe595cd6ed9b13f62903513cefb595bd633488b23254dee054a98282162fc4664301ce04853c0 SHA512 42794b06d410771d1ffdfdd4a9cab136cfb80cf95385876a580fc45739fa41f0769adfbf16be54a9a931632e02d2464278c5395092a1d6107703875e9ad112b2 +DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389 +DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 +DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7 +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pest-2.7.10.crate 123707 BLAKE2B df683c015ac230f2e51ded7f2400b68fb733845dd4601cba89052a2d1148c89d5ffc8ff7e15a42f1822d617c872b5a59fa0f1db88cc94edf5e1b8cbec57be44e SHA512 3facdb4a8bcf0356b702cbff4d314db32a80b33fb3512e52c31114a3f666414a49445a1f502c911cccfb28b7390fa058207570bf9127677815842b4988d1f34a +DIST pest-2.7.7.crate 118478 BLAKE2B e1464444fc114fcfa261e671733f73849001f8481e9e204c3782197a907162b9a037f7e804abf6f4be544ff9736ca63d87b7ea109470a8953b53a5c91e6ce920 SHA512 3edceb5acc379082e1a3e3d3600039232e8440fcf7b323c70951c78bc195069a5758cc6c47a69734f3e2bf323b520587610727105da70a2bd28f963e286dcd76 +DIST pest_derive-2.7.10.crate 36221 BLAKE2B 5cbb80d894f501b282346520d900ac718b36724e46429b17d96ea91e6359f0115173a4331f0db48596e77b6bb2c605535c774231a0c19ff69b1c34ee0c7c0ced SHA512 c63ec4c6849b27946f68afeb0eed6d3f3bf6160bf73ef4228c3303b5b9271e30db8e93d01842ab3cf1ea6a987f33b1e4f55ef4bb62fdf7d9ec32220193ba2b89 +DIST pest_derive-2.7.7.crate 35839 BLAKE2B b51f407eb54f9f8f1adbcfc4d1c2af3ac76b0c6d4cfa1a0eaa265a00458e892bd421f3d440904dd404a1818e7b79465d8050ed027f1e6f3e54125a887f4576ab SHA512 5717026ac6882dfa99ecf68d6ffe7dffdf5c74def257039d5619d2878816c245faeae0e5925372f9c636fe1d5067c6227197b34e0657c7788b753ae729dc431f +DIST pest_generator-2.7.10.crate 18411 BLAKE2B 67e4df45b33e6f7b212c2e1a0ca2e064359b9237fb94a2d3eb40a886ac761c55f198be734a3812b61915f75f6646cca277fae03faadc06f3cfcc6b3a36f36487 SHA512 8fd4678f445780cccdac73c51d75a823a9b71c9b9c52c9fd4dca32b2bc4e8a8b33e68d8d90bbe039e4fb2fd9eb8247bcb7911019325c1137ff4d9d835adb0f59 +DIST pest_generator-2.7.7.crate 18184 BLAKE2B a66c47676bbc7a911a4fc0e4687e445e10b6022277505aaab91632801ee7de59ce8b9ba665bbabe668437ac90e81e3718294d15a1c875cb7b6586f81e86795c8 SHA512 93b41b542bcddbdfd546963ea26d4871a9cfc38a2da55efad3b354ae705ee7f8ee6884279cb8a56da9e33e5f039f72964f2396c89d5346dcd668502a38ac73c3 +DIST pest_meta-2.7.10.crate 41550 BLAKE2B 2a5799519a7032cfd3afd1c2cd23b6af2e9f317717613bb635128c578dc92bfb51706492a083bd6e46c737784c0a69017ecca0f09124786ea633377124ef1f36 SHA512 8c931690d025be0af8ef3ef997eb95d3ebcef47ce0672544a632c77281651f2d0c9c34f1b477426164b169bab638171853bfdad2696d32a90ac22a8bb143cf6e +DIST pest_meta-2.7.7.crate 41562 BLAKE2B cfe95f7a8cbda7d22126e365ae81c4a7e73ea18112f4b64ba46226f2e05cdbe3d1ffa8721487a48d204cce0e649b8b26ecd8f29fe16064d4f5147decf90476de SHA512 9b515dc49f171362c70e2751bf14bf78792662ac2ef27bf8a32f7f5c49a9204b0b9ae47bf997953a8ed49dd0104095c34cd8ad3f3a6a4c00255b6a7212b58ea5 DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073 +DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4 DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1 +DIST phf_codegen-0.11.2.crate 12977 BLAKE2B 5ceceead850a45fb0f6ad706ca26e79267bba0ffc0870b8a31ee8a586b37dc421d31e5af3453d62eb85efada260a2eb9ceb12d2f76434dcbaaee2f71cd43d38d SHA512 0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7 +DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5 -DIST pin-project-1.0.12.crate 56972 BLAKE2B 1f6b106cd55b9692bb1d671bfd51011d9f89cfe8bbbe030c64e7ea57b6efb0765838b03812708a7aa38c197d3b43328a9d88fdf93abb51f4d1a3061301b74414 SHA512 434ce0a0e16441c7aa6f12dc98584a0e7986e9491eb08d5143e3f64e1f73dfa4db9d0fb2098f16e5a36f3653201aff735437d2d1d366c11160c09534c75fbfe7 -DIST pin-project-internal-1.0.12.crate 27956 BLAKE2B ac5cf33b5981e32ecf802a9de1576f696006ffc035b33173b1606a1d12c7b12c53a217f5723e8ebd622a121345f440b200ab3972410a2f161a5ed83fa8769ed6 SHA512 f3f4839c5fa7e3232a323283ad9636cd03e1bab79b439cc2d2ea954d60a3dfd417aa4680b7a34a3baa48d7e02266cf16e56b719a905f04157c708c90c02e45a9 -DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4 +DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe +DIST pin-project-1.1.4.crate 54230 BLAKE2B e90fcdc609f42171b18a42626e59dd904555774c4c012a274149d18ee899ade6969c31d9fd706a363ee2d1a510d80d24e438e04cbed5f4ab26b9d645256e2438 SHA512 e378034c6de9148797d874e9a4ecf66039c662c54c263a06413a2ebf5bbbbdf21419e8738d6b2eca6bb5d2043102e52dc6d0e370e7c242830ced0779e13cb6d8 +DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578 +DIST pin-project-internal-1.1.4.crate 28249 BLAKE2B 6d8dae4d59d0b71c9a66414cf5babb45285a8d67f798a25e5521495ae23e983b871bc8f70c20d0785b5b53acf9a5cf734f137b581852a542f98b0492cf6568f6 SHA512 b8a687d1d2fa84bccb41eb7652434036c227268177f2f05a7071b0dfb16672fc8a9762ecac6c4e519478cefe16ed4bcc2c77dd9298057dc42f87021f8e0a603b +DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032 +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 -DIST predicates-2.1.5.crate 24165 BLAKE2B a0eb1aa0f26d51140155b8b5e7141a253e298ac2197e59c7023ecc693d68cba01d645792c57467741ee074891438fba2f1439c79a4cef27f3d02eaec8f1d0b10 SHA512 d4b555d7f57ccec5788a957d4a3e130f5549a9333a47654baaef098bb284c64bd5c662677ba7e659b4563b3d0146914f1235e0caa2274af8787d9777141f4dd4 -DIST predicates-core-1.0.5.crate 7773 BLAKE2B 6214146a1aa53c127dc4c0ed1bda847c1be41e88f833a6c5095fbdb37abbba9f1726095f3e168a0ce3bded5b458e73a73c1dc467ecc2a31c7b3716b01bd00858 SHA512 d94481797f2fa307391aed01d5276db04663ceac54150f922c8fdc046c3b1417cd93d767843df95985e69e0ba1202a0df82ea1820f9c67b15a91f2feb2e3e7d0 -DIST predicates-tree-1.0.7.crate 8145 BLAKE2B c36af3d8c2c378833515f955970733ca6d71fd7b317f9310e451e32ab6e68d6fed2455b38558b0a9f889126a331301eb631821562fae6e4fea3abe1caa9d7a67 SHA512 0e66884edaa68e5339cae5461beab273d10b0acf9162827b26d6860cdcbaa10cee0412e6bb8191dad84f59d12e01a0684646b66b793b2c9c183244c96c05b6b4 -DIST pretty_assertions-1.3.0.crate 79441 BLAKE2B e9d29267ee77532de9432f075daab704e8d80a3d5fd5515a7d3c1c9a58dd98ef0190a592e7fe4d8c22a149beec15fc346a68620a3835c1269f72e563d2a5fb89 SHA512 40a56ae7287552cb66e1066cfb89b26af621f894036b9a0cd49889ec5b25831d52cc07f9e117d905766701fa71786a45955186849d36e00cbdb5f884763efcd3 -DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931 -DIST pulldown-cmark-0.9.2.crate 115824 BLAKE2B cc8b8cac890b333a864ecb1444128b1aa187392b296c54ccb0c3048d79d17aa7f53bd0ac31f0c6492544ea78636deefaf3ad44804a1c79008e17b27fe1e61fad SHA512 2268a3284da5def75b906373a3c70927bc68ecde7b641231d96ff9437785732134568abaf0b6f81c582dc56498da4e677a7b2e2f1914cd42b345db0a06d75c60 -DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc +DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0 +DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 +DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 +DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995 +DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 +DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d +DIST pulldown-cmark-0.10.0.crate 139056 BLAKE2B 72974ca5b8fa8de1dccadb65900295ea3a0adf9f86913c89ab16c5c49f65d4f3368453dc2fae807f5cfda5646b26a822e3f7e4b7f6f15bdd7ef058365f3eafef SHA512 cf6dd2f0a3a4a9a1f4032ae7f6084ca7805d54576de8083951c50dfff7a426ee5b0846bc7719ecf07c43a298a02e85ff1fcd891d0a163528361baf19a0b19044 +DIST pulldown-cmark-0.10.3.crate 141746 BLAKE2B 46a980082576ffbccfee77ea66dd55fdbc4729e6931f553108a0675aba20072f8fb342749bfdfbfb283f72e9aba6a8002c347de75f05ef4b89ed35a23844a3ba SHA512 ffa5d116bce2b480f495a0aeac106961c9c79a2127aaca9f75b759e2f2823d253d2bca0dcd5c1f095c16c8e952bdf421fa04a26af53d80095923a5804a274cb2 +DIST pulldown-cmark-escape-0.10.0.crate 8944 BLAKE2B 554bef1897d8bd20fb679d155c710cfb8bcba4bec52afe6b8f634b671b6d2e4dc12ad6655df0b94196d57a1f3e1bb39bfdc652e42f3ec90d880529bf5da36e48 SHA512 282bf294d525f0b7550ef33fd8ca8604c62d4175b083f241a4524e377ab26d9f578ff2f52e0bf33e371fdfd0f93adf0d14d0e3171c412046f17bcb91826d25ea +DIST pulldown-cmark-escape-0.10.1.crate 6672 BLAKE2B 7679ac2ae60c16be67a979b964bdb7b46cb02e302e0a8e2dd1f51c123b51125d7a1f79315f0108ca67c85be63aba1aa5dc595188097355fec43bfe0d0362f342 SHA512 4c60b4abcc385ba7c27210354769e63d5f7f387ce234d3078e7525b88cd2aecd2d62a7dfdc8a4cdde8ef10723a216ea5fb5214e96b5bf8d2fd84e28786b2b3aa +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 -DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 -DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f -DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f -DIST regex-syntax-0.6.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85 -DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c -DIST rustix-0.36.5.crate 287459 BLAKE2B ffe3cbf130c6bfca2b6b12c045c6843d18a148a8305bd55b4be1d3c4154d273d047c484cd1973a7284b2bd69c14187373f09e0713f097b576724fa0279a056a7 SHA512 4e682d94c170f578c426ca6db9434ac5b7b4b9d93903954b12367e87bcc4f747b2a6125b449354972f606fce74c3b18b64470c33540ba6e894e828a15c59e2c8 -DIST rustls-pemfile-0.2.1.crate 14278 BLAKE2B 2cd27153a5db80581e43009c0ac21209f57341e584c8f11789bc9e9ac71d6cc456c60554bd97176c7567ad67896b74acc6372c62973a3ff1e965bd1d0dd52bfa SHA512 1c03cd74314bc0bffda4803f6e7692e53e3cf67a6bd30e6c96a861d8c118363b0e871a9e28c4e1a4d4f1fcdf98f3a5af3be5f0250f3653836429a27645a10c80 -DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460 +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b +DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 +DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1 +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST regex-syntax-0.8.3.crate 347497 BLAKE2B 9ac2f63098ffa3fff51fe2bc0bcf9ef164cf9389a909a3f0cb668d2598e7ca65d573e47d571ee2e6bba3a1a96ef7c298b8d681e1ef89c8c53b7d590e0e22839b SHA512 925f7bcc50d94c65d34fcc770c6e58dd5b8a045541c0109e77b8efe842eef4c110087ac9c0f86c7c3022ed013abbc5c0a187d796dce292ad5361a0cdf7153d76 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustc-demangle-0.1.24.crate 29047 BLAKE2B 8248b014eedb26cdc0b748544ba91b9aae9c992a6f93b4d3ac256b78f691d572f8885a3575492ea556698a241d2759743968293079ca02bb6a5f318b0ed66dd4 SHA512 eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8 +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25 -DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST scratch-1.0.2.crate 8152 BLAKE2B d38df70a8067ab6a411798b64e4e9679b554aa66886c824e410d50ed805555716e96c54872186617f2963526119ba81c20ce237d4a0b1ce754d7d28696c9b742 SHA512 c3863dff0c67184605b356d6cc57db2bdf26cad9e0357ce6cbf7d3f23d913fa8917966a8c93b3084a3c9c900e357c6ca4bc2bc5ae5db3bb6feb5ee1ea5c61521 +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb DIST select-0.6.0.crate 60292 BLAKE2B 725c9b4e8d9143633f07472268c834a25040a9f133ba95db1c41ceb45692b98a9fe7fba98c10bdc48524722b37bf9395a105385752c6bd3beb044b7d65aacf07 SHA512 8e5b14ee8cd2d88eb908fdf750cfd724741019ad4bbafa1fdeafde10db0b7cc6a86883d8aad7c1267e772dec63e2f138e57d52ab425b8c5a10faed9329dccdfe -DIST semver-1.0.16.crate 29850 BLAKE2B 6a6a680e55b6e98e5d0d466cae2f144531d3019988a7a241e7f0e54ebf2ebfbef27eb7af5ac59a618fdaa5546bb84c65e4616734b775fb2e90d87c1ac0b07317 SHA512 4fac06eb9ea475f8a31dd85e4d28c70a351656914e8e61518ad69274e93f1b6f14cc32a5b0c0e5a7d9ba0c74d4a16d502518dfdf2756e8df5e45869886db8c2d -DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7 -DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91 -DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e +DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35 +DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec +DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e43bff6b7921db85e19f34ee5022eb1086890edb6987428cbb707a59277ae007d1536b5d80a7da615fc3f36a SHA512 0917aa36d855ca77726d538fb7fcfcf629722c784d747b3869c0d69444c447d7b1fab556a9eb9594ddf6cc508df636fdde051a1c3909f9c691e4921946ebda19 +DIST serde-1.0.201.crate 77725 BLAKE2B 3cef32b1c026215e83d84dc7867e93b3c76dd683be0519ea17de25ea030d8cbda9031a54636f254026ddd30d96033d217cd81a8bf50cd7b3a936000bd47a3736 SHA512 d422f16277b59d756f7e85e6c589a28f4134ee221968eedb48bde430b63c3cf6d379ae8f03249439f984c66e0a9639238159b42879a9fa03fc49b167870ce35d +DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8a298d6f07d12a2326ff144baaac07fcbd4af1d18b8b1188d4cc192e253fcd79860d1dbb2ecb148025449c0ac954c72 SHA512 f4df7f835e8416e4662c62a46d5f6e6d45ffd103812d681b220f8080310720e27f738a34a8e622df722fed55a1d8c654dd4abfbd78d1fdc871306bf3985baf22 +DIST serde_derive-1.0.201.crate 55865 BLAKE2B 2ab2a02a7819a12ebe44697d97d24ed61cbff872e3a1df7a33671165619619a1826e80a948a85f7508db024d4480ae1e91ead5944eed3d011fb0f449d1983738 SHA512 925b7238cdd833dc3eebab162e4f18eab9fd533178b957a7a3149079a10a0eee598a3048ddab6f16113467e8eef78604e3bdb26ec7e30184aa0202b1f4267cf8 +DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34 +DIST serde_json-1.0.117.crate 146921 BLAKE2B fda4f87c300762c24163cceb449bb27fc96b089d5ee869b89f204dbeeec704231cdea7a14bc303cb40b621288fcb1a2b03f50552767e32a73c982d459762624b SHA512 363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 -DIST sha-1-0.10.1.crate 12018 BLAKE2B ea3d41ab252d2d0f857326fa4e21c0ddedc80864811bcd3bab19d4cc5c9a48c7a94379f1d64f8bea00fa392fe977f535b2019e234121b4fa145b9bfbae91d6a6 SHA512 325e98435b79b88ff6e835e665ccc8c386a0ba9ea17c7b05e8ff42f0f5d70589ed2e874dc4ab60b45c7f7d67a896ad051dfddc6efd90bab7f3c165f9f964e8c2 -DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b -DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752 -DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce -DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521 -DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae -DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088 -DIST string_cache-0.8.4.crate 16380 BLAKE2B 235973fff64a66175b563bc512137bba98f84bc00fdffa771a9925950903f3ee91a9f1025786aa68b796a55782e4d5bb26756e1134db96dc6f4cf69974c18774 SHA512 dff6d359226fd2c4ea5934a3d5ea73324d548ec235cd9aac8c233f2d9e67ba9b045ee598a34063839eb5b906d344a70fe3be65abcbe106cb9ff79cbc40b833e3 +DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f +DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 +DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a +DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d +DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 +DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST socket2-0.5.7.crate 55758 BLAKE2B 148d2e2b6610895ec555b1357b340576984eb76cb3ea719f85af50cc4215b2ea2db739e2a61434c09360a0c1ff8e05911764e18dc4a59451c0aeb0eb60b8403f SHA512 ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd +DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479 DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 -DIST syn-1.0.105.crate 237549 BLAKE2B 14e3187e9e1300c3c62d47504d61f154d4f3f22284fd1a44a5149764eb5b8937d74783e42d48380e1a31920a9319e8e7af8a86e8e9e8bb46bee839964bc4029e SHA512 4e2475853587ec669d43890c88074c00c0fd45a84631f8a0b513f8eeeb78cacc297976121af9488419d2979b33579c5d2b782e18e3fd32dcee35227e767cae0d -DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e +DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST syn-2.0.63.crate 258075 BLAKE2B a6d0c01640925c7fc0513b0e03dadf2439a1fa488177551cb9b894dc1c7c98882287dad1883d6b1e4b22e74ac66c6eab78766f7afd1ab0e2c8aec9ea5cde4249 SHA512 22d82bd1a0206fd326d6004245fe2538db9aed2ccfb58e9dd967030d3c63ca4ee146c501e21ef854910b89bc11d09d953b6d4139df63b53584127c03d9ea6ce2 +DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa +DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f -DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a -DIST terminal_size-0.2.3.crate 9361 BLAKE2B 38862ed4d98442f755a841b3eb44b397645c6e2ad25793dc96b089df3549c07ff353e18515b83686b34f002e7a557404502f847ceb6f5f673b96830286553d44 SHA512 f390c5e8ce53e0387db7c30619a107e484fa80ba4e046fb797b6006966be446d5aee5bd2179734b0684e206762fe7b19e8fe00d75853069a4bc7b9ae14f74c23 -DIST termtree-0.4.0.crate 4449 BLAKE2B 28f19620d7fb190c6eadf9bf6c313d1cfc1d6e1395fa2f235e7c54e44a73bd0633bdb2c7eb24ef2e763aee4eb3f10c943028a349be30b0c85d4178d7811a9ad8 SHA512 d1b5fca80dd15f506804e565816417ce03cd37e7b0f5bb5b2e21b5baaa66dee0196a3dd820eb392620403d28b018ca15404219399b5a975d80614979d710f2d0 -DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e -DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952 +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 +DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c +DIST thiserror-1.0.60.crate 21247 BLAKE2B 433d54b0938451a4458da709576f78e957d243bd7a27619f070c05f395fa6717566fa3d40be61f85e3b95edb11391107b11be3945bc6ee8a70bb9f55c17f08e3 SHA512 4fbd8770fed56da490436a018d5bcc00075493e9772b8249e72bb7213262766574b83743469fabc602d417ca0a787ee43f539dd9f08d87e9ec73c6c65768381f +DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde +DIST thiserror-impl-1.0.60.crate 15787 BLAKE2B e83014f3cfed1e0c54d7854787a6bcc5a099af33fd14431831e607884f1658339e5e1f9d666d6d92d362a285337ac5f170c71bbdece96a343bd80007e73009d4 SHA512 607356d744e1becf7b7070878b8738d853978d28ef4a589bae739f1c3cebde90e8d70e7ec79d67588f6d024784a0fe91c21658befbfeeb71d33f5eaea9416325 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c -DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873 -DIST tokio-1.25.0.crate 626886 BLAKE2B 8b6465d8af495c04000dd593927c841a75a9d98082cce771f4b546460c42092f33b85be745839aeb68b91fc58c3d39f3b34c6376c68f95034e25639e45f09041 SHA512 ff53b5688a6b275ac02b0797eb3967e7ec6764f13373717e4b25623b4ddd8ca964fb2e30827bfe85de20a5d7a19b0408a6a5565d9199cedb6e00fa83c21b7f6c -DIST tokio-macros-1.8.2.crate 10071 BLAKE2B c35e8043195b61bdf3e863f2224c41e3fc5ae0b32b02e53c2bebd36ad9f486e573cdd0e15b7a49e640696edc050e0d8dbfb5b33f1d12887a8ce418edb80abc53 SHA512 753888eed2d7a39e616851918b707c7634d30a54d8d276414b17ce310a2a6fa586bdce4f29b4fbc23f175654caeaa4b0589e571e2a346d99e948297a80f24994 -DIST tokio-stream-0.1.11.crate 33918 BLAKE2B a20fb1618faa8e652c5bdf5222f04f939a932f0cfd2b734fd71bbd299914f42cc0e7d22545d524ccf0c661ad4b05662bac8b8df6dd250ac3ba07164621a9c619 SHA512 4fffb2be939c91a2ae935ad4b2f53bb0e94cd94397a261852ca7bd8b5e334b55c6dfe25277f855015bbac9219e4ad1005eaa0531ce62740bdd694e1a07615c98 -DIST tokio-tungstenite-0.17.2.crate 23365 BLAKE2B 1a27be728a738a3b83ad82da1cbd9e18c13c47adb6f1556777c0001267bd70035d17058e88654d99ec25e2789f4a4d25b920fb22cd349af990d030b686321de3 SHA512 8d5eff6fe16d8c7d5af68b96a6eec5de7100ce633f2f74b5e349dfabc9881f23371d061a0095cb236d24a9a1b8911cbd1bf0b61c9405b0d4305a488097abadc7 -DIST tokio-util-0.7.4.crate 93424 BLAKE2B d7a894c95fc5c974ce0194eccf46461769c8db15f7222fa792c7777f9ef266dccb09424dbbfea5ed2d99faa5e375ca23a8f541c16689585cacfc38fe2f4dc9a9 SHA512 910b997574a4ef8a638c5483146b4b39ab9cfeaec5fa41812f4c6835d9dcc648adf77ad8f6d914b58d435e0127d9f162beb396bf97fb74e34256ee1857f118db -DIST toml-0.5.10.crate 55193 BLAKE2B e718f93b865c4e8d17e625a753776bc62a50f98d6f83e4323268d65547b6bedaa90bdfef8b0ab9ce42df62c5552939ff020402bee9aeeb7d883caf583438995a SHA512 0d438b1752b815445db647d7bceb620ba7e393a29dd5154f4f20e0357e7744c69e72ea3a797f8190bdbb72f413053621de7c8de88d30926a489526de440af2df +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848 +DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85 +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 +DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303 +DIST tokio-tungstenite-0.20.1.crate 28569 BLAKE2B 3f0534f6ff68c53383dc70c244264373d324d88431c7c4e0e837a3c2dd20047731f58f085f5d7339d7e7bd56a4952da60848b796af1f47817e435c3649d84c52 SHA512 eb4d3ca0f8beca4c835ab174590c6e023ad2e0e19daae36d4296061886a306569bd1a18ac23bb28359179e1d29f93723244cba42905be814b133185b2ef6eeec +DIST tokio-tungstenite-0.21.0.crate 28159 BLAKE2B 5ac21d0f51f717e3816ac38ad957d1300bdb16c60d3b6041c80a494dee8b08d12c1b20d7f00d08500ad2f092f9f2c6f2e7c7c00fba1d0f34caec4525e61dd85d SHA512 2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST tokio-util-0.7.11.crate 113421 BLAKE2B 2bb1c64e4698b99a149ac3db137d9f80a691199397f98f1e6fbba14f411e849859d061e7052cd3955f000b31d97d594a4bab7928fcbfefcc9723980d3a1c80f5 SHA512 09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360 +DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 DIST topological-sort-0.2.2.crate 10566 BLAKE2B 4b806d2ac1267104f921c80290dd55227209eea099a30f314a88738f95823221918a5097f4c0e694498e641bce3205c6c6cf5317fe37185de301a2a11bd101b0 SHA512 1334300f1022126138355ce1c4b33f60297765f9dab6888242e78be76b0df9e83560be693eabaaf10f9aea2dfdb90e248b02b0cee89dca495a1e365d9b6e87dc DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 -DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 -DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65 -DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3 -DIST tungstenite-0.17.3.crate 53478 BLAKE2B 1eab7524548a7920e707e1381d9417eb2e0663e2eb31209beecaa0da40693b92bd519204d51b4b9563c10e50b8f79f3e72529526d4041349ef2dce344e27a95e SHA512 07cb5686082f644fc7b859e87cd7aedfe145b794bf948be62cb01295edafd7c3472f56e8dd630ae7a706a1a3f70517b8d88520e931cd6a1fd8d830dd9f69f14f -DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2 -DIST ucd-trie-0.1.5.crate 45391 BLAKE2B 1b5bbeb63ee88f4481168f12e94004a4074c0269ea4a58a406da147834c25c23efff4273bd1945b181950d2119c6d83fb32acf42c658346e85a272bab4dd687b SHA512 67272b54b6f404eaf32d83697b0d4e22205ec8f24df40a0feb005a218ff6f74b001c4cdb1c471582b1f3ae53eee71ff89b3d0b9e06a9133cf3e6c21e144ebec6 -DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188 -DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5 -DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 +DIST tungstenite-0.20.1.crate 60095 BLAKE2B 9a9cc88aefe4f30d4e11673d2e3f757861dc5b082c026a6da54728b4a29dff1e88ca20e2641ef35ba95f01f8525b628b6d6e5410fdbd8d02954d626190e52a40 SHA512 e6a9311e521a7f882497ee7756d39de3ef963937f64ac09c20d28af4c49e9f0d14fe95fee3538c930d18ee1f9ad8e93c6faca1c4ddcbc5f444100dc02261c729 +DIST tungstenite-0.21.0.crate 59858 BLAKE2B 0037dea162a8e6bb3ba0d27edfe4f4063ce6f28505b5cb127374ed4f4c0a2b70c9640cb9dba54a7b9918d1d716f347ad7899d2a9328e3e70b07f8e947d3fec18 SHA512 44a9826d68b61ec4b65bf72a12800674edd1eff8e9fae3fcb272276f6f598edffc7e1b36f2564494520414b3b426a860a32c6543c07d9f1c1404490e1c0e431e +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST ucd-trie-0.1.6.crate 45790 BLAKE2B a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823 SHA512 00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95 +DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c -DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b -DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d +DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 -DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da -DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404 -DIST warp-0.3.3.crate 114769 BLAKE2B 20de998829154056faab680068cdd64c7a198198267132eef87833157f6e09360b33b968638c877eea1a95884a0fdb4d79264074753f0f5b1d1d54c71ba305dd SHA512 bb8919c28bc8a616d7ab58e94b25cac6fbc0f4a26e7c348a58dd511811bbec8502d11c31dd7b650ec37a6b901e5b57ac193755fb5dd54952007e97f952e8a587 +DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255 +DIST warp-0.3.7.crate 117428 BLAKE2B 37b92dbf5fc2099a4e541a3f6fe9bb84795586d8c2ddcbbb7e03a42a9363bbd5296fa524d7bbfcce2883d419d50b8e34975c72d5c9a518075d6dd2df37fbd2a2 SHA512 8dc2dcb5a64555caa5cf74617cc5fc4fe3874d55f4df1b455e6b68c855fe8791f979c622d64b7e357085e322a047cce411c4dc751ecb608c9832abf7550db5a0 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f -DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d -DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44 -DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4 -DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b -DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7 +DIST wasm-bindgen-0.2.90.crate 182529 BLAKE2B 309bf19f4f0551ced885ef7ef80c56bc54431cf06c77e430872fb87e3cfde0c0dc49b018d070b505ea8e488e94a4845ed143430e3c4b70ee48713147b980c6e9 SHA512 c6f73581590a8142b66bdc6373d925f1b1d37d4d09718b49c3454d3d2e16eab3dde97724cbd246420e0c29656bac8ede82eaa0b0e94f22238628dd974223db62 +DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 +DIST wasm-bindgen-backend-0.2.90.crate 28348 BLAKE2B 14193bacce7df590b372bbab1126255cca027fd94c76c17ab13b06e7c18346b5ffff5e2c9d0ff5bdc631846fca70eac9a43e4ffcaf58f0c062ee36fe025abf75 SHA512 7b19cfee23dad5b09b6089d2b56692bc183d477fed5db8a91a6b30c574b3de4b1d45004761248d8c5437ce20a5ff64f7e081fccbd84e8ed72fd154e5a06607da +DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa +DIST wasm-bindgen-macro-0.2.90.crate 13904 BLAKE2B bd5e3521c27f7ec3cee0f2ac4cf894ea5a9b9bde65ec55ae9b29d033b986338af92e2dc9932b87dbf739f4ba48230f17a16226cf1826afe13b102225af29c1c8 SHA512 97dc09c02ea4daa1694f3a118aed3ae958373e179bc7ae4d7bcd14b9958f79c03564d678ec04d7f80b6e6a5529f63f1a853b2905055be8a210d41a12ff279007 +DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 +DIST wasm-bindgen-macro-support-0.2.90.crate 20008 BLAKE2B 46172ab1e6d03faa2a29d8b2d1bb3b37dcb830d73aa96d0922b63627a6eced1d38729ff85bba7eba3e89dfbd04fbb92a4b87cd74a1a906286c61145e3ad38da9 SHA512 9a5782cebb192276a0a05b54f8cadd994cbb97388d72c85f9c60754ade309684883cb2f916badc1360522a6599172eab84aa2bc981889cf2ef2aed8a4e0a3577 +DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 +DIST wasm-bindgen-shared-0.2.90.crate 7264 BLAKE2B 2082267bcfae660b72f6d5996a563d10319a1cd7078b37070f41e96aa56da31ca0a22c168a1e5fe52294f5d7a50c76d06f03d489cfcc0826db29316f2e67ebbc SHA512 f6639c004b17661d0a571181e1447db7eeadbfe93005d6f0e1bab983967591b64cf2ed21e7b77934ad45058adedcae28af1ef141696bd598f9c2d683abf93018 +DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 +DIST winapi-util-0.1.8.crate 12416 BLAKE2B 5b48c27dfbb5db5c332f7e248138327b35ceec0909788b940168e7f6fe1402800da5e7690b2b1654da6c510b5c720330a92da16dff53ef15821f37fef6f335e3 SHA512 e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354 -DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338 -DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0 -DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474 -DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1 -DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae -DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf -DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2 +DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6 DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 diff --git a/app-text/mdbook/mdbook-0.4.27.ebuild b/app-text/mdbook/mdbook-0.4.27.ebuild deleted file mode 100644 index fdf2231ecf93..000000000000 --- a/app-text/mdbook/mdbook-0.4.27.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - aho-corasick-0.7.20 - ammonia-3.3.0 - android_system_properties-0.1.5 - anyhow-1.0.69 - assert_cmd-2.0.8 - autocfg-1.1.0 - base64-0.13.1 - bit-set-0.5.3 - bit-vec-0.6.3 - bitflags-1.3.2 - block-buffer-0.10.3 - bstr-1.0.1 - bumpalo-3.11.1 - byteorder-1.4.3 - bytes-1.3.0 - cc-1.0.77 - cfg-if-1.0.0 - chrono-0.4.23 - clap-4.0.29 - clap_complete-4.0.6 - clap_lex-0.3.0 - codespan-reporting-0.11.1 - core-foundation-sys-0.8.3 - cpufeatures-0.2.5 - crossbeam-channel-0.5.6 - crossbeam-utils-0.8.14 - crypto-common-0.1.6 - ctor-0.1.26 - cxx-1.0.83 - cxx-build-1.0.83 - cxxbridge-flags-1.0.83 - cxxbridge-macro-1.0.83 - diff-0.1.13 - difflib-0.4.0 - digest-0.10.6 - doc-comment-0.3.3 - either-1.8.0 - elasticlunr-rs-3.0.1 - env_logger-0.10.0 - errno-0.2.8 - errno-dragonfly-0.1.2 - fastrand-1.8.0 - filetime-0.2.19 - float-cmp-0.9.0 - fnv-1.0.7 - form_urlencoded-1.1.0 - fsevent-sys-4.1.0 - futf-0.1.5 - futures-channel-0.3.25 - futures-core-0.3.25 - futures-macro-0.3.25 - futures-sink-0.3.25 - futures-task-0.3.25 - futures-util-0.3.25 - generic-array-0.14.6 - getrandom-0.2.8 - gitignore-1.0.7 - glob-0.3.0 - h2-0.3.15 - handlebars-4.3.6 - hashbrown-0.12.3 - headers-0.3.8 - headers-core-0.2.0 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - html5ever-0.26.0 - http-0.2.8 - http-body-0.4.5 - httparse-1.8.0 - httpdate-1.0.2 - humantime-2.1.0 - hyper-0.14.23 - iana-time-zone-0.1.53 - iana-time-zone-haiku-0.1.1 - idna-0.3.0 - indexmap-1.9.2 - inotify-0.9.6 - inotify-sys-0.1.5 - instant-0.1.12 - io-lifetimes-1.0.3 - is-terminal-0.4.1 - itertools-0.10.5 - itoa-1.0.4 - js-sys-0.3.60 - kqueue-1.0.7 - kqueue-sys-1.0.3 - libc-0.2.138 - link-cplusplus-1.0.7 - linux-raw-sys-0.1.4 - lock_api-0.4.9 - log-0.4.17 - mac-0.1.1 - maplit-1.0.2 - markup5ever-0.11.0 - markup5ever_rcdom-0.2.0 - memchr-2.5.0 - mime-0.3.16 - mime_guess-2.0.4 - mio-0.8.5 - new_debug_unreachable-1.0.4 - normalize-line-endings-0.3.0 - notify-5.1.0 - notify-debouncer-mini-0.2.1 - num-integer-0.1.45 - num-traits-0.2.15 - num_cpus-1.14.0 - once_cell-1.17.0 - opener-0.5.2 - os_str_bytes-6.4.1 - output_vt100-0.1.3 - parking_lot-0.12.1 - parking_lot_core-0.9.5 - percent-encoding-2.2.0 - pest-2.5.1 - pest_derive-2.5.1 - pest_generator-2.5.1 - pest_meta-2.5.1 - phf-0.10.1 - phf_codegen-0.10.0 - phf_generator-0.10.0 - phf_shared-0.10.0 - pin-project-1.0.12 - pin-project-internal-1.0.12 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - ppv-lite86-0.2.17 - precomputed-hash-0.1.1 - predicates-2.1.5 - predicates-core-1.0.5 - predicates-tree-1.0.7 - pretty_assertions-1.3.0 - proc-macro2-1.0.47 - pulldown-cmark-0.9.2 - quote-1.0.21 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.2.16 - regex-1.7.1 - regex-automata-0.1.10 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - rustix-0.36.5 - rustls-pemfile-0.2.1 - ryu-1.0.11 - same-file-1.0.6 - scoped-tls-1.0.1 - scopeguard-1.1.0 - scratch-1.0.2 - select-0.6.0 - semver-1.0.16 - serde-1.0.152 - serde_derive-1.0.152 - serde_json-1.0.93 - serde_urlencoded-0.7.1 - sha-1-0.10.1 - sha1-0.10.5 - shlex-1.1.0 - siphasher-0.3.10 - slab-0.4.7 - smallvec-1.10.0 - socket2-0.4.7 - string_cache-0.8.4 - string_cache_codegen-0.5.2 - strsim-0.10.0 - syn-1.0.105 - tempfile-3.3.0 - tendril-0.4.3 - termcolor-1.1.3 - terminal_size-0.2.3 - termtree-0.4.0 - thiserror-1.0.37 - thiserror-impl-1.0.37 - tinyvec-1.6.0 - tinyvec_macros-0.1.0 - tokio-1.25.0 - tokio-macros-1.8.2 - tokio-stream-0.1.11 - tokio-tungstenite-0.17.2 - tokio-util-0.7.4 - toml-0.5.10 - topological-sort-0.2.2 - tower-service-0.3.2 - tracing-0.1.37 - tracing-core-0.1.30 - try-lock-0.2.3 - tungstenite-0.17.3 - typenum-1.16.0 - ucd-trie-0.1.5 - unicase-2.6.0 - unicode-bidi-0.3.8 - unicode-ident-1.0.5 - unicode-normalization-0.1.22 - unicode-width-0.1.10 - url-2.3.1 - utf-8-0.7.6 - version_check-0.9.4 - wait-timeout-0.2.0 - walkdir-2.3.2 - want-0.3.0 - warp-0.3.3 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.83 - wasm-bindgen-backend-0.2.83 - wasm-bindgen-macro-0.2.83 - wasm-bindgen-macro-support-0.2.83 - wasm-bindgen-shared-0.2.83 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows_aarch64_gnullvm-0.42.0 - windows_aarch64_msvc-0.42.0 - windows_i686_gnu-0.42.0 - windows_i686_msvc-0.42.0 - windows_x86_64_gnu-0.42.0 - windows_x86_64_gnullvm-0.42.0 - windows_x86_64_msvc-0.42.0 - xml5ever-0.17.0 - yansi-0.5.1" -inherit cargo toolchain-funcs - -DESCRIPTION="Create a book from markdown files" -HOMEPAGE="https://rust-lang.github.io/mdBook/" -SRC_URI=" - https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris)" -S="${WORKDIR}/${P/b/B}" - -# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable -LICENSE="Apache-2.0 Artistic-2 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc" - -QA_FLAGS_IGNORED="usr/bin/${PN}" - -src_compile() { - cargo_src_compile - - if use doc; then - if tc-is-cross-compiler; then - ewarn "html docs were skipped due to cross-compilation" - else - target/$(usex debug{,} release)/${PN} build -d html guide || die - fi - fi -} - -src_install() { - cargo_src_install - - dodoc CHANGELOG.md README.md - use doc && ! tc-is-cross-compiler && dodoc -r guide/html -} diff --git a/app-text/mdbook/mdbook-0.4.28.ebuild b/app-text/mdbook/mdbook-0.4.28.ebuild deleted file mode 100644 index 8ccef7d9ff34..000000000000 --- a/app-text/mdbook/mdbook-0.4.28.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - aho-corasick-0.7.20 - ammonia-3.3.0 - android_system_properties-0.1.5 - anyhow-1.0.69 - assert_cmd-2.0.8 - autocfg-1.1.0 - base64-0.13.1 - bit-set-0.5.3 - bit-vec-0.6.3 - bitflags-1.3.2 - block-buffer-0.10.3 - bstr-1.0.1 - bumpalo-3.11.1 - byteorder-1.4.3 - bytes-1.3.0 - cc-1.0.77 - cfg-if-1.0.0 - chrono-0.4.23 - clap-4.0.29 - clap_complete-4.0.6 - clap_lex-0.3.0 - codespan-reporting-0.11.1 - core-foundation-sys-0.8.3 - cpufeatures-0.2.5 - crossbeam-channel-0.5.6 - crossbeam-utils-0.8.14 - crypto-common-0.1.6 - ctor-0.1.26 - cxx-1.0.83 - cxx-build-1.0.83 - cxxbridge-flags-1.0.83 - cxxbridge-macro-1.0.83 - diff-0.1.13 - difflib-0.4.0 - digest-0.10.6 - doc-comment-0.3.3 - either-1.8.0 - elasticlunr-rs-3.0.1 - env_logger-0.10.0 - errno-0.2.8 - errno-dragonfly-0.1.2 - fastrand-1.8.0 - filetime-0.2.19 - float-cmp-0.9.0 - fnv-1.0.7 - form_urlencoded-1.1.0 - fsevent-sys-4.1.0 - futf-0.1.5 - futures-channel-0.3.25 - futures-core-0.3.25 - futures-macro-0.3.25 - futures-sink-0.3.25 - futures-task-0.3.25 - futures-util-0.3.25 - generic-array-0.14.6 - getrandom-0.2.8 - gitignore-1.0.7 - glob-0.3.0 - h2-0.3.15 - handlebars-4.3.6 - hashbrown-0.12.3 - headers-0.3.8 - headers-core-0.2.0 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - html5ever-0.26.0 - http-0.2.8 - http-body-0.4.5 - httparse-1.8.0 - httpdate-1.0.2 - humantime-2.1.0 - hyper-0.14.23 - iana-time-zone-0.1.53 - iana-time-zone-haiku-0.1.1 - idna-0.3.0 - indexmap-1.9.2 - inotify-0.9.6 - inotify-sys-0.1.5 - instant-0.1.12 - io-lifetimes-1.0.3 - is-terminal-0.4.1 - itertools-0.10.5 - itoa-1.0.4 - js-sys-0.3.60 - kqueue-1.0.7 - kqueue-sys-1.0.3 - libc-0.2.138 - link-cplusplus-1.0.7 - linux-raw-sys-0.1.4 - lock_api-0.4.9 - log-0.4.17 - mac-0.1.1 - maplit-1.0.2 - markup5ever-0.11.0 - markup5ever_rcdom-0.2.0 - memchr-2.5.0 - mime-0.3.16 - mime_guess-2.0.4 - mio-0.8.5 - new_debug_unreachable-1.0.4 - normalize-line-endings-0.3.0 - notify-5.1.0 - notify-debouncer-mini-0.2.1 - num-integer-0.1.45 - num-traits-0.2.15 - num_cpus-1.14.0 - once_cell-1.17.0 - opener-0.5.2 - os_str_bytes-6.4.1 - output_vt100-0.1.3 - parking_lot-0.12.1 - parking_lot_core-0.9.5 - percent-encoding-2.2.0 - pest-2.5.1 - pest_derive-2.5.1 - pest_generator-2.5.1 - pest_meta-2.5.1 - phf-0.10.1 - phf_codegen-0.10.0 - phf_generator-0.10.0 - phf_shared-0.10.0 - pin-project-1.0.12 - pin-project-internal-1.0.12 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - ppv-lite86-0.2.17 - precomputed-hash-0.1.1 - predicates-2.1.5 - predicates-core-1.0.5 - predicates-tree-1.0.7 - pretty_assertions-1.3.0 - proc-macro2-1.0.47 - pulldown-cmark-0.9.2 - quote-1.0.21 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - redox_syscall-0.2.16 - regex-1.7.1 - regex-automata-0.1.10 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - rustix-0.36.5 - rustls-pemfile-0.2.1 - ryu-1.0.11 - same-file-1.0.6 - scoped-tls-1.0.1 - scopeguard-1.1.0 - scratch-1.0.2 - select-0.6.0 - semver-1.0.16 - serde-1.0.152 - serde_derive-1.0.152 - serde_json-1.0.93 - serde_urlencoded-0.7.1 - sha-1-0.10.1 - sha1-0.10.5 - shlex-1.1.0 - siphasher-0.3.10 - slab-0.4.7 - smallvec-1.10.0 - socket2-0.4.7 - string_cache-0.8.4 - string_cache_codegen-0.5.2 - strsim-0.10.0 - syn-1.0.105 - tempfile-3.3.0 - tendril-0.4.3 - termcolor-1.1.3 - terminal_size-0.2.3 - termtree-0.4.0 - thiserror-1.0.37 - thiserror-impl-1.0.37 - tinyvec-1.6.0 - tinyvec_macros-0.1.0 - tokio-1.25.0 - tokio-macros-1.8.2 - tokio-stream-0.1.11 - tokio-tungstenite-0.17.2 - tokio-util-0.7.4 - toml-0.5.10 - topological-sort-0.2.2 - tower-service-0.3.2 - tracing-0.1.37 - tracing-core-0.1.30 - try-lock-0.2.3 - tungstenite-0.17.3 - typenum-1.16.0 - ucd-trie-0.1.5 - unicase-2.6.0 - unicode-bidi-0.3.8 - unicode-ident-1.0.5 - unicode-normalization-0.1.22 - unicode-width-0.1.10 - url-2.3.1 - utf-8-0.7.6 - version_check-0.9.4 - wait-timeout-0.2.0 - walkdir-2.3.2 - want-0.3.0 - warp-0.3.3 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.83 - wasm-bindgen-backend-0.2.83 - wasm-bindgen-macro-0.2.83 - wasm-bindgen-macro-support-0.2.83 - wasm-bindgen-shared-0.2.83 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows_aarch64_gnullvm-0.42.0 - windows_aarch64_msvc-0.42.0 - windows_i686_gnu-0.42.0 - windows_i686_msvc-0.42.0 - windows_x86_64_gnu-0.42.0 - windows_x86_64_gnullvm-0.42.0 - windows_x86_64_msvc-0.42.0 - xml5ever-0.17.0 - yansi-0.5.1" -inherit cargo toolchain-funcs - -DESCRIPTION="Create a book from markdown files" -HOMEPAGE="https://rust-lang.github.io/mdBook/" -SRC_URI=" - https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris)" -S="${WORKDIR}/${P/b/B}" - -# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable -LICENSE="Apache-2.0 Artistic-2 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc" - -QA_FLAGS_IGNORED="usr/bin/${PN}" - -src_compile() { - cargo_src_compile - - if use doc; then - if tc-is-cross-compiler; then - ewarn "html docs were skipped due to cross-compilation" - else - target/$(usex debug{,} release)/${PN} build -d html guide || die - fi - fi -} - -src_install() { - cargo_src_install - - dodoc CHANGELOG.md README.md - use doc && ! tc-is-cross-compiler && dodoc -r guide/html -} diff --git a/app-text/mdbook/mdbook-0.4.37.ebuild b/app-text/mdbook/mdbook-0.4.37.ebuild new file mode 100644 index 000000000000..2b512da75f1f --- /dev/null +++ b/app-text/mdbook/mdbook-0.4.37.ebuild @@ -0,0 +1,282 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.1.2 + ammonia@3.3.0 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.11 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + anstyle@1.0.6 + anyhow@1.0.79 + assert_cmd@2.0.13 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.4.2 + bit-set@0.5.3 + bit-vec@0.6.3 + block-buffer@0.10.4 + bstr@1.9.0 + bumpalo@3.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.33 + clap@4.4.18 + clap_builder@4.4.18 + clap_complete@4.4.10 + clap_lex@0.6.0 + colorchoice@1.0.0 + core-foundation-sys@0.8.6 + cpufeatures@0.2.12 + crossbeam-channel@0.5.11 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.19 + crypto-common@0.1.6 + data-encoding@2.5.0 + difflib@0.4.0 + diff@0.1.13 + digest@0.10.7 + doc-comment@0.3.3 + elasticlunr-rs@3.0.2 + env_filter@0.1.0 + env_logger@0.11.1 + equivalent@1.0.1 + errno@0.3.8 + fastrand@2.0.1 + filetime@0.2.23 + float-cmp@0.9.0 + fnv@1.0.7 + form_urlencoded@1.2.1 + fsevent-sys@4.1.0 + futf@0.1.5 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-macro@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.12 + gimli@0.28.1 + globset@0.4.14 + h2@0.3.24 + handlebars@5.1.0 + hashbrown@0.14.3 + headers-core@0.2.0 + headers@0.3.9 + hermit-abi@0.3.5 + html5ever@0.26.0 + httparse@1.8.0 + httpdate@1.0.3 + http-body@0.4.6 + http@0.2.11 + humantime@2.1.0 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + idna@0.5.0 + ignore@0.4.22 + indexmap@2.2.2 + inotify-sys@0.1.5 + inotify@0.9.6 + itoa@1.0.10 + js-sys@0.3.67 + kqueue-sys@1.0.4 + kqueue@1.0.8 + libc@0.2.153 + linux-raw-sys@0.4.13 + lock_api@0.4.11 + log@0.4.20 + mac@0.1.1 + maplit@1.0.2 + markup5ever@0.11.0 + markup5ever_rcdom@0.2.0 + memchr@2.7.1 + mime@0.3.17 + mime_guess@2.0.4 + miniz_oxide@0.7.2 + mio@0.8.10 + new_debug_unreachable@1.0.4 + normalize-line-endings@0.3.0 + normpath@1.1.1 + notify-debouncer-mini@0.4.1 + notify@6.1.1 + num-traits@0.2.17 + num_cpus@1.16.0 + object@0.32.2 + once_cell@1.19.0 + opener@0.6.1 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + pathdiff@0.2.1 + percent-encoding@2.3.1 + pest@2.7.7 + pest_derive@2.7.7 + pest_generator@2.7.7 + pest_meta@2.7.7 + phf@0.10.1 + phf_codegen@0.10.0 + phf_generator@0.10.0 + phf_shared@0.10.0 + pin-project-internal@1.1.4 + pin-project-lite@0.2.13 + pin-project@1.1.4 + pin-utils@0.1.0 + ppv-lite86@0.2.17 + precomputed-hash@0.1.1 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + pretty_assertions@1.4.0 + proc-macro2@1.0.78 + pulldown-cmark-escape@0.10.0 + pulldown-cmark@0.10.0 + quote@1.0.35 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + regex-automata@0.4.5 + regex-syntax@0.8.2 + regex@1.10.3 + rustc-demangle@0.1.23 + rustix@0.38.31 + rustls-pemfile@1.0.4 + ryu@1.0.16 + same-file@1.0.6 + scoped-tls@1.0.1 + scopeguard@1.2.0 + select@0.6.0 + semver@1.0.21 + serde@1.0.196 + serde_derive@1.0.196 + serde_json@1.0.113 + serde_urlencoded@0.7.1 + sha1@0.10.6 + sha2@0.10.8 + shlex@1.3.0 + siphasher@0.3.11 + slab@0.4.9 + smallvec@1.13.1 + socket2@0.5.5 + string_cache@0.8.7 + string_cache_codegen@0.5.2 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.48 + tempfile@3.10.0 + tendril@0.4.3 + terminal_size@0.3.0 + termtree@0.4.1 + thiserror-impl@1.0.56 + thiserror@1.0.56 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.2.0 + tokio-stream@0.1.14 + tokio-tungstenite@0.20.1 + tokio-util@0.7.10 + tokio@1.36.0 + toml@0.5.11 + topological-sort@0.2.2 + tower-service@0.3.2 + tracing-core@0.1.32 + tracing@0.1.40 + try-lock@0.2.5 + tungstenite@0.20.1 + typenum@1.17.0 + ucd-trie@0.1.6 + unicase@2.7.0 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + url@2.5.0 + utf8parse@0.2.1 + utf-8@0.7.6 + version_check@0.9.4 + wait-timeout@0.2.0 + walkdir@2.4.0 + want@0.3.1 + warp@0.3.6 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.90 + wasm-bindgen-macro-support@0.2.90 + wasm-bindgen-macro@0.2.90 + wasm-bindgen-shared@0.2.90 + wasm-bindgen@0.2.90 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + xml5ever@0.17.0 + yansi@0.5.1 +" +inherit cargo toolchain-funcs + +DESCRIPTION="Create a book from markdown files" +HOMEPAGE="https://rust-lang.github.io/mdBook/" +SRC_URI=" + https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" +S="${WORKDIR}/${P/b/B}" + +# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable +LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1" +LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="doc" + +QA_FLAGS_IGNORED="usr/bin/${PN}" + +src_compile() { + cargo_src_compile + + if use doc; then + if tc-is-cross-compiler; then + ewarn "html docs were skipped due to cross-compilation" + else + target/$(usex debug{,} release)/${PN} build -d html guide || die + fi + fi +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md + use doc && ! tc-is-cross-compiler && dodoc -r guide/html +} diff --git a/app-text/mdbook/mdbook-0.4.40.ebuild b/app-text/mdbook/mdbook-0.4.40.ebuild new file mode 100644 index 000000000000..f99309e84528 --- /dev/null +++ b/app-text/mdbook/mdbook-0.4.40.ebuild @@ -0,0 +1,302 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.1.3 + ammonia@4.0.0 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.14 + anstyle-parse@0.2.4 + anstyle-query@1.0.3 + anstyle-wincon@3.0.3 + anstyle@1.0.7 + anyhow@1.0.83 + assert_cmd@2.0.14 + autocfg@1.3.0 + backtrace@0.3.71 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.5.0 + bit-set@0.5.3 + bit-vec@0.6.3 + block-buffer@0.10.4 + bstr@1.9.1 + bumpalo@3.16.0 + byteorder@1.5.0 + bytes@1.6.0 + cc@1.0.97 + cfg-if@1.0.0 + chrono@0.4.38 + clap@4.5.4 + clap_builder@4.5.2 + clap_complete@4.5.2 + clap_lex@0.7.0 + colorchoice@1.0.1 + core-foundation-sys@0.8.6 + cpufeatures@0.2.12 + crossbeam-channel@0.5.12 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.19 + crypto-common@0.1.6 + data-encoding@2.6.0 + dbus@0.9.7 + difflib@0.4.0 + diff@0.1.13 + digest@0.10.7 + doc-comment@0.3.3 + elasticlunr-rs@3.0.2 + env_filter@0.1.0 + env_logger@0.11.3 + equivalent@1.0.1 + errno@0.3.9 + fastrand@2.1.0 + filetime@0.2.23 + float-cmp@0.9.0 + fnv@1.0.7 + form_urlencoded@1.2.1 + fsevent-sys@4.1.0 + futf@0.1.5 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-macro@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.15 + gimli@0.28.1 + globset@0.4.14 + h2@0.3.26 + handlebars@5.1.2 + hashbrown@0.14.5 + headers-core@0.2.0 + headers@0.3.9 + hermit-abi@0.3.9 + html5ever@0.26.0 + html5ever@0.27.0 + httparse@1.8.0 + httpdate@1.0.3 + http-body@0.4.6 + http@0.2.12 + http@1.1.0 + humantime@2.1.0 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + idna@0.5.0 + ignore@0.4.22 + indexmap@2.2.6 + inotify-sys@0.1.5 + inotify@0.9.6 + is_terminal_polyfill@1.70.0 + itoa@1.0.11 + js-sys@0.3.69 + kqueue-sys@1.0.4 + kqueue@1.0.8 + libc@0.2.154 + libdbus-sys@0.2.5 + linux-raw-sys@0.4.13 + lock_api@0.4.12 + log@0.4.21 + mac@0.1.1 + maplit@1.0.2 + markup5ever@0.11.0 + markup5ever@0.12.1 + markup5ever_rcdom@0.2.0 + memchr@2.7.2 + mime@0.3.17 + mime_guess@2.0.4 + miniz_oxide@0.7.2 + mio@0.8.11 + new_debug_unreachable@1.0.6 + normalize-line-endings@0.3.0 + normpath@1.2.0 + notify-debouncer-mini@0.4.1 + notify@6.1.1 + num-traits@0.2.19 + num_cpus@1.16.0 + object@0.32.2 + once_cell@1.19.0 + opener@0.7.0 + parking_lot@0.12.2 + parking_lot_core@0.9.10 + pathdiff@0.2.1 + percent-encoding@2.3.1 + pest@2.7.10 + pest_derive@2.7.10 + pest_generator@2.7.10 + pest_meta@2.7.10 + phf@0.10.1 + phf@0.11.2 + phf_codegen@0.10.0 + phf_codegen@0.11.2 + phf_generator@0.10.0 + phf_generator@0.11.2 + phf_shared@0.10.0 + phf_shared@0.11.2 + pin-project-internal@1.1.5 + pin-project-lite@0.2.14 + pin-project@1.1.5 + pin-utils@0.1.0 + pkg-config@0.3.30 + ppv-lite86@0.2.17 + precomputed-hash@0.1.1 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + pretty_assertions@1.4.0 + proc-macro2@1.0.82 + pulldown-cmark-escape@0.10.1 + pulldown-cmark@0.10.3 + quote@1.0.36 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.4.1 + redox_syscall@0.5.1 + regex-automata@0.4.6 + regex-syntax@0.8.3 + regex@1.10.4 + rustc-demangle@0.1.24 + rustix@0.38.34 + ryu@1.0.18 + same-file@1.0.6 + scoped-tls@1.0.1 + scopeguard@1.2.0 + select@0.6.0 + semver@1.0.23 + serde@1.0.201 + serde_derive@1.0.201 + serde_json@1.0.117 + serde_urlencoded@0.7.1 + sha1@0.10.6 + sha2@0.10.8 + shlex@1.3.0 + siphasher@0.3.11 + slab@0.4.9 + smallvec@1.13.2 + socket2@0.5.7 + string_cache@0.8.7 + string_cache_codegen@0.5.2 + strsim@0.11.1 + syn@1.0.109 + syn@2.0.63 + tempfile@3.10.1 + tendril@0.4.3 + terminal_size@0.3.0 + termtree@0.4.1 + thiserror-impl@1.0.60 + thiserror@1.0.60 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.2.0 + tokio-tungstenite@0.21.0 + tokio-util@0.7.11 + tokio@1.37.0 + toml@0.5.11 + topological-sort@0.2.2 + tower-service@0.3.2 + tracing-core@0.1.32 + tracing@0.1.40 + try-lock@0.2.5 + tungstenite@0.21.0 + typenum@1.17.0 + ucd-trie@0.1.6 + unicase@2.7.0 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.23 + url@2.5.0 + utf8parse@0.2.1 + utf-8@0.7.6 + version_check@0.9.4 + wait-timeout@0.2.0 + walkdir@2.5.0 + want@0.3.1 + warp@0.3.7 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.92 + wasm-bindgen-macro-support@0.2.92 + wasm-bindgen-macro@0.2.92 + wasm-bindgen-shared@0.2.92 + wasm-bindgen@0.2.92 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.8 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.5 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.5 + windows_i686_gnullvm@0.52.5 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.5 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.5 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.5 + xml5ever@0.17.0 + yansi@0.5.1 +" +inherit cargo toolchain-funcs + +DESCRIPTION="Create a book from markdown files" +HOMEPAGE="https://rust-lang.github.io/mdBook/" +SRC_URI=" + https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" +S="${WORKDIR}/${P/b/B}" + +# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable +LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1" +LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc" + +QA_FLAGS_IGNORED="usr/bin/${PN}" + +src_compile() { + cargo_src_compile + + if use doc; then + if tc-is-cross-compiler; then + ewarn "html docs were skipped due to cross-compilation" + else + target/$(usex debug{,} release)/${PN} build -d html guide || die + fi + fi +} + +src_test() { + local skip=( + # fails with usersandbox + --skip test_ignore_canonical + ) + + cargo_src_test -- "${skip[@]}" +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md + use doc && ! tc-is-cross-compiler && dodoc -r guide/html +} diff --git a/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch new file mode 100644 index 000000000000..a5cc60335209 --- /dev/null +++ b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch @@ -0,0 +1,33 @@ +From 8ddfa1e8c274759f287c9ee73d4d1625028c3bb8 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 29 Feb 2024 16:44:27 -0500 +Subject: [PATCH] configure: remove terrible horrible code that resets CFLAGS + to "-O3" + +... and totally ignores all user defined flags. +--- + configure.in | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.in b/configure.in +index a5e2a5e..4ac75c1 100644 +--- a/configure.in ++++ b/configure.in +@@ -85,14 +85,6 @@ else + fi + fi + +-dnl +-dnl check gcc +-dnl +-if test -n "$GCC"; then +- CFLAGS="-O3 -Wall " +- CXXFLAGS="-O3 -Wall " +-fi +- + dnl + dnl check Char Code + dnl +-- +2.43.0 + diff --git a/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch new file mode 100644 index 000000000000..5776cf5b2aa5 --- /dev/null +++ b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch @@ -0,0 +1,16 @@ +Dropping usage of binary_function +--- a/src/dictionary.cpp ++++ b/src/dictionary.cpp +@@ -65,7 +65,11 @@ int progress_bar_darts(size_t current, size_t total) { + } + + template <typename T1, typename T2> +-struct pair_1st_cmp: public std::binary_function<bool, T1, T2> { ++struct pair_1st_cmp { ++ public: ++ using first_argument_type = bool; ++ using second_argument_type = T1; ++ using result_type = T2; + bool operator()(const std::pair<T1, T2> &x1, + const std::pair<T1, T2> &x2) { + return x1.first < x2.first; diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild index 9eb02cee3b92..13064cdcfed4 100644 --- a/app-text/mecab/mecab-0.996-r1.ebuild +++ b/app-text/mecab/mecab-0.996-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer" HOMEPAGE="https://taku910.github.io/mecab/" @@ -30,16 +30,13 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.98-iconv.patch "${FILESDIR}"/${PN}-0.996-clang-16-register.patch + "${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch ) HTML_DOCS=( doc/. ) src_prepare() { default - sed -i \ - -e "/CFLAGS/s/-O3/${CFLAGS}/" \ - -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \ - configure.in sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in mv configure.{in,ac} || die @@ -47,6 +44,11 @@ src_prepare() { } src_configure() { + # -Werror=odr -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924569 + # https://github.com/taku910/mecab/issues/75 + filter-lto + econf \ $(use_enable static-libs static) \ $(use_with unicode charset UTF-8) diff --git a/app-text/mecab/mecab-0.996-r2.ebuild b/app-text/mecab/mecab-0.996-r2.ebuild new file mode 100644 index 000000000000..7ab1b014a7dd --- /dev/null +++ b/app-text/mecab/mecab-0.996-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer" +HOMEPAGE="https://taku910.github.io/mecab/" +SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" + +LICENSE="|| ( BSD LGPL-2.1 GPL-2 )" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="static-libs unicode" + +BDEPEND=" + dev-lang/perl + sys-devel/gettext +" +DEPEND="virtual/libiconv" +RDEPEND="${DEPEND}" +PDEPEND=" + || ( + app-dicts/mecab-ipadic[unicode=] + app-dicts/mecab-naist-jdic[unicode=] + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.98-iconv.patch + "${FILESDIR}"/${PN}-0.996-clang-16-register.patch + "${FILESDIR}"/${PN}-0.996-clang-16-binary_function.patch + "${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch +) + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + # -Werror=odr -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924569 + # https://github.com/taku910/mecab/issues/75 + filter-lto + + econf \ + $(use_enable static-libs static) \ + $(use_with unicode charset UTF-8) +} + +src_install() { + default + find "${ED}" -name 'Makefile*' -delete || die + use static-libs || find "${ED}" -name '*.la' -delete || die +} diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index d4f71baea304..a4fca6b2b477 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1,2 +1,3 @@ DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae +DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436 SHA512 6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5 diff --git a/app-text/multitail/multitail-7.1.2.ebuild b/app-text/multitail/multitail-7.1.2.ebuild new file mode 100644 index 000000000000..49dfd6455460 --- /dev/null +++ b/app-text/multitail/multitail-7.1.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake optfeature + +DESCRIPTION="Tail with multiple windows" +HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/" +SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug examples unicode" + +RDEPEND="sys-libs/ncurses:=[unicode(+)?]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-7.0.0-gentoo.patch +) + +src_prepare() { + cmake_src_prepare + # cmake looks for licence.txt to install it, which does not exist in the package + cp LICENSE license.txt || die +} + +src_configure() { + local mycmakeargs=( + -DUTF8_SUPPORT=$(usex unicode) + ) + CMAKE_BUILD_TYPE=$(usex debug Debug) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc + doins multitail.conf + + rm -rf "${ED}"/usr/{ect,etc} || die + rm -rf "${ED}"/usr/share/doc/multitail-VERSION=${PV} || die + + local DOCS=( readme.txt thanks.txt ) + local HTML_DOCS=( manual.html ) + einstalldocs + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples + dodoc conversion-scripts/{colors-example.{pl,sh},convert-{geoip,simple}.pl} + fi +} + +pkg_postinst() { + optfeature "send a buffer to the X clipboard" x11-misc/xclip +} diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 1c6a62b465b4..2d8887e05469 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1,5 +1,2 @@ -DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7 -DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4 -DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee -DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64 -DIST mupdf-1.21.1-source.tar.gz 57243762 BLAKE2B 9ec79e380af40020d37e4a2a6372175f19b63a47e9f6f55cff777a827f0fba89507d19d4f86394e13209ca8eb9d812c2fc4664f44ed012c91727c9c442bce97c SHA512 11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7 +DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 +DIST mupdf-1.24.1-source.tar.gz 55310618 BLAKE2B 33396b0cca6e2beb1b2bc70c606917c8d9b30b6a277645849ef7ba1e7efbf909c21196acdd5d94d964dd20d3ba746c45cab3c899dfbee1b2138de12e32375a4e SHA512 9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch deleted file mode 100644 index decab5015bf5..000000000000 --- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch +++ /dev/null @@ -1,533 +0,0 @@ ---- /dev/null -+++ ./platform/debian/mupdf.desktop -@@ -0,0 +1,15 @@ -+[Desktop Entry] -+Name=MuPDF -+GenericName=PDF file viewer -+Exec=mupdf %f -+TryExec=mupdf -+Icon=mupdf -+Terminal=false -+Type=Application -+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff; -+Categories=Viewer;Graphics; -+Actions=View; -+ -+[Desktop Action View] -+Name=View with mupdf -+Exec=mupdf %f ---- /dev/null -+++ ./platform/debian/mupdf.pc -@@ -0,0 +1,12 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: mupdf -+Description: Library for rendering PDF documents -+Requires: freetype2 libopenjp2 libcrypto -+Version: 0.5.0 -+Libs: -L${libdir} -lmupdf -+Libs.private: -lmupdf-js-none -+Cflags: -I${includedir} ---- /dev/null -+++ ./platform/debian/mupdf.xpm -@@ -0,0 +1,497 @@ -+/* XPM */ -+static char *mupdf[] = { -+/* width height ncolors chars_per_pixel */ -+"48 48 442 2", -+/* colors */ -+" c #000000", -+" . c #2E4558", -+" X c #252121", -+" o c #AFAFAF", -+" O c #28313B", -+" + c #231F1F", -+" @ c #686666", -+" # c #98BDD7", -+" $ c #201B1C", -+" % c #7CABCC", -+" & c #4487B6", -+" * c #DFDEDE", -+" = c #4285B4", -+" - c #615E5F", -+" ; c #605E5E", -+" : c #23262C", -+" > c #D9D8D8", -+" , c #F7FAFC", -+" < c #D7D6D6", -+" 1 c #BFD6E6", -+" 2 c #6BA0C5", -+" 3 c #232122", -+" 4 c #555253", -+" 5 c #CDCCCC", -+" 6 c #E7EFF6", -+" 7 c #4786B2", -+" 8 c #CADDEA", -+" 9 c #4085B5", -+" 0 c #AECBDF", -+" q c #CBCACA", -+" w c #92B9D4", -+" e c #365F7D", -+" r c #5A95BE", -+" t c #3E83B3", -+" y c #304B60", -+" u c #C7C6C6", -+" i c #4D8EBB", -+" p c #F1F6F9", -+" a c #C1C0C0", -+" s c #454243", -+" d c #669CC3", -+" f c #81AECD", -+" g c #7A7777", -+" h c #434041", -+" j c #3E779F", -+" k c #272E36", -+" l c #413E3F", -+" z c #3F3C3D", -+" x c #5895BF", -+" c c #3D3A3B", -+" v c #C6DBE9", -+" b c #B8B6B7", -+" n c #4282B0", -+" m c #FDFDFE", -+" M c #B7B6B6", -+" N c #8DB5D2", -+" B c #242529", -+" V c #B3B2B2", -+" C c #222327", -+" Z c #B0AEAF", -+" A c #EDF4F8", -+" S c #686565", -+" D c #488AB9", -+" F c #9ABED8", -+" G c #7EACCD", -+" H c #ECF2F7", -+" J c #211C1C", -+" K c #666363", -+" L c #F1F1F2", -+" P c #ABAAAA", -+" I c #4588B6", -+" U c #A9A8A8", -+" Y c #2D2A2B", -+" T c #A7A6A6", -+" R c #615D5E", -+" E c #2B2829", -+" W c #8DB7D5", -+" Q c #F9FBFD", -+" ! c #DDE9F2", -+" ~ c #F8FBFC", -+" ^ c #DCE9F1", -+" / c #A5C5DC", -+" ( c #89B3D1", -+" ) c #5C5959", -+" _ c #A4C5DB", -+" ` c #335A76", -+" ' c #518FBB", -+" ] c #E6E7E7", -+" [ c #5A5757", -+" { c #232021", -+" } c #33536C", -+" | c #98BED9", -+". c #E0E1E1", -+".. c #7CACCE", -+".X c #4488B8", -+".o c #2D3F4F", -+".O c #999898", -+".+ c #4388B7", -+".@ c #5E98C1", -+".# c #CDCDCB", -+".$ c #524F4F", -+".% c #B0CCE0", -+".& c #979696", -+".* c #78A8CA", -+".= c #5C96BF", -+".- c #969495", -+".; c #4084B4", -+".: c #252930", -+".> c #949293", -+"., c #929091", -+".< c #417FAB", -+".1 c #4F8FBC", -+".2 c #F3F7FA", -+".3 c #D3D3D4", -+".4 c #D7E5EF", -+".5 c #222023", -+".6 c #9FC1D9", -+".7 c #679DC3", -+".8 c #37678A", -+".9 c #4B8BB8", -+".0 c #3E769E", -+".q c #3C749C", -+".w c #403D3D", -+".e c #92BAD6", -+".r c #C8DCEA", -+".t c #FEFEFE", -+".y c #3D393A", -+".u c #3B3738", -+".i c #355974", -+".p c #353132", -+".a c #7A7879", -+".s c #498BB9", -+".d c #9BBFD8", -+".f c #4E8AB4", -+".g c #787677", -+".h c #F2F2F2", -+".j c #F0F0F0", -+".k c #2F2B2C", -+".l c #EEEEEE", -+".z c #727071", -+".x c #26282D", -+".c c #ECECEC", -+".v c #2B2728", -+".b c #FAFCFD", -+".n c #EAEAEA", -+".m c #DEEAF2", -+".M c #E9EAE9", -+".N c #C2D8E7", -+".B c #6E6C6D", -+".V c #5390BC", -+".C c #E8E8E8", -+".Z c #6EA2C6", -+".A c #272324", -+".S c #E7E6E7", -+".D c #E6E6E6", -+".F c #252122", -+".G c #29333D", -+".H c #E4E4E4", -+".J c #3F7AA5", -+".K c #231F20", -+".L c #E2E2E2", -+".P c #211D1E", -+".I c #E0E0E0", -+".U c #EAF1F7", -+".Y c #6099C2", -+".T c #1F1B1C", -+".R c #E9F1F6", -+".E c #CDDFEB", -+".W c #4387B6", -+".Q c #96BBD6", -+".! c #B1CDE0", -+".~ c #DEDEDE", -+".^ c #79A9CA", -+"./ c #4285B5", -+".( c #272A31", -+".) c #5D97BF", -+"._ c #4185B4", -+".` c #DCDCDC", -+".' c #959393", -+".] c #DADADA", -+".[ c #314B5F", -+".{ c #D8D8D8", -+".} c #D7D8D7", -+".| c #D6D6D6", -+"X c #F5F8FB", -+"X. c #D4D4D4", -+"XX c #6AA0C5", -+"Xo c #BDD4E5", -+"XO c #3A6A8C", -+"X+ c #232123", -+"X@ c #D3D4D3", -+"X# c #D2D2D2", -+"X$ c #D0D0D0", -+"X% c #CECECE", -+"X& c #CCCCCC", -+"X* c #CADDEB", -+"X= c #37617F", -+"X- c #242A31", -+"X; c #CACACA", -+"X: c #C8DBE9", -+"X> c #90B7D3", -+"X, c #817F7F", -+"X< c #3F7EAB", -+"X1 c #548FB9", -+"X2 c #355873", -+"X3 c #7D7B7B", -+"X4 c #C2C2C2", -+"X5 c #4B8CBA", -+"X6 c #C0C0C0", -+"X7 c #D4E4EE", -+"X8 c #81AECE", -+"X9 c #659CC3", -+"X0 c #787576", -+"Xq c #4788B6", -+"Xw c #252C35", -+"Xe c #757373", -+"Xr c #BABABA", -+"Xt c #FCFDFE", -+"Xy c #B6B6B6", -+"Xu c #C4D9E8", -+"Xi c #706D6E", -+"Xp c #8CB5D2", -+"Xa c #70A3C7", -+"Xs c #8BB5D1", -+"Xd c #5491BC", -+"Xf c #5391BB", -+"Xg c #282424", -+"Xh c #272223", -+"Xj c #6C696A", -+"Xk c #2F4659", -+"Xl c #6B6969", -+"Xz c #407BA5", -+"Xx c #6A6768", -+"Xc c #E4E3E3", -+"Xv c #3E79A3", -+"Xb c #231E1F", -+"Xn c #221E1E", -+"Xm c #E2E1E1", -+"XM c #211C1D", -+"XN c #EBF2F7", -+"XB c #201C1C", -+"XV c #CFE0EC", -+"XC c #4588B7", -+"XZ c #B3CEE1", -+"XA c #366384", -+"XS c #5F98C0", -+"XD c #4386B5", -+"XF c #DEDDDD", -+"XG c #2B3D4B", -+"XH c #615F5F", -+"XJ c #5F5D5D", -+"XK c #5E5B5C", -+"XL c #DCE9F2", -+"XP c #407DA8", -+"XI c #86B1CF", -+"XU c #D4D3D3", -+"XY c #3A698B", -+"XT c #3E7BA6", -+"XR c #232022", -+"XE c #545152", -+"XW c #999899", -+"XQ c #79AACC", -+"X! c #524F50", -+"X~ c #CCCDCB", -+"X^ c #3D749B", -+"X/ c #93BAD5", -+"X( c #77A8CA", -+"X) c #37607E", -+"X_ c #5B96BF", -+"X` c #3F84B4", -+"X' c #CAC9C9", -+"X] c #C6C5C5", -+"X[ c #3F7DAA", -+"X{ c #F2F7FA", -+"X} c #C2C1C1", -+"X| c #212023", -+"o c #9EC1D9", -+"o. c #444142", -+"oX c #3F78A0", -+"oo c #90B8D5", -+"oO c #FEFEFF", -+"o+ c #E2ECF4", -+"o@ c #2B3A47", -+"o# c #25262A", -+"o$ c #B1AFB0", -+"o% c #28313A", -+"o& c #221D1D", -+"o* c #262F38", -+"o= c #629BC2", -+"o- c #302D2E", -+"o; c #6199C1", -+"o: c #201B1B", -+"o> c #4587B6", -+"o, c #F0F0F1", -+"o< c #2D3E4C", -+"o1 c #2E2B2C", -+"o2 c #4385B4", -+"o3 c #A8A7A7", -+"o4 c #A7A5A6", -+"o5 c #3D7197", -+"o6 c #4183B2", -+"o7 c #4083B1", -+"o8 c #A5A3A4", -+"o9 c #3B6F95", -+"o0 c #5290BC", -+"oq c #A4C4DB", -+"ow c #E9F1F7", -+"oe c #4387B7", -+"or c #E7EFF5", -+"ot c #CBDDEA", -+"oy c #4185B5", -+"ou c #5B95BE", -+"oi c #3F83B3", -+"op c #939192", -+"oa c #929191", -+"os c #2B3743", -+"od c #4C4849", -+"of c #2A3742", -+"og c #F4F8FB", -+"oh c #D8E6F0", -+"oj c #4C8CB9", -+"ok c #211F22", -+"ol c #CFD0D0", -+"oz c #444041", -+"ox c #262C34", -+"oc c #413E3E", -+"ov c #403C3D", -+"ob c #3B739B", -+"on c #858384", -+"om c #FFFFFF", -+"oM c #E3EDF4", -+"oN c #5995BF", -+"oB c #3E3A3B", -+"oV c #C7DBE9", -+"oC c #2F4B61", -+"oZ c #5793BD", -+"oA c #3C3839", -+"oS c #2A3945", -+"oD c #7E7D7D", -+"oF c #345873", -+"oG c #363233", -+"oH c #7B797A", -+"oJ c #EFF4F9", -+"oK c #EEF4F8", -+"oL c #F3F3F3", -+"oP c #9ABED7", -+"oI c #4788B7", -+"oU c #629AC1", -+"oY c #ACAAAA", -+"oT c #F1F1F1", -+"oR c #EFEFEF", -+"oE c #737172", -+"oW c #EDEDED", -+"oQ c #A9C9DF", -+"o! c #FBFDFE", -+"o~ c #EBEBEB", -+"o^ c #DFEBF3", -+"o/ c #4581AB", -+"o( c #6F6D6E", -+"o) c #EAE9EA", -+"o_ c #E9E9E9", -+"o` c #C1D7E6", -+"o' c #E7E7E7", -+"o] c #E6E7E6", -+"o[ c #E5E5E5", -+"o{ c #3F7BA5", -+"o} c #242021", -+"o| c #E3E3E3", -+"O c #3E79A4", -+"O. c #221E1F", -+"OX c #26303A", -+"Oo c #9C9A9A", -+"OO c #E1E1E1", -+"O+ c #201C1D", -+"O@ c #4488B7", -+"O# c #DFDFDF", -+"O$ c #7BAACC", -+"O% c #356384", -+"O& c #1E1A1B", -+"O* c #4386B6", -+"O= c #4286B5", -+"O- c #95BAD5", -+"O; c #DDDDDD", -+"O: c #1C1819", -+"O> c #DBDBDB", -+"O, c #D9D9D9", -+"O< c #D7D7D7", -+"O1 c #417FAA", -+"O2 c #DAE7F1", -+"O3 c #F5F9FB", -+"O4 c #D5D5D5", -+"O5 c #242224", -+"O6 c #D4D3D4", -+"O7 c #85B1CF", -+"O8 c #D3D3D3", -+"O9 c #699FC4", -+"O0 c #4D8DB9", -+"Oq c #222022", -+"Ow c #34556F", -+"Oe c #D1D1D1", -+"Or c #D0CFD0", -+"Ot c #8A8888", -+"Oy c #CFCFCF", -+"Ou c #CDCDCD", -+"Oi c #CCCDCC", -+"Op c #CADEEB", -+"Oa c #E5EEF5", -+"Os c #C9DCEA", -+"Od c #ADCADF", -+"Of c #C8DCE9", -+"Og c #91B8D4", -+"Oh c #5994BE", -+"Oj c #3D82B3", -+"Ok c #5894BD", -+"Ol c #3C82B2", -+"Oz c #4181AD", -+"Ox c #3B3737", -+"Oc c #C5C5C5", -+"Ov c #293643", -+"Ob c #3E7DAA", -+"On c #C1C1C1", -+"Om c #353131", -+"OM c #D4E3EE", -+"ON c #B8D1E3", -+"OB c #BFBFBF", -+"OV c #9CBFD8", -+"OC c #80ADCD", -+"OZ c #649BC2", -+"OA c #4889B7", -+"OS c #BDBDBD", -+"OD c #2E292A", -+"OF c #4283B1", -+"OG c #B7B7B7", -+"OH c #4183B0", -+"OJ c #5794BF", -+"OK c #A7C6DC", -+"OL c #365B77", -+"OP c #8BB4D1", -+"OI c #282324", -+"OU c #272323", -+"OY c #6C6A6A", -+"OT c None", -+/* pixels */ -+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ", -+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j", -+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j", -+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR", -+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l", -+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l", -+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW", -+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c", -+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~", -+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n", -+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n", -+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_", -+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C", -+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'", -+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S", -+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D", -+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[", -+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H", -+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|", -+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|", -+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L", -+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO", -+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I", -+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#", -+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#", -+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~", -+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;", -+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`", -+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>", -+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>", -+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]", -+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,", -+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{", -+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<", -+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<", -+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|", -+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4", -+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.", -+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@", -+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8", -+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#", -+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe", -+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$", -+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$", -+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy", -+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%", -+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%", -+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou " -+}; diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch deleted file mode 100644 index a5cb30e3b74c..000000000000 --- a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Tue, 5 Jul 2022 11:35:28 +0200 -Subject: [PATCH] Perform type punning via union without undefined behavior - -* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7 - still contains undefined behavior, since it just creates - temporary pointer variables. ---- - src/cmsplugin.c | 31 +++++++++++++++---------------- - 1 file changed, 15 insertions(+), 16 deletions(-) - -This patch slightly differs from the upstream commit, because -the lcms2 version used in mupdf is slightly behind the upstream -version. - -See: https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch - -diff --git a/src/cmsplugin.c b/src/cmsplugin.c -index 556fbc28..b34e3aab 100644 ---- a/thirdparty/lcms2/src/cmsplugin.c -+++ b/thirdparty/lcms2/src/cmsplugin.c -@@ -167,17 +167,20 @@ cmsBool CMSEXPORT _cmsReadUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, - - cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number* n) - { -- cmsUInt32Number tmp; -+ union typeConverter { -+ cmsUInt32Number integer; -+ cmsFloat32Number floating_point; -+ } tmp; - - _cmsAssert(io != NULL); - -- if (io->Read(ContextID, io, &tmp, sizeof(cmsUInt32Number), 1) != 1) -+ if (io->Read(ContextID, io, &tmp.integer, sizeof(cmsUInt32Number), 1) != 1) - return FALSE; - - if (n != NULL) { - -- tmp = _cmsAdjustEndianess32(tmp); -- *n = *(cmsFloat32Number*)(void*)&tmp; -+ tmp.integer = _cmsAdjustEndianess32(tmp.integer); -+ *n = tmp.floating_point; - - // Safeguard which covers against absurd values - if (*n > 1E+20 || *n < -1E+20) return FALSE; -@@ -304,13 +307,14 @@ cmsBool CMSEXPORT _cmsWriteUInt32Number(cmsContext ContextID, cmsIOHANDLER* io, - - cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number n) - { -- cmsUInt32Number tmp; -- -- _cmsAssert(io != NULL); -- -- tmp = *(cmsUInt32Number*) (void*) &n; -- tmp = _cmsAdjustEndianess32(tmp); -- if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1) -+ union typeConverter { -+ cmsUInt32Number integer; -+ cmsFloat32Number floating_point; -+ } tmp; -+ -+ tmp.floating_point = n; -+ tmp.integer = _cmsAdjustEndianess32(tmp.integer); -+ if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp.integer) != 1) - return FALSE; - - return TRUE; diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch deleted file mode 100644 index bebdf3909e81..000000000000 --- a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 37757db262425d793b17b63821d9014d3655e50a Mon Sep 17 00:00:00 2001 -From: Sebastian Rasmussen <sebras@gmail.com> -Date: Thu, 1 Dec 2022 00:04:40 +0100 -Subject: [PATCH] gl: Use posix_spawnp() in order to search PATH for binaries. - ---- - platform/gl/gl-main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c -index d5ae69c95..271ac43a6 100644 ---- a/platform/gl/gl-main.c -+++ b/platform/gl/gl-main.c -@@ -122,7 +122,7 @@ static void open_browser(const char *uri) - argv[0] = (char*) browser; - argv[1] = (char*) uri; - argv[2] = NULL; -- err = posix_spawn(&pid, browser, NULL, NULL, argv, environ); -+ err = posix_spawnp(&pid, browser, NULL, NULL, argv, environ); - if (err) - fz_warn(ctx, "cannot spawn browser '%s': %s", browser, strerror(err)); - --- -2.39.1 - diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch deleted file mode 100644 index 9f2b9d692f4e..000000000000 --- a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c -index f764242..83888dc 100644 ---- a/source/html/epub-doc.c -+++ b/source/html/epub-doc.c -@@ -692,10 +692,12 @@ epub_parse_header(fz_context *ctx, epub_document *doc) - epub_chapter **tailp; - int i; - -+ #ifdef GENTOO_MUPDF_DRM - if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml")) - fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); - if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml")) - fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM"); -+ #endif - - fz_var(buf); - fz_var(container_xml); - diff --git a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch index 643b6d2c8b1e..02fa3bfdd45c 100644 --- a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch +++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch @@ -1,23 +1,11 @@ Refreshed patches based on: https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/ ---- a/Makefile -+++ b/Makefile -@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o) - - HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe - -+$(HEXDUMP_EXE): scripts/hexdump.c -+ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $< -+ - FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff)) - FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc)) - FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf)) --- a/Makerules +++ b/Makerules -@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW) - OS := $(OS:Windows_NT=MINGW) - OS := $(OS:Darwin=MACOS) +@@ -9,6 +9,9 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif +PKG_CONFIG ?= pkg-config +CC_FOR_BUILD ?= $(CC) @@ -25,9 +13,9 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- WARNING_CFLAGS := -Wall -Wsign-compare # Feature configuration options -@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS) +@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux) + LDFLAGS += -sTOTAL_MEMORY=48MB endif - endif - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) @@ -107,7 +95,7 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- endif HAVE_GLUT := yes -@@ -209,16 +212,16 @@ endif +@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux) SYS_GLUT_LIBS := -lglut -lGL endif @@ -119,7 +107,9 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- + X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) endif - HAVE_LIBCRYPTO := not-unless-portage-tells-me + ifeq ($(HAVE_LIBCRYPTO),) + HAVE_LIBCRYPTO := not-unless-portage-tells-me + endif ifeq ($(HAVE_LIBCRYPTO),yes) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch index a81c7a008e44..c151d81f175d 100644 --- a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch +++ b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch @@ -1,6 +1,6 @@ --- a/Makerules +++ b/Makerules -@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW) +@@ -161,11 +161,11 @@ ifeq ($(OS),MINGW) else ifeq ($(OS),MACOS) HAVE_GLUT := yes SYS_GLUT_CFLAGS := -Wno-deprecated-declarations @@ -15,20 +15,26 @@ + LD ?= xcrun ld + RANLIB ?= xcrun ranlib - ifeq (, $(shell which pkg-config)) - $(warning "No pkg-config found, install it for proper integration of libcrypto") -@@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS) - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") +@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS) endif endif -- + -else ifeq ($(OS),Linux) -- HAVE_OBJCOPY := yes +- ifeq ($(PYODIDE_ROOT),) +- HAVE_OBJCOPY := yes +- else +- # Pyodide's ld does not support -b so we cannot use it to create object +- # files containing font data, so leave HAVE_OBJCOPY unset. And we need +- # extra memory when linking. +- LDFLAGS += -sTOTAL_MEMORY=48MB +- endif +endif ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -@@ -229,8 +227,6 @@ else ifeq ($(OS),Linux) +@@ -263,8 +255,6 @@ else ifeq ($(OS),Linux) PTHREAD_LIBS := -lpthread endif diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch index 3f3aac4c933a..b91bd9ad12e3 100644 --- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch +++ b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch @@ -1,6 +1,6 @@ --- a/Makerules +++ b/Makerules -@@ -119,13 +119,13 @@ else ifeq ($(OS),Linux) +@@ -243,14 +243,14 @@ else ifeq ($(OS),Linux) SYS_GLUT_LIBS := -lglut -lGL endif @@ -11,8 +11,9 @@ X11_LIBS := $(shell pkg-config --libs x11 xext) endif -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -+ HAVE_LIBCRYPTO := not-unless-portage-tells-me + ifeq ($(HAVE_LIBCRYPTO),) +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := not-unless-portage-tells-me + endif ifeq ($(HAVE_LIBCRYPTO),yes) LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch new file mode 100644 index 000000000000..6d87798c2e66 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-cross-fixes.patch @@ -0,0 +1,154 @@ +# Fix cross compilation issue with pkg-config +--- a/Makerules ++++ b/Makerules +@@ -9,6 +9,8 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -194,13 +196,13 @@ else ifeq ($(OS),MACOS) + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") + HAVE_LIBCRYPTO := no +- else ifeq (, $(shell command -v pkg-config)) ++ else ifeq (, $(shell command -v $(PKG_CONFIG))) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) + ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) ++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO ++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) + endif + endif + +@@ -210,82 +212,82 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + HAVE_OBJCOPY := yes + endif + +- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) +- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) +- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2) + endif +- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) +- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) +- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo) + endif +- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) +- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) +- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz) + endif +- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes) +- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2) +- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2) ++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes) ++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2) ++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2) + endif +- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes) +- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) +- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) ++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes) ++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg) ++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg) + endif +- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) +- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) +- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2) + endif +- ifeq ($(shell pkg-config --exists zlib && echo yes),yes) +- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) +- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) ++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes) ++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib) ++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) + endif + +- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) ++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes) + ifeq ($(HAVE_SYS_LEPTONICA),yes) +- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept) +- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept) ++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept) ++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept) + endif + +- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes) ++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes) + ifeq ($(HAVE_SYS_TESSERACT),yes) +- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract) +- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract) ++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract) ++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract) + endif + +- HAVE_SYS_LIBARCHIVE := $(shell pkg-config --exists 'libarchive' && echo yes) ++ HAVE_SYS_LIBARCHIVE := $(shell $(PKG_CONFIG) --exists 'libarchive' && echo yes) + ifeq ($(HAVE_SYS_LIBARCHIVE),yes) +- SYS_LIBARCHIVE_CFLAGS := $(shell pkg-config --cflags libarchive) +- SYS_LIBARCHIVE_LIBS := $(shell pkg-config --libs libarchive) ++ SYS_LIBARCHIVE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libarchive) ++ SYS_LIBARCHIVE_LIBS := $(shell $(PKG_CONFIG) --libs libarchive) + endif + +- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes) + ifeq ($(HAVE_SYS_CURL),yes) +- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) +- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl) ++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl) + endif + + HAVE_GLUT := yes + ifeq ($(HAVE_GLUT),yes) + ifeq ($(OS),OpenBSD) +- SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut gl) +- SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl) ++ SYS_GLUT_CFLAGS := $(shell $(PKG_CONFIG) --cflags glut gl) ++ SYS_GLUT_LIBS := $(shell $(PKG_CONFIG) --libs glut gl) + else + SYS_GLUT_CFLAGS := + SYS_GLUT_LIBS := -lglut -lGL + endif + endif + +- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) ++ HAVE_X11 := $(shell $(PKG_CONFIG) --exists x11 xext && echo yes) + ifeq ($(HAVE_X11),yes) +- X11_CFLAGS := $(shell pkg-config --cflags x11 xext) +- X11_LIBS := $(shell pkg-config --libs x11 xext) ++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) ++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + ifeq ($(HAVE_LIBCRYPTO),) +- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) + endif + ifeq ($(HAVE_LIBCRYPTO),yes) +- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO +- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) ++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO ++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto) + endif + + HAVE_PTHREAD := yes diff --git a/app-text/mupdf/files/mupdf-1.24.1-darwin.patch b/app-text/mupdf/files/mupdf-1.24.1-darwin.patch new file mode 100644 index 000000000000..9a699fc98209 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-darwin.patch @@ -0,0 +1,20 @@ +# Fix configuration on darwin +--- a/Makerules ++++ b/Makerules +@@ -185,11 +185,11 @@ ifeq ($(OS),MINGW) + else ifeq ($(OS),MACOS) + HAVE_GLUT := yes + SYS_GLUT_CFLAGS := -Wno-deprecated-declarations +- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL +- CC = xcrun cc +- AR = xcrun ar +- LD = xcrun ld +- RANLIB = xcrun ranlib ++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL ++ CC ?= xcrun cc ++ AR ?= xcrun ar ++ LD ?= xcrun ld ++ RANLIB ?= xcrun ranlib + + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") diff --git a/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch new file mode 100644 index 000000000000..77710a6d51a4 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.24.1-openssl-x11.patch @@ -0,0 +1,19 @@ +--- a/Makerules ++++ b/Makerules +@@ -274,14 +274,14 @@ else ifeq ($(LINUX_OR_OPENBSD),yes) + endif + endif + +- HAVE_X11 := $(shell $(PKG_CONFIG) --exists x11 xext && echo yes) ++ HAVE_X11 := not-unless-portage-tells-me + ifeq ($(HAVE_X11),yes) + X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) + X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + ifeq ($(HAVE_LIBCRYPTO),) +- HAVE_LIBCRYPTO := $(shell $(PKG_CONFIG) --exists 'libcrypto >= 1.1.0' && echo yes) ++ HAVE_LIBCRYPTO := not-unless-portage-tells-me + endif + ifeq ($(HAVE_LIBCRYPTO),yes) + LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml index c0d61774dbcf..44f37887c3a4 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -10,6 +10,6 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="drm">Enable support for Digital rights management (DRM)</flag> + <flag name="archive">Enable support for CBR and other archive formats using libarchive</flag> </use> </pkgmetadata> diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild deleted file mode 100644 index f2daed4e1287..000000000000 --- a/app-text/mupdf/mupdf-1.19.1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please check upstream git regularly for relevant security-related commits -# to backport. - -inherit desktop flag-o-matic toolchain-funcs xdg - -DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz" -S="${WORKDIR}"/${P}-source - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" -IUSE="+javascript opengl ssl X" -REQUIRED_USE="opengl? ( javascript )" - -# Although we use the bundled, patched version of freeglut in mupdf (because of -# bug #653298), the best way to ensure that its dependencies are present is to -# install system's freeglut. -RDEPEND=" - dev-libs/gumbo - media-libs/freetype:2= - media-libs/harfbuzz:=[truetype] - media-libs/jbig2dec:= - media-libs/libpng:0= - >=media-libs/openjpeg-2.1:2= - >=media-libs/libjpeg-turbo-1.5.3-r2:0 - javascript? ( >=dev-lang/mujs-1.0.7:= ) - opengl? ( >=media-libs/freeglut-3.0.0 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) -" -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.19.0-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch -) - -src_prepare() { - default - - use hppa && append-cflags -ffunction-sections - - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iCXX = $(tc-getCXX)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - # - # Bundled libs - # * General - # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's - # recommendations. It does not mean "always use system libs". - # See [0] below for what it means in a specific version. - # - # * freeglut - # We don't use system's freeglut because upstream has a special modified - # version of it that gives mupdf clipboard support. See bug #653298 - # - # * mujs - # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We then went back to using the bundled version of it. - # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk - # when bumping and check! - # See bug #685244 - # - # * lmms2 - # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. - # It is therefore not appropriate for us to unbundle it at this time. - # - # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 - # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt - local myemakeargs=( - GENTOO_PV=${PV} - HAVE_GLUT=$(usex opengl) - HAVE_LIBCRYPTO=$(usex ssl) - HAVE_X11=$(usex X) - USE_SYSTEM_LIBS=yes - USE_SYSTEM_MUJS=$(usex javascript) - USE_SYSTEM_GLUT=no - HAVE_OBJCOPY=no - "$@" - ) - - emake "${myemakeargs[@]}" -} - -src_compile() { - tc-export PKG_CONFIG - - _emake XCFLAGS="-fPIC" -} - -src_install() { - if use opengl || use X ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()" - fi - - sed -i \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ - -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" - - _emake install - - dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - - if use opengl ; then - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild deleted file mode 100644 index a8b45265f9c4..000000000000 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please check upstream git regularly for relevant security-related commits -# to backport. - -inherit desktop flag-o-matic toolchain-funcs xdg - -DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz" -S="${WORKDIR}"/${P}-source - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86" -IUSE="+javascript opengl ssl X" -REQUIRED_USE="opengl? ( javascript )" - -# Although we use the bundled, patched version of freeglut in mupdf (because of -# bug #653298), the best way to ensure that its dependencies are present is to -# install system's freeglut. -RDEPEND=" - dev-libs/gumbo - media-libs/freetype:2= - media-libs/harfbuzz:=[truetype] - media-libs/jbig2dec:= - media-libs/libpng:0= - >=media-libs/openjpeg-2.1:2= - >=media-libs/libjpeg-turbo-1.5.3-r2:0 - javascript? ( >=dev-lang/mujs-1.2.0:= ) - opengl? ( >=media-libs/freeglut-3.0.0 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) -" -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.19.0-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch - "${FILESDIR}"/${P}-lcms2.patch -) - -src_prepare() { - default - - use hppa && append-cflags -ffunction-sections - - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iCXX = $(tc-getCXX)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" - - # Adjust MuPDF version in .pc file created by the - # mupdf-1.10a-add-desktop-pc-xpm-files.patch file - sed -e "s/Version: \(.*\)/Version: ${PV}/" \ - -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - # - # Bundled libs - # * General - # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's - # recommendations. It does not mean "always use system libs". - # See [0] below for what it means in a specific version. - # - # * freeglut - # We don't use system's freeglut because upstream has a special modified - # version of it that gives mupdf clipboard support. See bug #653298 - # - # * mujs - # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We then went back to using the bundled version of it. - # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk - # when bumping and check! - # See bug #685244 - # - # * lmms2 - # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. - # It is therefore not appropriate for us to unbundle it at this time. - # - # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 - # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt - local myemakeargs=( - GENTOO_PV=${PV} - HAVE_GLUT=$(usex opengl) - HAVE_LIBCRYPTO=$(usex ssl) - HAVE_X11=$(usex X) - USE_SYSTEM_LIBS=yes - USE_SYSTEM_MUJS=$(usex javascript) - USE_SYSTEM_GLUT=no - HAVE_OBJCOPY=no - "$@" - ) - - emake "${myemakeargs[@]}" -} - -src_compile() { - tc-export PKG_CONFIG - - _emake XCFLAGS="-fPIC" -} - -src_install() { - if use opengl || use X ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()" - fi - - sed -i \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ - -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" - - _emake install - - dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - - if use opengl ; then - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild deleted file mode 100644 index bd19f33ee9aa..000000000000 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please check upstream git regularly for relevant security-related commits -# to backport. - -inherit desktop flag-o-matic toolchain-funcs xdg - -DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz" -S="${WORKDIR}"/${P}-source - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" -IUSE="+javascript opengl ssl X" -REQUIRED_USE="opengl? ( javascript )" - -# Although we use the bundled, patched version of freeglut in mupdf (because of -# bug #653298), the best way to ensure that its dependencies are present is to -# install system's freeglut. -RDEPEND=" - dev-libs/gumbo - media-libs/freetype:2 - media-libs/harfbuzz:=[truetype] - media-libs/jbig2dec:= - media-libs/libpng:0= - >=media-libs/openjpeg-2.1:2= - >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.2.0:= ) - opengl? ( >=media-libs/freeglut-3.0.0 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) - sys-libs/zlib - X? ( - x11-libs/libX11 - x11-libs/libXext - ) -" -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.19.0-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch - "${FILESDIR}"/${PN}-1.20.0-lcms2.patch -) - -src_prepare() { - default - - use hppa && append-cflags -ffunction-sections - - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iCXX = $(tc-getCXX)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" - - # Adjust MuPDF version in .pc file created by the - # mupdf-1.10a-add-desktop-pc-xpm-files.patch file - sed -e "s/Version: \(.*\)/Version: ${PV}/" \ - -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - # - # Bundled libs - # * General - # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's - # recommendations. It does not mean "always use system libs". - # See [0] below for what it means in a specific version. - # - # * freeglut - # We don't use system's freeglut because upstream has a special modified - # version of it that gives mupdf clipboard support. See bug #653298 - # - # * mujs - # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We then went back to using the bundled version of it. - # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk - # when bumping and check! - # See bug #685244 - # - # * lmms2 - # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. - # It is therefore not appropriate for us to unbundle it at this time. - # - # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 - # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt - local myemakeargs=( - GENTOO_PV=${PV} - HAVE_GLUT=$(usex opengl) - HAVE_LIBCRYPTO=$(usex ssl) - HAVE_X11=$(usex X) - USE_SYSTEM_LIBS=yes - USE_SYSTEM_MUJS=$(usex javascript) - USE_SYSTEM_GLUT=no - HAVE_OBJCOPY=no - "$@" - ) - - emake "${myemakeargs[@]}" -} - -src_compile() { - tc-export PKG_CONFIG - - _emake XCFLAGS="-fPIC" -} - -src_install() { - if use opengl || use X ; then - domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm - else - rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()" - fi - - sed -i \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ - -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" - - _emake install - - dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - - if use opengl ; then - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild deleted file mode 100644 index cbc4147b439e..000000000000 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please check upstream git regularly for relevant security-related commits -# to backport. - -inherit desktop flag-o-matic toolchain-funcs xdg - -DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git" -SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz" -S="${WORKDIR}"/${P}-source - -LICENSE="AGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 x86" -IUSE="+javascript opengl ssl X" -REQUIRED_USE="opengl? ( javascript )" - -# Although we use the bundled, patched version of freeglut in mupdf (because of -# bug #653298), the best way to ensure that its dependencies are present is to -# install system's freeglut. -RDEPEND=" - dev-libs/gumbo - media-libs/freetype:2 - media-libs/harfbuzz:=[truetype] - media-libs/jbig2dec:= - media-libs/libpng:0= - >=media-libs/openjpeg-2.1:2= - >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.2.0:= ) - opengl? ( >=media-libs/freeglut-3.0.0 ) - ssl? ( >=dev-libs/openssl-1.1:0= ) - sys-libs/zlib - X? ( - x11-libs/libX11 - x11-libs/libXext - ) -" -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.19.0-Makefile.patch - "${FILESDIR}"/${P}-add-desktop-pc-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch - # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch - # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch -) - -src_prepare() { - default - - use hppa && append-cflags -ffunction-sections - - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" - - sed -e "1iOS = Linux" \ - -e "1iCC = $(tc-getCC)" \ - -e "1iCXX = $(tc-getCXX)" \ - -e "1iLD = $(tc-getLD)" \ - -e "1iAR = $(tc-getAR)" \ - -e "1iverbose = yes" \ - -e "1ibuild = debug" \ - -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" - - # Adjust MuPDF version in .pc file created by the - # mupdf-1.10a-add-desktop-pc-xpm-files.patch file - sed -e "s/Version: \(.*\)/Version: ${PV}/" \ - -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" -} - -_emake() { - # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. - # - # Bundled libs - # * General - # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's - # recommendations. It does not mean "always use system libs". - # See [0] below for what it means in a specific version. - # - # * freeglut - # We don't use system's freeglut because upstream has a special modified - # version of it that gives mupdf clipboard support. See bug #653298 - # - # * mujs - # As of v1.15.0, mupdf started using symbols in mujs that were not part - # of any release. We then went back to using the bundled version of it. - # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk - # when bumping and check! - # See bug #685244 - # - # * lmms2 - # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1]. - # It is therefore not appropriate for us to unbundle it at this time. - # - # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9 - # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt - local myemakeargs=( - GENTOO_PV=${PV} - HAVE_GLUT=$(usex opengl) - HAVE_LIBCRYPTO=$(usex ssl) - HAVE_X11=$(usex X) - USE_SYSTEM_LIBS=yes - USE_SYSTEM_MUJS=$(usex javascript) - USE_SYSTEM_GLUT=no - HAVE_OBJCOPY=no - "$@" - ) - - emake "${myemakeargs[@]}" -} - -src_compile() { - tc-export PKG_CONFIG - - _emake XCFLAGS="-fPIC" -} - -src_install() { - if use opengl || use X ; then - domenu platform/debian/${PN}.desktop - doicon -s scalable docs/logo/new-${PN}-icon.svg - else - rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()" - fi - - sed -i \ - -e "1iprefix = ${ED}/usr" \ - -e "1ilibdir = ${ED}/usr/$(get_libdir)" \ - -e "1idocdir = ${ED}/usr/share/doc/${PF}" \ - -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" - - _emake install - - dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so - - if use opengl ; then - einfo "mupdf symlink points to mupdf-gl (bug 616654)" - dosym ${PN}-gl /usr/bin/${PN} - elif use X ; then - einfo "mupdf symlink points to mupdf-x11 (bug 616654)" - dosym ${PN}-x11 /usr/bin/${PN} - fi - - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README CHANGES CONTRIBUTORS -} diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild index 0d782560357f..d27ecf8911d4 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,45 +15,47 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" -IUSE="+drm +javascript opengl ssl X" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )" # Although we use the bundled, patched version of freeglut in mupdf (because of # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. RDEPEND=" - dev-libs/gumbo + dev-libs/gumbo:= media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= + net-misc/curl javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( + media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXext + x11-libs/libXrandr ) " -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch "${FILESDIR}"/${PN}-1.19.0-Makefile.patch "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch + "${FILESDIR}"/${PN}-1.23.3-darwin.patch # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch + "${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch - "${FILESDIR}"/${P}-no-drm.patch - "${FILESDIR}"/${P}-fix-aliasing-violation.patch + "${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch ) src_prepare() { @@ -61,8 +63,6 @@ src_prepare() { use hppa && append-cflags -ffunction-sections - use drm && append-cflags -DGENTOO_MUPDF_DRM - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" sed -e "1iOS = Linux" \ @@ -75,7 +75,7 @@ src_prepare() { -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" # Adjust MuPDF version in .pc file created by the - # mupdf-1.10a-add-desktop-pc-xpm-files.patch file + # mupdf-1.21.0-add-desktop-pc-files.patch file sed -e "s/Version: \(.*\)/Version: ${PV}/" \ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" } @@ -153,8 +153,10 @@ src_install() { dosym ${PN}-x11 /usr/bin/${PN} fi - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()" + # Respect libdir and EPREFIX (bugs #734898, #911965) + sed -i -e "s:/lib:/$(get_libdir):" \ + -e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \ + || die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()" insinto /usr/$(get_libdir)/pkgconfig doins platform/debian/${PN}.pc diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.24.1.ebuild index 590791e7653f..25256507c5bc 100644 --- a/app-text/mupdf/mupdf-1.21.1-r1.ebuild +++ b/app-text/mupdf/mupdf-1.24.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,48 +15,48 @@ S="${WORKDIR}"/${P}-source LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" -IUSE="+drm +javascript opengl ssl X" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="archive +javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )" # Although we use the bundled, patched version of freeglut in mupdf (because of # bug #653298), the best way to ensure that its dependencies are present is to # install system's freeglut. RDEPEND=" - dev-libs/gumbo + archive? ( app-arch/libarchive ) + dev-libs/gumbo:= media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= + net-misc/curl javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( + media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXext + x11-libs/libXrandr ) " -DEPEND="${RDEPEND}" -BDEPEND="X? ( x11-base/xorg-proto ) - virtual/pkgconfig" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch "${FILESDIR}"/${PN}-1.19.0-Makefile.patch "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch - "${FILESDIR}"/${PN}-1.19.0-darwin.patch + "${FILESDIR}"/${P}-cross-fixes.patch + "${FILESDIR}"/${P}-darwin.patch # See bugs #662352 - "${FILESDIR}"/${PN}-1.15-openssl-x11.patch + "${FILESDIR}"/${P}-openssl-x11.patch # General cross fixes from Debian (refreshed) - "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch - "${FILESDIR}"/${P}-no-drm.patch - "${FILESDIR}"/${P}-fix-aliasing-violation.patch - # See bug 893604 - # Fixed in upcoming release - "${FILESDIR}"/${P}-fix-url-processing.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch ) src_prepare() { @@ -64,8 +64,6 @@ src_prepare() { use hppa && append-cflags -ffunction-sections - use drm && append-cflags -DGENTOO_MUPDF_DRM - append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)" sed -e "1iOS = Linux" \ @@ -78,7 +76,7 @@ src_prepare() { -i Makerules || die "Failed adding build variables to Makerules in src_prepare()" # Adjust MuPDF version in .pc file created by the - # mupdf-1.10a-add-desktop-pc-xpm-files.patch file + # mupdf-1.21.0-add-desktop-pc-files.patch file sed -e "s/Version: \(.*\)/Version: ${PV}/" \ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc" } @@ -156,9 +154,10 @@ src_install() { dosym ${PN}-x11 /usr/bin/${PN} fi - # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \ - || die "Failed to sed pkgconfig file to respect libdir in src_install()" + # Respect libdir and EPREFIX (bugs #734898, #911965) + sed -i -e "s:/lib:/$(get_libdir):" \ + -e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \ + || die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()" insinto /usr/$(get_libdir)/pkgconfig doins platform/debian/${PN}.pc diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest index 898deef3d38c..d54eb82d5a6e 100644 --- a/app-text/mythes/Manifest +++ b/app-text/mythes/Manifest @@ -1,2 +1 @@ -DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21 DIST mythes-1.2.5.tar.xz 2891852 BLAKE2B e292e49187a9b225fdcfccb467afed0b8ce90769bbefe331d7d7f026f2dd6686543b14f3666af5b1693198467206c53da0bbd030420d87c94315f9da769f45a6 SHA512 304fd05619e0ae02c9c29d92a6ada8f4a85f41f331b87b8820728c1919f3dd9c5cd951dbef9a27e649466f94dc5daa19350c9fd09c90d49b198b73b1f9eb770e diff --git a/app-text/mythes/mythes-1.2.4-r1.ebuild b/app-text/mythes/mythes-1.2.4-r1.ebuild deleted file mode 100644 index 2feaec8566cb..000000000000 --- a/app-text/mythes/mythes-1.2.4-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A simple thesaurus for Libreoffice" -HOMEPAGE="http://hunspell.sourceforge.net/" -SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="app-text/hunspell" -DEPEND="${DEPEND} - virtual/pkgconfig" - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${ED}" -name '*.la' -exec rm -f {} + -} diff --git a/app-text/mythes/mythes-1.2.5.ebuild b/app-text/mythes/mythes-1.2.5.ebuild index 6c03b8d363f6..1d2f70215835 100644 --- a/app-text/mythes/mythes-1.2.5.ebuild +++ b/app-text/mythes/mythes-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/hunspell/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="debug" RDEPEND="app-text/hunspell:=" diff --git a/app-text/namazu/files/namazu-configure.patch b/app-text/namazu/files/namazu-configure.patch new file mode 100644 index 000000000000..02b6fcde8dc6 --- /dev/null +++ b/app-text/namazu/files/namazu-configure.patch @@ -0,0 +1,13 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -165,7 +165,9 @@ + [AC_TRY_RUN( + changequote(<<, >>)dnl + << +-main() ++#include <stdlib.h> ++#include <string.h> ++int main(void) + { + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = 0x40, c1 = 0x80, c2 = 0x81; diff --git a/app-text/namazu/files/namazu-tests.patch b/app-text/namazu/files/namazu-tests.patch new file mode 100644 index 000000000000..c79f8aade6f3 --- /dev/null +++ b/app-text/namazu/files/namazu-tests.patch @@ -0,0 +1,8 @@ +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -26,3 +26,5 @@ + rm -rf test-log tmp-data tmp.* idx[0-9]* ja-idx[0-9]* + + EXTRA_DIST = $(TESTS) select-data commonfuncs ++ ++.NOTPARALLEL: diff --git a/app-text/namazu/files/namazu-underlinking.patch b/app-text/namazu/files/namazu-underlinking.patch new file mode 100644 index 000000000000..04af7c21d998 --- /dev/null +++ b/app-text/namazu/files/namazu-underlinking.patch @@ -0,0 +1,11 @@ +--- a/nmz/Makefile.am ++++ b/nmz/Makefile.am +@@ -47,7 +47,7 @@ + nmzversion.c + + libnmz_la_DEPENDENCIES = @NMZ_LIBOBJS@ +-libnmz_la_LIBADD = @LTLIBINTL@ ++libnmz_la_LIBADD = @LTLIBINTL@ @NMZ_LIBOBJS@ + libnmz_la_LDFLAGS = -version-info $(LTVERSION) + + nmzversion.c: nmzversion.c.in diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml index 491c88b3a31f..a94766977fa6 100644 --- a/app-text/namazu/metadata.xml +++ b/app-text/namazu/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> </pkgmetadata> diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild index ef46e76118df..866e3923c180 100644 --- a/app-text/namazu/namazu-2.0.21.ebuild +++ b/app-text/namazu/namazu-2.0.21.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit autotools elisp-common @@ -35,9 +35,12 @@ BDEPEND="nls? ( sys-devel/gettext )" PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-configure.patch "${FILESDIR}"/${PN}-emacs-27.patch "${FILESDIR}"/${PN}-perl-5.18.patch "${FILESDIR}"/${PN}-perl-5.26.patch + "${FILESDIR}"/${PN}-tests.patch + "${FILESDIR}"/${PN}-underlinking.patch "${FILESDIR}"/${P}-memmove.patch ) @@ -74,14 +77,12 @@ src_compile() { fi } -src_test() { - emake -j1 check -} - src_install() { default find "${ED}" -name '*.la' -delete || die + keepdir /var/lib/${PN}/index + if use emacs; then elisp-install ${PN} lisp/*.el* elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild index 4c8146e3b313..d902b8bc9dbe 100644 --- a/app-text/namazu/namazu-2.0.22_pre8.ebuild +++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit autotools elisp-common @@ -36,7 +36,12 @@ DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-configure.patch + "${FILESDIR}"/${PN}-tests.patch + "${FILESDIR}"/${PN}-underlinking.patch +) src_prepare() { default @@ -71,14 +76,12 @@ src_compile() { fi } -src_test() { - emake -j1 check -} - src_install() { default find "${ED}" -name '*.la' -delete || die + keepdir /var/lib/${PN}/index + if use emacs; then elisp-install ${PN} lisp/*.el* elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest index ea55bfbdbb8b..71de41a24016 100644 --- a/app-text/nuspell/Manifest +++ b/app-text/nuspell/Manifest @@ -1 +1,2 @@ -DIST nuspell-5.1.2.tar.gz 371092 BLAKE2B 720ff398ae34ff92884f4eec97e90d88082562a73046a7189f9fa0e93c3ca9de08033e06e27eae6e22ff027428dc904ea4d1e7870aacdaea45712ea2db1755c5 SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8 +DIST nuspell-5.1.3.tar.gz 371496 BLAKE2B 7a4aa05b01bd085e0612cf681783cfa2314a3b775c283f7e25c19d6afbb5af74c7ea2ffe149c68ca422383c24bd043e4b5e6b0895a0acd7c376e3d39f253a867 SHA512 72c868f734848be79c7cfb0502298626307213e4f3f422f8e9ee7dac24cb3d79ea55d04ef0443e7107bb11eb545c79a15a8aea8cb056dc2805c23bd5e3292562 +DIST nuspell-5.1.4.tar.gz 371512 BLAKE2B c1c05cc113cf7a6a4b77671f4fe372b2131a6cbcb328d76517bcbb45863e1fd0f27d76597193cae3a5c686d8e0b480fc831e0aa8dbcbf9f9b65420200a13d444 SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d diff --git a/app-text/nuspell/nuspell-5.1.2.ebuild b/app-text/nuspell/nuspell-5.1.3.ebuild index f77e3b1721ce..18d0806fde8f 100644 --- a/app-text/nuspell/nuspell-5.1.2.ebuild +++ b/app-text/nuspell/nuspell-5.1.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -16,7 +16,7 @@ IUSE="doc test" RDEPEND=">=dev-libs/icu-60" DEPEND="${RDEPEND} - doc? ( app-text/pandoc ) + doc? ( virtual/pandoc ) test? ( <dev-cpp/catch-3:0 ) " @@ -25,7 +25,6 @@ DOCS=( CHANGELOG.md ) RESTRICT="!test? ( test )" src_prepare() { - rm -R external/Catch2/ || die if ! use test ; then rm -R external/hunspell/ || die fi diff --git a/app-text/nuspell/nuspell-5.1.4.ebuild b/app-text/nuspell/nuspell-5.1.4.ebuild new file mode 100644 index 000000000000..d0791bda1ad5 --- /dev/null +++ b/app-text/nuspell/nuspell-5.1.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Spell checker library and CLI for complex natural languages" +HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell" +SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0/5" # due to libnuspell.so.5 +KEYWORDS="~amd64 ~loong ~riscv ~x86" +IUSE="doc test" + +RDEPEND=">=dev-libs/icu-60" +DEPEND="${RDEPEND} + doc? ( virtual/pandoc ) + test? ( >=dev-cpp/catch-3.1.1:0 ) + " + +DOCS=( CHANGELOG.md ) + +RESTRICT="!test? ( test )" + +src_prepare() { + if ! use test ; then + rm -R external/hunspell/ || die + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +pkg_postinst() { + einfo + einfo 'Nuspell needs language packs and/or dictionaries to be of use' + einfo 'e.g. package app-dicts/myspell-en or one of its siblings.' + einfo + einfo 'Besides MySpell dictionaries, for other options please' + einfo 'see https://nuspell.github.io/#languages-and-users .' + einfo +} diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild index 95b3e296cfc9..9e97c0d604f0 100644 --- a/app-text/openjade/openjade-1.3.2-r9.ebuild +++ b/app-text/openjade/openjade-1.3.2-r9.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools flag-o-matic sgml-catalog-r1 toolchain-funcs DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents" -HOMEPAGE="http://openjade.sourceforge.net" +HOMEPAGE="https://openjade.sourceforge.net" SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=" diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest index 58029e30df43..8a0714583212 100644 --- a/app-text/openpaperwork-core/Manifest +++ b/app-text/openpaperwork-core/Manifest @@ -1,2 +1,2 @@ -DIST openpaperwork-core-2.1.1.tar.gz 115580 BLAKE2B a6abd47967b1f94e41d2c491cbbaead3cc2c509e1dc980269e5575d2c08e0a30d50357b5e42ba56569f35b44a470992e45994413dddefd63ba65f8018853a939 SHA512 ef7917dcc0c2520ff63c776b170770a936743fbc8ff2a15993bae7090ef43aa76e66b787aeee6f6d43961fac2f67ebeaf8ba4eb93a912ecfe93567e3c78ed219 -DIST openpaperwork-core-2.1.2.tar.gz 104694 BLAKE2B cf7cc132758662495d4b586efebccaa20c892cdca2ae3bb68d5fc45639c828b8441906c56067db079c12f1393adcd69d2edec19ca51fe5fcd5930ce2a7005c0c SHA512 88cb55b7b94e1e149042357d3a1c6c2a2184e4810b5895e02ef896554ae88ed0ebacd9c11e401da5e155aec857cd1b148328b1ffd0b760f939e4e97b96d1ce1a +DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f +DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild deleted file mode 100644 index f2e090d3fd04..000000000000 --- a/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="Core part of Paperwork (plugin management)" -HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/distro[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild deleted file mode 100644 index 58b64fac3c8c..000000000000 --- a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Core part of Paperwork (plugin management)" -HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/distro[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild new file mode 100644 index 000000000000..b2cef72ea2c6 --- /dev/null +++ b/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) + +inherit distutils-r1 + +DESCRIPTION="Core part of Paperwork (plugin management)" +HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/distro[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +S=${WORKDIR}/paperwork-${PV}/${PN} + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild new file mode 100644 index 000000000000..f921425cccd0 --- /dev/null +++ b/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) + +inherit distutils-r1 + +DESCRIPTION="Core part of Paperwork (plugin management)" +HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2" +S=${WORKDIR}/paperwork-${PV}/${PN} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-python/distro[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest index 9662d62886ae..8a0714583212 100644 --- a/app-text/openpaperwork-gtk/Manifest +++ b/app-text/openpaperwork-gtk/Manifest @@ -1,2 +1,2 @@ -DIST openpaperwork-gtk-2.1.1.tar.gz 57893 BLAKE2B 387e04fe0e280f8ac4b8ed7d1c94c2fd8c76d556ee8f7ed7e76e7a1c298e8323664511538c947da4d460e5626cc8b7e3da984360467b96add50ca0c9a77075eb SHA512 0250c457639068a8b6e95f98570872340a145d5b6939d00f9a33139a7c539978e5591dda148e1d3fbedc366f9a0a58ddfb89510374c7b135bcf1550ec744857e -DIST openpaperwork-gtk-2.1.2.tar.gz 59104 BLAKE2B 94782b0fbd29e749b68f277e5c48a8f194d4feafe2f1579615b51bed44855a9113631302e3ed0f8248683ba524e72147da7cdce76e54b266ae9d8dbaa5cba2a5 SHA512 9f11482e68ee01356644fc2a679044a835308f6591b1b3ef6fc079c26e87a5c8c7fa8ba23545e7bf7fc9d37d85151a70cd7bdf4c45c271f67f8a8dcf95a5c440 +DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f +DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild deleted file mode 100644 index 5f4ef806e699..000000000000 --- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="Paperwork plugins" -HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - gui-libs/libhandy - x11-libs/gtk+:3[introspection]" -DEPEND="${RDEPEND}" diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild index 7884f8b08f13..d3f68f150bd4 100644 --- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild +++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild @@ -4,18 +4,17 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 pypi +inherit distutils-r1 DESCRIPTION="Paperwork plugins" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] @@ -24,3 +23,16 @@ RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}] gui-libs/libhandy x11-libs/gtk+:3[introspection]" DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +S=${WORKDIR}/paperwork-${PV}/${PN} + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.2.ebuild new file mode 100644 index 000000000000..9537e32fc587 --- /dev/null +++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) + +inherit distutils-r1 + +DESCRIPTION="Paperwork plugins" +HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2" +S=${WORKDIR}/paperwork-${PV}/${PN} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + gui-libs/libhandy + x11-libs/gtk+:3[introspection]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} diff --git a/app-text/opensp/opensp-1.5.2-r10.ebuild b/app-text/opensp/opensp-1.5.2-r10.ebuild index de279d310010..7d8f3f3e0dd1 100644 --- a/app-text/opensp/opensp-1.5.2-r10.ebuild +++ b/app-text/opensp/opensp-1.5.2-r10.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc nls static-libs test" RESTRICT="!test? ( test )" @@ -50,6 +50,7 @@ src_configure() { # docbook-sgml-utils among other things. #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" strip-flags + filter-lto append-cxxflags -std=gnu++11 diff --git a/app-text/opensp/opensp-1.5.2-r9.ebuild b/app-text/opensp/opensp-1.5.2-r9.ebuild index 744e97d2f629..6f499d123338 100644 --- a/app-text/opensp/opensp-1.5.2-r9.ebuild +++ b/app-text/opensp/opensp-1.5.2-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc nls static-libs test" RESTRICT="!test? ( test )" @@ -49,6 +49,7 @@ src_configure() { # docbook-sgml-utils among other things. #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" strip-flags + filter-lto append-cxxflags -std=gnu++11 diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest index aab74acf7b76..521e0e1cf6fc 100644 --- a/app-text/pandoc-bin/Manifest +++ b/app-text/pandoc-bin/Manifest @@ -1,6 +1,4 @@ -DIST pandoc-3.0.1-linux-amd64.tar.gz 26480576 BLAKE2B f74983b0665b015541e53e1f56666110c6587d7b80761a31bdb9b0da7450d934df93571c3e03ecf9561de5d3f0c4800e5b8fb6ef82f7eb5043c39348b11963a4 SHA512 9424af2647211894370a5f268a42add0c1437568e56b2cfd7f2c9b722216201afd2cbce39ab480652d4bc0b54ec8b0efafc5b0726c8ce68ac3d8a2f73e801dde -DIST pandoc-3.0.1-linux-arm64.tar.gz 28536489 BLAKE2B 38cfd1c6fda336f445ee58ff1b7d63c6edc72d0c87b9e01d724c2db75bb0bb429eb0b076e999b31149bc76921fc58dca47441233dd5c2cf010283c910107a75f SHA512 beb59675be8b6176c577c4a34e0c3a2dc5789d47dfdac51d22470f2e7ab8238ce12b996f5d8b021bc13d8cb4e4aecff428a5c1ed3703a483d06cd97f09705004 -DIST pandoc-3.1-linux-amd64.tar.gz 26480348 BLAKE2B faabb114fde41c51ada10d4bb85ca694f010c2fe30e9f3078d4dc7b2bfb3d35c078bac9b7694de656b1bc4d2558476ead3b2ce2a1085e14a6e5e1ffb18b0a248 SHA512 945f077a2ad8f40546ec83e0a60b0e30b54f066005ef53f92a83e20eb38afda2270a214f35c6c0b2c2c77f53bcfe89cfad56795e58cb834dc2cb1af43b2192ea -DIST pandoc-3.1-linux-arm64.tar.gz 28541921 BLAKE2B c00281dd2b4707b5046a79b83d28d95d6b8bb71076f65904f4c64e9628491ee4e35a9470ca962357dd18776caa9f895fdb8edad1211a3cdf63276c20aa5a9b5f SHA512 4ada611a0748b5607ac97da80925a86bf7f10f723cd3cec276d257d81cf991c6e8d5324bb99f67e5fbf3785558f03e86b2cda6524c3de79f1c68febd17abe635 -DIST pandoc-3.1.1-linux-amd64.tar.gz 26510765 BLAKE2B 5d95137a9d5dabbead7a0a56b67d7f876491e6bb71812958163dae600e6826544d89d5f036c3c6e19b022462014a5c317d73ed59a6955d02c4a5ae70088e2a31 SHA512 f6b99770a173e8ef0136b009a3d646fe60c80133827f6a09c40d1a5a2c59cf757d89fbc1314555c0883fcfc2b8f8b05502e0efdfe57f17b892d13ef49d4e5725 -DIST pandoc-3.1.1-linux-arm64.tar.gz 28579848 BLAKE2B 8933d6d062f51b172bb142a96dd5fcd5057b1c070b90272b8b4f192780e5107b1ef8f143e662a68ac4472b23982dd5def753db0880f15785a40b8a87e116182a SHA512 b420f33114dcf6fa1e9512fdde64d85e00c837eb98c3f3e35b21c49dc8a38dfda3c90ef21aa99108da3349ae1abe27b108c57e969a703e8919105c1918c70aa0 +DIST pandoc-3.1.13-linux-amd64.tar.gz 32092762 BLAKE2B 87e55905550cc6289241b399faa0ae65e913bf1105ba6309a7b7ed63685cc43f267b065c811a335b0774a3b7d6f082f607015f8558b66c8098591513e26c6f4c SHA512 68986e691895770ad51018e5643a02fb848517a1ab68dd0cd99e8511a2a681f9c2bcf1ebc0088c39e1c0f8ebbf4032795b2427696f92ef4a64eab18b7aa588c2 +DIST pandoc-3.1.13-linux-arm64.tar.gz 34869977 BLAKE2B 485a33645c580edf28ebbcee4ce67fa9c7bebb84d4771b0ba23a6b78beb9b92e125d2e8024b061a6b6da839b96969add6f27d420a102ad01305c9a9a120e5478 SHA512 36253cc908c147ee7cda398c52f4ec0a7493e7f0525a3f97cba7cf53e39cf3fd225ecb2f77508fae7c59aa6c79ca85644b9759a0eb0dc918f86fb2049e17858a +DIST pandoc-3.2-linux-amd64.tar.gz 32159847 BLAKE2B 5eec253ba208925fe5cab08151e4ec5566db7cda13db7562d19fceafa1e5b898e5e3174df8c6af0f0f1f6494b48011806f2def55c11460b7bda8b152199ad95c SHA512 b3236fc265c54290e2e913980a1f7a7133a2f3a1f9381c7fbe28437f4c034b6c83edb3ab1ebf39ddb59bea8085c7e97eff4de013b5f30c283464a6d8df780b70 +DIST pandoc-3.2-linux-arm64.tar.gz 34897786 BLAKE2B 656c74f2cb820a0391e462e2e92c44f274cb3a9fc8faee8f5f07d7edec70b74e6484c7842248ae9cf13a5c32c99b0b6be1824247b8b8a565599dea5486ed9d0b SHA512 dd88a7aff58a52d7f69a710dc5e6a457332296a2d9b027247fa94d626ac6a682e16c4b1540c74b4aafc719a0ec7169bd1634f98a6c2e5b904800022f451329f0 diff --git a/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild index 254155b50637..1a9e4cefd9f7 100644 --- a/app-text/pandoc-bin/pandoc-bin-3.0.1.ebuild +++ b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,13 @@ SLOT="0" KEYWORDS="-* amd64 arm64" IUSE="+pandoc-symlink" -RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )" +RDEPEND=" + pandoc-symlink? ( + !${CATEGORY}/${MY_PN} + !app-text/pandoc-cli + !dev-haskell/pandoc + ) +" QA_FLAGS_IGNORED="usr/bin/${PN}" QA_PRESTRIPPED="${QA_FLAGS_IGNORED}" diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.ebuild deleted file mode 100644 index dd2328fec3fb..000000000000 --- a/app-text/pandoc-bin/pandoc-bin-3.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=${PN//-bin/} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Conversion between markup formats (binary package)" -HOMEPAGE="https://pandoc.org/ - https://github.com/jgm/pandoc/" - -BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}" -SRC_URI=" - amd64? ( ${BASE_URI}-linux-amd64.tar.gz ) - arm64? ( ${BASE_URI}-linux-arm64.tar.gz ) -" -S="${WORKDIR}"/${MY_P} - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="-* amd64 ~arm64" -IUSE="+pandoc-symlink" - -RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )" - -QA_FLAGS_IGNORED="usr/bin/${PN}" -QA_PRESTRIPPED="${QA_FLAGS_IGNORED}" - -src_unpack() { - default - - # Manpages are gzipped. - unpack "${S}"/share/man/man1/*.1.gz -} - -src_install() { - exeinto /usr/bin - newexe bin/${MY_PN} ${PN} - dosym ${PN} /usr/bin/pandoc-lua-bin - dosym ${PN} /usr/bin/pandoc-server-bin - - newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1 - newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1 - newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1 - - if use pandoc-symlink ; then - dosym ${PN} /usr/bin/${MY_PN} - dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua - dosym pandoc-server-bin /usr/bin/${MY_PN}-server - - dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1 - dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1 - dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1 - fi -} diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.2.ebuild index f5289c741e6a..6c205a599708 100644 --- a/app-text/pandoc-bin/pandoc-bin-3.1.1.ebuild +++ b/app-text/pandoc-bin/pandoc-bin-3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,13 @@ SLOT="0" KEYWORDS="-* ~amd64 ~arm64" IUSE="+pandoc-symlink" -RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )" +RDEPEND=" + pandoc-symlink? ( + !${CATEGORY}/${MY_PN} + !app-text/pandoc-cli + !dev-haskell/pandoc + ) +" QA_FLAGS_IGNORED="usr/bin/${PN}" QA_PRESTRIPPED="${QA_FLAGS_IGNORED}" diff --git a/app-text/pandoc-cli/Manifest b/app-text/pandoc-cli/Manifest new file mode 100644 index 000000000000..7723b3414780 --- /dev/null +++ b/app-text/pandoc-cli/Manifest @@ -0,0 +1 @@ +DIST pandoc-cli-0.1.1.tar.gz 10814 BLAKE2B 22ecd904a5e8222f68ef5b72c343a6e87448a8f4839092bca0291864cd34389061119223296171447c1570a1667e9257661ec71bbb9acffe4406ccee7dd67181 SHA512 bf05834761d9c78a21b5aaf20a3a1ca24e035e394e22858506d649ec669d8ca72d8578ad9ba2e4d24bc1681dc8faa9e4c1a39fa1d82414da51e6786b23f31a36 diff --git a/app-text/pandoc-cli/metadata.xml b/app-text/pandoc-cli/metadata.xml new file mode 100644 index 000000000000..14cb3430e380 --- /dev/null +++ b/app-text/pandoc-cli/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>haskell@gentoo.org</email> + <name>Gentoo Haskell</name> + </maintainer> + <use> + <flag name="lua">Support custom modifications and conversions with the +pandoc Lua scripting engine.</flag> + <flag name="nightly">Add '-nightly-COMPILEDATE' to the output of '--version'.</flag> + <flag name="server">Include support for running pandoc as an HTTP server.</flag> + </use> + <upstream> + <remote-id type="hackage">pandoc-cli</remote-id> + <remote-id type="github">jgm/pandoc</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild b/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild new file mode 100644 index 000000000000..cc0245832715 --- /dev/null +++ b/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.2.0.9999 + +CABAL_FEATURES="" +inherit haskell-cabal + +DESCRIPTION="Conversion between documentation formats" +HOMEPAGE="https://pandoc.org" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+lua nightly +server" + +RDEPEND=">=dev-haskell/pandoc-3.0:= + dev-haskell/text:= + >=dev-lang/ghc-8.8.1:= + lua? ( >=dev-haskell/hslua-cli-1.4.1:= <dev-haskell/hslua-cli-1.5:= + >=dev-haskell/pandoc-lua-engine-0.2:= <dev-haskell/pandoc-lua-engine-0.3:= + >=dev-haskell/temporary-1.1:= <dev-haskell/temporary-1.4:= ) + server? ( >=dev-haskell/pandoc-server-0.1:= <dev-haskell/pandoc-server-0.2:= + dev-haskell/safe:= + >=dev-haskell/wai-extra-3.0.24:= + dev-haskell/warp:= ) + !<app-text/pandoc-3 +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 +" + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag lua lua) \ + $(cabal_flag nightly nightly) \ + $(cabal_flag server server) +} diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml index 76ff98a64e2e..712e3e36eea3 100644 --- a/app-text/pandoc/metadata.xml +++ b/app-text/pandoc/metadata.xml @@ -4,16 +4,6 @@ <maintainer type="project"> <email>haskell@gentoo.org</email> </maintainer> - <longdescription> - Pandoc is a Haskell library for converting from one markup - format to another, and a command-line tool that uses - this library. It can read markdown and (subsets of) - reStructuredText, HTML, LaTeX and Textile, and it can write - markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook, - OpenDocument, ODT, RTF, MediaWiki, Textile, groff man pages, - plain text, Emacs Org-Mode, EPUB, and S5 and Slidy HTML - slide shows. - </longdescription> <use> <flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag> <flag name="trypandoc">Build trypandoc cgi executable.</flag> diff --git a/app-text/pandoc/pandoc-2.18-r2.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild index c06d323777b5..eced4d6a54ab 100644 --- a/app-text/pandoc/pandoc-2.18-r2.ebuild +++ b/app-text/pandoc/pandoc-2.18-r2.ebuild @@ -78,6 +78,8 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?] trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] >=dev-haskell/wai-extra-3.0.24:=[profile?] ) + !app-text/pandoc-cli + !dev-haskell/pandoc " DEPEND="${RDEPEND} >=dev-haskell/cabal-3.2.0.0 diff --git a/app-text/pandoc/pandoc-3.ebuild b/app-text/pandoc/pandoc-3.ebuild new file mode 100644 index 000000000000..ac0df9c34129 --- /dev/null +++ b/app-text/pandoc/pandoc-3.ebuild @@ -0,0 +1,20 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Metapackage for pandoc version 3" +HOMEPAGE="https://pandoc.org/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND="app-text/pandoc-cli" + +pkg_postinst() { + elog "The pandoc CLI executable has been split off upstream into a new" + elog "package named pandoc-cli, starting with pandoc version 3." + elog "This metapackage ${CATEGORY}/${P} was created to ease upgrading," + elog "but it is recommended to switch to ${CATEGORY}/pandoc-cli." +} diff --git a/app-text/paper-clip/Manifest b/app-text/paper-clip/Manifest new file mode 100644 index 000000000000..267a62cddd78 --- /dev/null +++ b/app-text/paper-clip/Manifest @@ -0,0 +1,2 @@ +DIST paper-clip-5.0.tar.gz 182085 BLAKE2B 07c397218417a5bc87e95aec577465b3f109de4c081bf0f208e0213b71ea7a8f9bac415221a04c8729add7d82adf98c859b60b1b0bd9dbef2db021ee80ff9296 SHA512 2757768414b2177511b61c0a9bde9710b67128a446640bb3ae3bba22a9b30a2b8b036ee32806dc6e4662ffc3d06254006b89e6b63cdc11950b38257e9ea46023 +DIST paper-clip-5.5.tar.gz 183365 BLAKE2B 74b2b893ad7f421eeeb7e6c5bd3921b20b379cebcdb86371a262455fe95a67c0fdddc894b5ecb3da9d7c612a6e9e7ac91ba4d98cc4e2cfb994de388f9f0f8a45 SHA512 880ed9ee81788e1d1f50d0bf5c119ebf2f45a939432f44e363ce0513217a74af7f9fd012f110fc3a38db392341a3529b8785f0130a4bf0fe83f6dbe12d663b19 diff --git a/app-text/paper-clip/metadata.xml b/app-text/paper-clip/metadata.xml new file mode 100644 index 000000000000..e13559a20d75 --- /dev/null +++ b/app-text/paper-clip/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/Diego-Ivan/Paper-Clip/issues/</bugs-to> + <remote-id type="github">Diego-Ivan/Paper-Clip</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/paper-clip/paper-clip-5.0.ebuild b/app-text/paper-clip/paper-clip-5.0.ebuild new file mode 100644 index 000000000000..05bae90c8ab3 --- /dev/null +++ b/app-text/paper-clip/paper-clip-5.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +APP_PN="Paper-Clip" + +inherit gnome2-utils meson vala xdg + +DESCRIPTION="Edit the title, author, keywords and more details of PDF documents" +HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git" +else + SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${APP_PN}-${PV}" + + KEYWORDS="amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +RESTRICT="test" # Only validations, the appdata one fails. + +RDEPEND=" + >=gui-libs/gtk-4.12.5:4 + >=gui-libs/libadwaita-1.4.2:1[introspection,vala] + app-text/poppler:=[cairo,introspection] + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-libs/libportal:=[gtk,introspection,vala] + media-libs/exempi +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + $(vala_depend) + dev-libs/appstream-glib + dev-util/desktop-file-utils +" + +DOCS=( README.md ) + +src_prepare() { + default + vala_setup +} + +src_install() { + meson_src_install + einstalldocs + + # Symlink "pdf-metadata-editor" (old name?) to "${PN}". + dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}" + + mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/app-text/paper-clip/paper-clip-5.5.ebuild b/app-text/paper-clip/paper-clip-5.5.ebuild new file mode 100644 index 000000000000..8a822daeac38 --- /dev/null +++ b/app-text/paper-clip/paper-clip-5.5.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +APP_PN="Paper-Clip" + +inherit gnome2-utils meson vala xdg + +DESCRIPTION="Edit the title, author, keywords and more details of PDF documents" +HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git" +else + SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${APP_PN}-${PV}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +RESTRICT="test" # Only validations, the appdata one fails. + +RDEPEND=" + >=gui-libs/gtk-4.12.5:4 + >=gui-libs/libadwaita-1.4.2:1[introspection,vala] + app-text/poppler:=[cairo,introspection] + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-libs/libportal:=[gtk,introspection,vala] + media-libs/exempi +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + $(vala_depend) + dev-libs/appstream-glib + dev-util/desktop-file-utils +" + +DOCS=( README.md ) + +src_prepare() { + default + vala_setup +} + +src_install() { + meson_src_install + einstalldocs + + # Symlink "pdf-metadata-editor" (old name?) to "${PN}". + dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}" + + mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/app-text/paper-clip/paper-clip-9999.ebuild b/app-text/paper-clip/paper-clip-9999.ebuild new file mode 100644 index 000000000000..8a822daeac38 --- /dev/null +++ b/app-text/paper-clip/paper-clip-9999.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +APP_PN="Paper-Clip" + +inherit gnome2-utils meson vala xdg + +DESCRIPTION="Edit the title, author, keywords and more details of PDF documents" +HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git" +else + SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${APP_PN}-${PV}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +RESTRICT="test" # Only validations, the appdata one fails. + +RDEPEND=" + >=gui-libs/gtk-4.12.5:4 + >=gui-libs/libadwaita-1.4.2:1[introspection,vala] + app-text/poppler:=[cairo,introspection] + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-libs/libportal:=[gtk,introspection,vala] + media-libs/exempi +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + $(vala_depend) + dev-libs/appstream-glib + dev-util/desktop-file-utils +" + +DOCS=( README.md ) + +src_prepare() { + default + vala_setup +} + +src_install() { + meson_src_install + einstalldocs + + # Symlink "pdf-metadata-editor" (old name?) to "${PN}". + dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}" + + mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest index 60723d0c259e..3bb713c3cb5a 100644 --- a/app-text/paperwork-backend/Manifest +++ b/app-text/paperwork-backend/Manifest @@ -1,2 +1,4 @@ -DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f -DIST paperwork-backend-2.1.2.tar.gz 1346499 BLAKE2B daf8c6dee97b0bdf814bcf7e9c83a80ab878250994a770f5fa6be4c0b4e23f0def51e22c0a8652a19e9294f3fab0b522b25c2a91c306ad760d568faf76a78610 SHA512 0156baa658a9fe26680bf6d146af3f03b98da307ee1cfaf4803f8b70a2ffdb0010fe23c4d4f9b5a572919c4be94a1aad4fd070220849248cdb18c5b1c4bc478b +DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f +DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b +DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b +DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch new file mode 100644 index 000000000000..01eb2a6154b0 --- /dev/null +++ b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch @@ -0,0 +1,52 @@ +From c9430b844fbcedc9119e3d464f5f0c85feb7b197 Mon Sep 17 00:00:00 2001 +From: Jerome Flesch <jflesch@openpaper.work> +Date: Sun, 4 Feb 2024 20:33:27 +0100 +Subject: [PATCH] Backend/docexport PDF: Workaround Cairo bug that causes + occasional crashes when exporting to generated PDF. + +Closes #942 +--- + .../src/paperwork_backend/docexport/pdf.py | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/paperwork-backend/src/paperwork_backend/docexport/pdf.py b/paperwork-backend/src/paperwork_backend/docexport/pdf.py +index 160e60710..befded73c 100644 +--- a/paperwork-backend/src/paperwork_backend/docexport/pdf.py ++++ b/paperwork-backend/src/paperwork_backend/docexport/pdf.py +@@ -115,6 +115,8 @@ class PdfCreator(object): + ) + self.pdf_context = cairo.Context(self.pdf_surface) + ++ self.gc_protection = [] # WORKAROUND(Jflesch): Cairo crash ++ + def set_page_size(self, img_size): + # portrait or landscape + if (img_size[0] < img_size[1]): +@@ -187,6 +189,16 @@ class PdfCreator(object): + "pillow_to_surface", img, + intermediate="jpeg", quality=int(self.quality * 100) + ) ++ # WORKAROUND(Jflesch): ++ # If Cairo supports JPEG embedding, we use ++ # cairo.ImageSurface.set_mime_data() instead of the usual Cairo ++ # surface functions to draw the image. It seems this function does ++ # not increment the ref counter of the surface object ++ # --> the Python GC tends to collect it while Cairo is still going ++ # to use it to generate the PDF. ++ # --> we have to keep a reference on it ourselves, until the page has ++ # been generated. ++ self.gc_protection.append(img_surface) + + self.pdf_context.save() + try: +@@ -199,6 +211,7 @@ class PdfCreator(object): + + def next_page(self): + self.pdf_context.show_page() ++ self.gc_protection = [] # WORKAROUND(Jflesch): Cairo crash + + def finish(self): + self.pdf_surface.flush() +-- +GitLab + diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch new file mode 100644 index 000000000000..9add28626a23 --- /dev/null +++ b/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch @@ -0,0 +1,55 @@ +From abcebfe9714644d4e259e53b10e0e9417b5b864f Mon Sep 17 00:00:00 2001 +From: Jerome Flesch <jflesch@openpaper.work> +Date: Sun, 21 Apr 2024 13:31:03 +0200 +Subject: [PATCH] backend/guesswork/labels/sklearn: fix use of + scipy.sparse.hstack() + numpy.zeros() + +Closes #1111 +--- + .../paperwork_backend/guesswork/label/sklearn/__init__.py | 5 +++-- + paperwork-backend/src/paperwork_backend/model/fake.py | 6 ++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py +index b2af4350..8633211f 100644 +--- a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py ++++ b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py +@@ -191,7 +191,8 @@ class UpdatableVectorizer(object): + ) + if required_padding > 0: + doc_vector = numpy.hstack([ +- doc_vector, numpy.zeros((required_padding,)) ++ doc_vector, ++ numpy.zeros((required_padding,)) + ]) + if sum_features is None: + sum_features = doc_vector +@@ -339,7 +340,7 @@ class Corpus(object): + if required_padding > 0: + doc_vector = scipy.sparse.hstack([ + scipy.sparse.csr_matrix(doc_vector), +- numpy.zeros((required_padding,)) ++ numpy.zeros((1, required_padding)) + ]) + else: + doc_vector = scipy.sparse.csr_matrix(doc_vector) +diff --git a/paperwork-backend/src/paperwork_backend/model/fake.py b/paperwork-backend/src/paperwork_backend/model/fake.py +index 29beae97..f06fe18e 100644 +--- a/paperwork-backend/src/paperwork_backend/model/fake.py ++++ b/paperwork-backend/src/paperwork_backend/model/fake.py +@@ -125,6 +125,12 @@ class Plugin(openpaperwork_core.PluginBase): + if doc['url'] == doc_url: + out.update(doc['labels']) + ++ def doc_has_labels_by_url(self, doc_url): ++ for doc in self.docs: ++ if doc['url'] == doc_url: ++ return True if len(doc["labels"]) > 0 else None ++ return None ++ + def doc_add_label_by_url(self, doc_url, label, color=None): + if color is None: + all_labels = set() +-- +GitLab + diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild index f450c1442c0d..bedb4d1adafb 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild @@ -1,15 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Backend part of Paperwork (Python API, no UI)" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +# Update from release hash at: +# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags +REL_HASH="0bea4054" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2 + https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -20,31 +25,39 @@ RDEPEND=" app-text/openpaperwork-gtk[${PYTHON_USEDEP}] app-text/poppler[introspection] dev-python/distro[${PYTHON_USEDEP}] - dev-python/Levenshtein[${PYTHON_USEDEP}] - dev-python/natsort[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} + dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext test? ( dev-python/libpillowfight[${PYTHON_USEDEP}] media-libs/libinsane ) " +S=${WORKDIR}/paperwork-${PV}/${PN} distutils_enable_tests unittest +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + src_prepare() { - # remove dep to allow both old python-Levenshtein and new - # Levenshtein packages - sed -i -e '/python-Levenshtein/d' setup.py || die - distutils-r1_src_prepare + default + cd "${WORKDIR}"/paperwork-${PV} || die + eapply "${FILESDIR}"/${P}-cairo_workaround.patch +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile } diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild index 2e602b216a83..738513e7b1a6 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild @@ -1,16 +1,21 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 pypi +inherit distutils-r1 DESCRIPTION="Backend part of Paperwork (Python API, no UI)" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +# Update from release hash at: +# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags +REL_HASH="3f51346f" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2 + https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz" +S=${WORKDIR}/paperwork-${PV}/${PN} LICENSE="GPL-3" SLOT="0" @@ -21,20 +26,20 @@ RDEPEND=" app-text/openpaperwork-gtk[${PYTHON_USEDEP}] app-text/poppler[introspection] dev-python/distro[${PYTHON_USEDEP}] - dev-python/Levenshtein[${PYTHON_USEDEP}] - dev-python/natsort[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} + dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext test? ( dev-python/libpillowfight[${PYTHON_USEDEP}] media-libs/libinsane @@ -43,9 +48,16 @@ BDEPEND=" distutils_enable_tests unittest +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + src_prepare() { - # remove dep to allow both old python-Levenshtein and new - # Levenshtein packages - sed -i -e '/python-Levenshtein/d' setup.py || die - distutils-r1_src_prepare + default + cd "${WORKDIR}"/paperwork-${PV} || die + eapply "${FILESDIR}"/${P}-scipy.patch +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile } diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest index f0fe9f9e87fe..3bb713c3cb5a 100644 --- a/app-text/paperwork/Manifest +++ b/app-text/paperwork/Manifest @@ -1,2 +1,4 @@ -DIST paperwork-2.1.1.tar.gz 5886436 BLAKE2B 5fd5a8a5d45a39298d3bc905360544f695c8c1ffa6e4bac56f3ec7bb9f31842aa71e2dadf0c8f072da59065f15fe5e768e42b8a1574722dfb99f66cc24c5b038 SHA512 e2164dc54eacb6153182c073e15f0605ec2131e17fa1c508d4923d37c1848c286d36807994ce07de99fb9cc5da012c111d84768c2c7c876dfb163811995b10c0 -DIST paperwork-2.1.2.tar.gz 5907738 BLAKE2B 9b376e5ed13d69f0664c98d43a41cf876d21d46c31129b50c5c44e6d4279b04d302e7527906dad49b4416f698dfe9f5bafbc5130f41463efb5ca49fed0da308f SHA512 0f75fba66a0b9ed1b4b28caf9dbbcc4a0b7e68fa24f5faa40251c3f39c610be372f89a2f4e2e6807babd930bfeb45cc82216761f0da042deac991d779fdfdfbb +DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f +DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b +DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b +DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76 diff --git a/app-text/paperwork/paperwork-2.1.2.ebuild b/app-text/paperwork/paperwork-2.2.1.ebuild index 1e1cb20f2bb5..9124bd50a325 100644 --- a/app-text/paperwork/paperwork-2.1.2.ebuild +++ b/app-text/paperwork/paperwork-2.2.1.ebuild @@ -4,17 +4,21 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 xdg pypi +inherit distutils-r1 xdg DESCRIPTION="a personal document manager for scanned documents (and PDFs)" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" +# Update from release hash at: +# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags +REL_HASH="0bea4054" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2 + https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}] @@ -22,19 +26,29 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] dev-python/libpillowfight[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] + >=dev-python/pyxdg-0.25[${PYTHON_USEDEP}] media-libs/libinsane x11-libs/libnotify[introspection]" DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +S=${WORKDIR}/paperwork-${PV}/${PN}-gtk + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} src_prepare() { - # remove dep to allow both old python-Levenshtein and new - # Levenshtein packages - sed -i -e '/python-Levenshtein/d' setup.py || die - distutils-r1_src_prepare + default + cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/ +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile } python_install_all() { diff --git a/app-text/paperwork/paperwork-2.1.1-r1.ebuild b/app-text/paperwork/paperwork-2.2.2.ebuild index 2d9d09f4d008..ee6ce4a56117 100644 --- a/app-text/paperwork/paperwork-2.1.1-r1.ebuild +++ b/app-text/paperwork/paperwork-2.2.2.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 xdg DESCRIPTION="a personal document manager for scanned documents (and PDFs)" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +# Update from release hash at: +# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags +REL_HASH="3f51346f" +REL_HASH="0bea4054" +SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2 + https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz" +S=${WORKDIR}/paperwork-${PV}/${PN}-gtk LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}] @@ -21,19 +28,27 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] dev-python/libpillowfight[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] + >=dev-python/pyxdg-0.25[${PYTHON_USEDEP}] media-libs/libinsane x11-libs/libnotify[introspection]" DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + sys-apps/which + sys-devel/gettext" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} src_prepare() { - # remove dep to allow both old python-Levenshtein and new - # Levenshtein packages - sed -i -e '/python-Levenshtein/d' setup.py || die - distutils-r1_src_prepare + default + cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/ +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile } python_install_all() { diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild index bf4df11e9b57..5a34c3661417 100644 --- a/app-text/paps/paps-0.6.8-r2.ebuild +++ b/app-text/paps/paps-0.6.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Unicode-aware text to PostScript converter" HOMEPAGE="http://paps.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest index 0b264609101a..635713743a4f 100644 --- a/app-text/pdfarranger/Manifest +++ b/app-text/pdfarranger/Manifest @@ -1,2 +1,2 @@ -DIST pdfarranger-1.9.1.tar.gz 279138 BLAKE2B 18ac9a63eff5455e395b3c126adea590b230b1884ee64e08eeaf4951c663787a827e42db9475632210b2ca3875a23e1718fdfc1b4309c5babc7ce31b6e188829 SHA512 ba60744f1b7c96ca9f86ed75cc5ea1b3df41af162048550a916a96972b0e987acfbdc3c46693adc239fdad5569369f24555e157a2f56936374ba132ffc8cbde6 -DIST pdfarranger-1.9.2.tar.gz 280531 BLAKE2B 6a7a8e73e701fe9bbb5bd1f94411003dfb16966ad28522820a27e7ab554b3c2679eec3f4a08332bd58dc1c1cafd620e1daef2f39cb0f6dc5589d7bd5eb293650 SHA512 c22cc753e2606d90913970ce57462b4aca7c41fa6a9b6ece76b618800cad12bce808aba4a6fba2ef9698fda209e11799f30d091a88c9beb2e80a09ac7df51cb8 +DIST pdfarranger-1.10.0.tar.gz 303125 BLAKE2B 126b47dfdabbe6d75331788dd891e1d8136a70b98e70601e19fd47fc7e3d81c350eb1fc8866a3a09db88b2b760ef964e7a01cf233464440c81a6dc5462101592 SHA512 92aa53a402d2f4c82a7f99f2acc1c328f71ad18835e524588e0f011f3ba8b074bf425ed881bb5f9ce3020833ce37cc3c301fd90b8931b44f909c8647bc1b09af +DIST pdfarranger-1.10.1.tar.gz 304298 BLAKE2B 9762864072d4d75cf7e4a65f9ec9db040eef53ee97b2867340bc427d350f4b9b9fbc321520bf2e47d1c2ab2c866c8ceaf56b9806378bcdff4897ebc7f6c1e2ee SHA512 a0bebb569570656217e4f9432c0a3fbdb7f441b7ee04dc82f31e449befec19a1fa1045ef7ce95dc75e9feb14fad9a0265307efdf221c8a727091c05348554427 diff --git a/app-text/pdfarranger/pdfarranger-1.9.1-r1.ebuild b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild index 44ebd2bc40e7..44ebd2bc40e7 100644 --- a/app-text/pdfarranger/pdfarranger-1.9.1-r1.ebuild +++ b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild diff --git a/app-text/pdfarranger/pdfarranger-1.9.2.ebuild b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild index 44893f0ef11c..5bb0d5ee7a7a 100644 --- a/app-text/pdfarranger/pdfarranger-1.9.2.ebuild +++ b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 optfeature xdg desktop DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages" @@ -14,21 +14,18 @@ SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" RDEPEND=" app-text/poppler[introspection,cairo] - >=dev-python/pikepdf-6.0.0[${PYTHON_USEDEP}] + dev-python/pikepdf[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP},lcms] dev-python/pygobject:3[${PYTHON_USEDEP},cairo] dev-python/python-dateutil[${PYTHON_USEDEP}] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] " -DEPEND="${RDEPEND} - dev-python/python-distutils-extra[${PYTHON_USEDEP}] - dev-util/intltool -" +DEPEND="${RDEPEND}" src_install() { distutils-r1_src_install diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest index 1429103931c6..bc4be7f0c4ab 100644 --- a/app-text/pdfminer/Manifest +++ b/app-text/pdfminer/Manifest @@ -1,2 +1,2 @@ -DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4 DIST pdfminer-20220506.tar.gz 10853104 BLAKE2B b6008db789973fb69537801b8e928761bd0a949cc72ddf380fd71b6373913f6a689b71bee159e6991e99c196b7e8a1fac5530d2bf9c577e53b8b556bed00b85a SHA512 b81916c70f22f3408cf41a50d35937f950ee6205f59fa03603bc7a78d1b1b037311ebaf5661f6d46b9d4190f2f56189fc28b714463dc5854328c14f97fbc28c4 +DIST pdfminer.six-20221105.gh.tar.gz 10857730 BLAKE2B dd9282bfc3c636676f087e6ffc2cfb137f66eee18427f08de488c7bdc13bd27b6cc674d3b75c93d1566668272ee4111e3347664a70152bd4b2f7e4e63664d01b SHA512 72034a75005c91100274f86baa4c8884caad86aacf94ca9d0d5a51d8b3c772aa0bcd766416bed9e26df00bd9a2be585649eaa24321735f532e40a3871e19c6df diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild deleted file mode 100644 index 1bd32b345c0f..000000000000 --- a/app-text/pdfminer/pdfminer-20191020.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) -inherit distutils-r1 - -DESCRIPTION="Python tool for extracting information from PDF documents" -HOMEPAGE="https://euske.github.io/pdfminer/ https://pypi.org/project/pdfminer/" -SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc examples" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]" - -python_compile_all() { - use examples && emake -C samples all -} - -python_test() { - emake test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/. ) - use examples && dodoc -r samples - distutils-r1_python_install_all -} diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20220506.ebuild index ae8be33cd0b0..cbc3e5638e44 100644 --- a/app-text/pdfminer/pdfminer-20220506.ebuild +++ b/app-text/pdfminer/pdfminer-20220506.ebuild @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="doc examples" -RDEPEND=">=dev-python/charset_normalizer-2.0.0[${PYTHON_USEDEP}] +RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}] >=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]" distutils_enable_tests pytest diff --git a/app-text/pdfminer/pdfminer-20221105.ebuild b/app-text/pdfminer/pdfminer-20221105.ebuild new file mode 100644 index 000000000000..b02a4d3e19e6 --- /dev/null +++ b/app-text/pdfminer/pdfminer-20221105.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +MY_P="${PN}.six-${PV}" +DESCRIPTION="Python tool for extracting information from PDF documents" +HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/" +# Release tarballs lack tests +SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.gh.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="doc examples" + +RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}] + >=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]" + +distutils_enable_sphinx docs/source "dev-python/sphinx-argparse" +distutils_enable_tests pytest + +python_prepare_all() { + sed -i -e "s:__VERSION__:${PV}:g" pdfminer/__init__.py || die + distutils-r1_python_prepare_all +} + +python_install_all() { + use examples && dodoc -r samples + distutils-r1_python_install_all +} diff --git a/app-text/pdfpc/Manifest b/app-text/pdfpc/Manifest new file mode 100644 index 000000000000..37d8526ade6b --- /dev/null +++ b/app-text/pdfpc/Manifest @@ -0,0 +1 @@ +DIST pdfpc-4.6.0.tar.gz 7766521 BLAKE2B 3e8914333a0781d3d750ab71d58c8af1451ce5ab321ecc0639ddcf377cae9a0c62290696455516ce1d70f4ae3ffc5889fe910ced0399787e6a40c8ae76e1f75e SHA512 4ec69cbe21fb8bbb3e381229c391133f92e76b610e1fdf1cffa2c9fa9997ccc879eaef2a6837b34d1e635cdd07c4d0ce98de03fd7ece431a8f35493f0f7d7651 diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch new file mode 100644 index 000000000000..9767dc2a8093 --- /dev/null +++ b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch @@ -0,0 +1,59 @@ +https://github.com/pdfpc/pdfpc/issues/672 +https://bugs.gentoo.org/904241 + +commit a6501085b3e94eb4a01db18fe9dc15d51fcde3a3 +Author: Evgeny Stambulchik <fnevgeny@gmail.com> +Date: Sat, 11 Feb 2023 23:04:19 +0200 + + Skip MOVIE actions when configured with -DMOVIES + +--- a/src/classes/action/link_action.vala ++++ b/src/classes/action/link_action.vala +@@ -47,6 +47,7 @@ + this.action = mapping.action.copy(); + } + ++#if MOVIES + /** + * Find movie on the current slide by its filename; there seems to be + * no better way with the current Glib Poppler bindings. +@@ -71,6 +72,7 @@ + + return null; + } ++#endif + + /** + * Create from the LinkMapping if the link is an internal link to a named +@@ -91,6 +93,7 @@ + return new_obj as ActionMapping; + } + break; ++#if MOVIES + case Poppler.ActionType.MOVIE: + unowned var movie_action = (Poppler.ActionMovie*) mapping.action; + var movie = movie_action.movie; +@@ -100,6 +103,7 @@ + return new_obj as ActionMapping; + } + break; ++#endif + default: + break; + } +@@ -167,6 +171,7 @@ + this.controller.switch_to_slide_number(slide_number); + + break; ++#if MOVIES + case Poppler.ActionType.MOVIE: + unowned var action = (Poppler.ActionMovie*) this.action; + var movie = action.movie; +@@ -192,6 +197,7 @@ + } + } + break; ++#endif + default: + return false; + } diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch new file mode 100644 index 000000000000..9aff761b471f --- /dev/null +++ b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch @@ -0,0 +1,31 @@ +https://github.com/pdfpc/pdfpc/issues/686 +https://bugs.gentoo.org/904970 + +commit 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768 +Author: Evgeny Stambulchik <fnevgeny@gmail.com> +Date: Tue, 25 Apr 2023 16:11:25 +0300 + + Create Lists of nullable types + +--- a/src/classes/drawings/drawing_commands.vala ++++ b/src/classes/drawings/drawing_commands.vala +@@ -54,8 +54,8 @@ + } + + public void clear() { +- this.drawing_commands = new List<DrawingCommand>(); +- this.redo_commands = new List<DrawingCommand>(); ++ this.drawing_commands = new List<DrawingCommand?>(); ++ this.redo_commands = new List<DrawingCommand?>(); + } + + public void add_line(bool is_eraser, +@@ -70,7 +70,7 @@ + + // After adding a new line you can no longer redo the old + // path. +- this.redo_commands = new List<DrawingCommand>(); // clear ++ this.redo_commands = new List<DrawingCommand?>(); // clear + + bool new_path = true; + double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch new file mode 100644 index 000000000000..2428314dd2fe --- /dev/null +++ b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch @@ -0,0 +1,22 @@ +--- pdfpc-4.6.0/src/CMakeLists.txt ++++ pdfpc-4.6.0/src/CMakeLists.txt +@@ -30,8 +30,8 @@ + endif () + + if (MDVIEW) +- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0) +- set(MDVIEW_PACKAGES webkit2gtk-4.0) ++ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.1) ++ set(MDVIEW_PACKAGES webkit2gtk-4.1) + set(EXTRA_VALA_OPTIONS ${EXTRA_VALA_OPTIONS} -D MDVIEW) + endif () + +@@ -136,7 +136,7 @@ + vala_precompile(VALA_C + ${VALA_SRC} + PACKAGES +- webkit2gtk-4.0 ++ webkit2gtk-4.1 + json-glib-1.0 + gio-2.0 + gee-0.8 diff --git a/app-text/pdfpc/metadata.xml b/app-text/pdfpc/metadata.xml new file mode 100644 index 000000000000..780c14d9b256 --- /dev/null +++ b/app-text/pdfpc/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ulm@gentoo.org</email> + </maintainer> + <use> + <flag name="gstreamer"> + Compile support for movie playback (<pkg>media-libs/gstreamer</pkg>) + </flag> + <flag name="soup"> + Compile support for REST server (<pkg>net-libs/libsoup</pkg>) + </flag> + <flag name="webkit"> + Enable viewing Markdown notes (<pkg>net-libs/webkit-gtk</pkg>) + </flag> + </use> + <upstream> + <remote-id type="github">pdfpc/pdfpc</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild new file mode 100644 index 000000000000..f06648747739 --- /dev/null +++ b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased + +#COMMIT_ID="" + +inherit cmake vala + +DESCRIPTION="Presenter console with multi-monitor support for PDF files" +HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 +elif [[ ${PV} == *_p* ]]; then + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT_ID}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+gstreamer soup webkit" + +RDEPEND=" + app-text/discount:= + app-text/poppler:=[cairo] + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:0.8= + gnome-base/librsvg + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-gtk:1.0= + media-plugins/gst-plugins-cairo:1.0= + ) + webkit? ( net-libs/webkit-gtk:4.1= ) + !webkit? ( soup? ( + media-gfx/qrencode + net-libs/libsoup:2.4 + ) ) +" +DEPEND="${RDEPEND}" +BDEPEND="$(vala_depend)" + +DOCS=( + CHANGELOG.rst + FAQ.rst + README.rst + SUPPORT.rst +) + +src_prepare() { + eapply "${FILESDIR}/${P}-no-movies.patch" + eapply "${FILESDIR}/${P}-vala-0.56.7.patch" + use webkit && eapply "${FILESDIR}/${P}-webkit2gtk-4.1.patch" + + cmake_src_prepare + vala_setup + sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \ + cmake/vala/FindVala.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DMOVIES=$(usex gstreamer on off) + -DMDVIEW=$(usex webkit on off) + -DCMAKE_VERBOSE_MAKEFILE=TRUE + ) + + if use webkit; then + use soup && ewarn \ + "USE flag \"webkit\" overrides \"soup\"; disabling REST support." + mycmakeargs+=( -DREST=off ) + else + mycmakeargs+=( -DREST=$(usex soup on off) ) + fi + + cmake_src_configure +} diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild index 14d6940316f5..83d06fbb2794 100644 --- a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild +++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,10 +6,10 @@ inherit flag-o-matic DESCRIPTION="generator of sandwich OCR pdf files" HOMEPAGE="http://www.tobias-elze.de/pdfsandwich" -SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/pdfsandwich/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" SLOT="0" IUSE="png" @@ -27,6 +27,7 @@ DOCS=( changelog ) PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) QA_FLAGS_IGNORED="/usr/bin/${PN}" +QA_TEXTRELS="/usr/bin/${PN}" src_prepare() { sed -i \ diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest index 099c1f3a4b14..028f6a4638e8 100644 --- a/app-text/pdftk/Manifest +++ b/app-text/pdftk/Manifest @@ -1 +1 @@ -DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6 +DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21 diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3-r2.ebuild index 842fda08ceb1..fce7d1225234 100644 --- a/app-text/pdftk/pdftk-3.3.3.ebuild +++ b/app-text/pdftk/pdftk-3.3.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,22 +11,19 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A port of pdftk into java" HOMEPAGE="https://gitlab.com/pdftk-java/pdftk" -SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.gz" +SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2" +S="${WORKDIR}/${PN}-v${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc64 x86" +# Switch back to bcprov:0 once pdftk updates its bcprov dependency. CP_DEPEND=" - dev-java/bcprov:0 + dev-java/bcprov:1.74 dev-java/commons-lang:3.6 " -# Compile dependencies -# POM: pom.xml -# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!! -# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4 - DEPEND=" >=virtual/jdk-1.8:* ${CP_DEPEND} @@ -42,18 +39,15 @@ RDEPEND=" DOCS=( CHANGELOG.md README.md ) -S="${WORKDIR}/${PN}-v${PV}" - -JAVA_LAUNCHER_FILENAME="${PN}" JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk" -JAVA_SRC_DIR="java" JAVA_RESOURCE_DIRS="resources/java" +JAVA_SRC_DIR="java" JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules" JAVA_TEST_SRC_DIR="test" src_prepare() { - default + java-pkg-2_src_prepare mkdir resources || die cp -r {,resources/}java || die rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die @@ -80,3 +74,8 @@ src_test() { ) java-pkg-simple_src_test } + +src_install() { + java-pkg-simple_src_install + doman "${PN}.1" +} diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild index 01bda985c416..5054bbcc6777 100644 --- a/app-text/pdftk/pdftk-9999.ebuild +++ b/app-text/pdftk/pdftk-9999.ebuild @@ -1,16 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit java-pkg-2 java-ant-2 +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3" +JAVA_TESTING_FRAMEWORKS="junit-4" -DESCRIPTION="gcj-free version of pdftk written in Java" +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A port of pdftk into java" HOMEPAGE="https://gitlab.com/pdftk-java/pdftk" if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/" + S="${WORKDIR}/pdftk-${PV}" else SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" @@ -20,23 +25,64 @@ fi LICENSE="GPL-2" SLOT="0" -JAVA_PKG_STRICT="yes" -EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6" -JAVA_ANT_REWRITE_CLASSPATH="true" +# Switch back to bcprov:0 once pdftk updates its bcprov dependency. +CP_DEPEND=" + dev-java/bcprov:1.74 + dev-java/commons-lang:3.6 +" -CDEPEND=" - dev-java/bcprov:0 - dev-java/commons-lang:3.6" +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} + test? ( + app-text/poppler[cairo] + dev-java/system-rules:0 + ) +" RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + ${CP_DEPEND}" -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:*" +DOCS=( CHANGELOG.md README.md ) + +JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk" +JAVA_RESOURCE_DIRS="resources/java" +JAVA_SRC_DIR="java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules" +JAVA_TEST_SRC_DIR="test" + +src_prepare() { + java-pkg-2_src_prepare + mkdir resources || die + cp -r {,resources/}java || die + rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die + find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die +} + +src_test() { + # some tests seem to need special treatment + einfo "Runnig first test" + JAVA_TEST_RUN_ONLY=( + com.gitlab.pdftk_java.CatTest + com.gitlab.pdftk_java.DataTest + com.gitlab.pdftk_java.FormTest + com.gitlab.pdftk_java.MultipleTest + ) + java-pkg-simple_src_test + einfo "Running second test" + JAVA_TEST_RUN_ONLY=() + JAVA_TEST_EXCLUDES=( + com.gitlab.pdftk_java.CatTest + com.gitlab.pdftk_java.DataTest + com.gitlab.pdftk_java.FormTest + com.gitlab.pdftk_java.MultipleTest + ) + java-pkg-simple_src_test +} src_install() { - java-pkg_newjar "build/jar/pdftk.jar" - java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk + java-pkg-simple_src_install + doman "${PN}.1" } diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest index 38befada2e46..5d37f3e38a90 100644 --- a/app-text/pelican/Manifest +++ b/app-text/pelican/Manifest @@ -1 +1,3 @@ DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b +DIST pelican-4.9.0.gh.tar.gz 1374399 BLAKE2B 2fa91ff9b5ddacac1fd64d9325ccb1fadb9bbfaa9c6098920a43a576f3d8d7be31a98b5250b2ea10bee63993d8b9bb72fdebdf9d57d0518d1f4bddef705e2804 SHA512 a50d0fbad816fa4a73eb94d0aa15cf5f9321ed2bdb50addbebbf0024f2fc7fd73ab94b314b5821068d552dcd1b11a54ca6511117aac732340156f2361a7e832c +DIST pelican-4.9.1.gh.tar.gz 1374443 BLAKE2B d9dfa234b0f19cd02ccc8867e5b4f6e0444300692d69001baf23943230f27f8a7bc91e98e5c4c3cd194abadf8fb140c0e1a0c3beb39e5d288113ecc4e487c6a6 SHA512 70b7efd7a38dc2069b1eb9141647fa80bf959de36936ad7b4d38407be7e029fc788ef9b9f297d99e5dc6cad67d58fe6ff97f9b542db7e0a9c23e2907d4604e21 diff --git a/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch b/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch new file mode 100644 index 000000000000..c7d917cdad6e --- /dev/null +++ b/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/863962 +https://git.alpinelinux.org/aports/tree/testing/py3-pelican/no-locales-for-tests.patch + +--- a/pelican/tests/support.py ++++ b/pelican/tests/support.py +@@ -150,15 +150,7 @@ + + + def locale_available(locale_): +- old_locale = locale.setlocale(locale.LC_TIME) +- +- try: +- locale.setlocale(locale.LC_TIME, str(locale_)) +- except locale.Error: +- return False +- else: +- locale.setlocale(locale.LC_TIME, old_locale) +- return True ++ return False + + + def can_symlink(): diff --git a/app-text/pelican/pelican-4.8.0.ebuild b/app-text/pelican/pelican-4.8.0.ebuild index c39c92fcc7e0..9997cceed563 100644 --- a/app-text/pelican/pelican-4.8.0.ebuild +++ b/app-text/pelican/pelican-4.8.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 optfeature diff --git a/app-text/pelican/pelican-4.9.0.ebuild b/app-text/pelican/pelican-4.9.0.ebuild new file mode 100644 index 000000000000..a8ec456458a6 --- /dev/null +++ b/app-text/pelican/pelican-4.9.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=pdm-backend +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files" +HOMEPAGE=" + https://getpelican.com/ + https://pypi.org/project/pelican/ +" +SRC_URI=" + https://github.com/getpelican/pelican/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="doc examples markdown" + +RDEPEND=" + >=dev-python/docutils-0.20.1[${PYTHON_USEDEP}] + >=dev-python/blinker-1.7.0[${PYTHON_USEDEP}] + >=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.16.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/pytz-2020.1[${PYTHON_USEDEP}] + >=dev-python/rich-13.6.0[${PYTHON_USEDEP}] + >=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}] + >=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + >=dev-python/markdown-3.1[${PYTHON_USEDEP}] + dev-python/typogrify[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + )" + +DOCS=( README.rst ) + +EPYTEST_DESELECT=( + # Needs investigation, we weren't running tests at all before + pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning + pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works + pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works +) + +distutils_enable_tests pytest + +python_compile_all() { + use doc && emake -C docs html +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + if use examples; then + docinto /usr/share/doc/${PF} + docompress -x /usr/share/doc/${PF}/samples + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify +} diff --git a/app-text/pelican/pelican-4.9.1.ebuild b/app-text/pelican/pelican-4.9.1.ebuild new file mode 100644 index 000000000000..34f7a5915fe5 --- /dev/null +++ b/app-text/pelican/pelican-4.9.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=pdm-backend +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files" +HOMEPAGE=" + https://getpelican.com/ + https://pypi.org/project/pelican/ +" +SRC_URI=" + https://github.com/getpelican/pelican/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="doc examples markdown" + +RDEPEND=" + >=dev-python/docutils-0.20.1[${PYTHON_USEDEP}] + >=dev-python/blinker-1.7.0[${PYTHON_USEDEP}] + >=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.16.1[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/pytz-2020.1[${PYTHON_USEDEP}] + >=dev-python/rich-13.6.0[${PYTHON_USEDEP}] + >=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}] + >=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )" +BDEPEND=" + test? ( + >=dev-python/markdown-3.1[${PYTHON_USEDEP}] + dev-python/typogrify[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + )" + +DOCS=( README.rst ) + +# For musl, bug 863962 +PATCHES=( "${FILESDIR}/${PN}-4.9.1-no-locales-for-tests.patch" ) + +EPYTEST_DESELECT=( + # Needs investigation, we weren't running tests at all before + pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning + pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works + pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works + + # For musl, bug 863962 + # Per Alpine https://git.alpinelinux.org/aports/tree/testing/py3-pelican/APKBUILD + pelican/tests/test_contents.py::TestPage::test_datetime +) + +distutils_enable_tests pytest + +python_compile_all() { + use doc && emake -C docs html +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + if use examples; then + docinto /usr/share/doc/${PF} + docompress -x /usr/share/doc/${PF}/samples + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify +} diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml index beac02a9af14..274f2314308e 100644 --- a/app-text/pinfo/metadata.xml +++ b/app-text/pinfo/metadata.xml @@ -5,4 +5,7 @@ <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> + <upstream> + <remote-id type="github">baszoetekouw/pinfo</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild index 895fff2840ad..12df4b647966 100644 --- a/app-text/pinfo/pinfo-0.6.13.ebuild +++ b/app-text/pinfo/pinfo-0.6.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} sys-apps/texinfo - sys-devel/bison + app-alternatives/yacc virtual/pkgconfig nls? ( sys-devel/gettext ) " @@ -41,6 +41,8 @@ src_prepare() { } src_configure() { + # The following line can be dropped once https://github.com/baszoetekouw/pinfo/pull/35 + # is merged. append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk() econf \ diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild deleted file mode 100644 index 94bcef91cbb1..000000000000 --- a/app-text/pinfo/pinfo-99999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 - -DESCRIPTION="Hypertext info and man viewer based on (n)curses" -HOMEPAGE="https://github.com/baszoetekouw/pinfo" -EGIT_REPO_URI="https://github.com/baszoetekouw/pinfo.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="nls readline" - -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - nls? ( virtual/libintl ) -" - -DEPEND=" - ${RDEPEND} - sys-apps/texinfo - sys-devel/bison - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch - "${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch -) - -src_prepare() { - default - - sed -i -e 's| -Werror||g' configure.ac || die - - eautoreconf -} - -src_configure() { - append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk() - - econf \ - $(use_with readline) \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install -} diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest index aa7e4cf1faab..6060bd9aa55e 100644 --- a/app-text/po4a/Manifest +++ b/app-text/po4a/Manifest @@ -1,3 +1,3 @@ -DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c2d33252d6ae08a00fddfa8aaa6e9c652f764ae46bf14fea3bcd1093f923fcbf08d96e97296954199e9b900 SHA512 f72e1267cbd6ced01ecc362c327b1634c47dff15398b48644548d28e01ba91108d5626e6d4abcfcb360697e4c0affa3228c6993653ce8f257acbbb3d7ae20fc4 -DIST po4a-0.68.tar.gz 4605485 BLAKE2B fe649a28c0c181f53d7eb3f583d4a7dffe4fc22fb316c1c534b672a267eef16ccdf39a77caff3a2d75b7bfcb36e68c49229aaddeb8dff5ee475b71b58402200e SHA512 d7c60a3647d8f4265ce6f016d33430c72775ae19eb2efb240532545b08280368fea70db3360131f6537eb7cc72c19299dff4b6f938ac09cbef1b2db1a93d996e DIST po4a-0.69.tar.gz 4665710 BLAKE2B 2fc1b6cd53f1b282f20cd4932de7f5d6d9882de9f50181f0de89995c9d9b79b5fd2bc53d3757c56c519478e67ac636deb5a011cc8810a002b6bb6dabdb44442b SHA512 9cb5eec547ab18d1c3ebdda212b909fc4f5489a74641ba2d7e0a3a1d060f245d23667c16e687c678c5ccc3809c9315d20673266dcc3764172a899caa397238e3 +DIST po4a-0.70.tar.gz 4832825 BLAKE2B 2cf103cf95860855c8cd3e6090a75fce0791a58badc3a5bae0563c4d9b063af984fda1de5566d61caa23766ebddb66f8fb0a4701bfbc6fe2aafdf2bab292ef26 SHA512 2f12d9b9214b08bb7dd2d864016063845f397d7b71c1aa2292c1da1b71f1ec435cfae527032f4d6610d15d1a6ea40e35165dcba007b75cab635dd722cbc05139 +DIST po4a-0.71.tar.gz 4860322 BLAKE2B 8a5d1f8dd17b435bf1ada91b4c49862eed97775c574d2972d749f6126eb5f654cc4f8a1def3d4b9ddf50f86c8d02e4f328cbb0406eb91e5224e9373c2063441e SHA512 67ba925433d95ebd6675ce2e58b2664a07a00016ca4b5029845e485dfad1804737a00935e2da162e2488e4c21b947e7fa32b40ac3d9b28d4729d8f93c3f2040b diff --git a/app-text/po4a/files/po4a-0.66-man.patch b/app-text/po4a/files/po4a-0.66-man.patch deleted file mode 100644 index 40927dbda818..000000000000 --- a/app-text/po4a/files/po4a-0.66-man.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Po4aBuilder.pm -+++ b/Po4aBuilder.pm -@@ -232,7 +232,6 @@ - } - $parser->parse_from_file ($file, $out); - -- system("gzip -9 -f $out") and die; - unlink "$file" || die; - } - -@@ -250,7 +249,6 @@ - print "Convert $outdir/$outfile.$section (online docbook.xsl file). "; - system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die; - } -- system ("gzip -9 -f $outdir/$outfile.$section") and die; - } - unlink "$file" || die; - } diff --git a/app-text/po4a/files/po4a-0.68-man.patch b/app-text/po4a/files/po4a-0.69-man.patch index 6c79ebf77dd2..02cedf7f1ade 100644 --- a/app-text/po4a/files/po4a-0.68-man.patch +++ b/app-text/po4a/files/po4a-0.69-man.patch @@ -4,7 +4,7 @@ } $parser->parse_from_file ($file, $out); -- system("gzip -9 -f $out") and die; +- system("gzip -9 -n -f $out") and die; unlink "$file" || die; } @@ -12,7 +12,7 @@ print "Convert $outdir/$outfile.$section (online docbook.xsl file). "; system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die; } -- system ("gzip -9 -f $outdir/$outfile.$section") and die; +- system ("gzip -9 -n -f $outdir/$outfile.$section") and die; } unlink "$file" || die; } diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch index 02cedf7f1ade..b166887283cb 100644 --- a/app-text/po4a/files/po4a-man.patch +++ b/app-text/po4a/files/po4a-man.patch @@ -1,18 +1,18 @@ --- a/Po4aBuilder.pm +++ b/Po4aBuilder.pm -@@ -234,7 +234,6 @@ +@@ -242,7 +242,6 @@ } - $parser->parse_from_file ($file, $out); + $parser->parse_from_file( $file, $out ); - system("gzip -9 -n -f $out") and die; unlink "$file" || die; } -@@ -253,7 +252,6 @@ - print "Convert $outdir/$outfile.$section (online docbook.xsl file). "; - system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die; - } -- system ("gzip -9 -n -f $outdir/$outfile.$section") and die; +@@ -264,7 +263,6 @@ + print "Convert $outdir/$outfile.$section (online docbook.xsl file). "; + system("xsltproc -o $outdir/$outfile.$section --nonet $docbook_xsl_url $file") and die; + } +- system("gzip -9 -n -f $outdir/$outfile.$section") and die; } unlink "$file" || die; } diff --git a/app-text/po4a/po4a-0.69.ebuild b/app-text/po4a/po4a-0.69.ebuild index 42a766aaad56..d45251ad5468 100644 --- a/app-text/po4a/po4a-0.69.ebuild +++ b/app-text/po4a/po4a-0.69.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 virtual/latex-base )" -PATCHES=( "${FILESDIR}"/${PN}-man.patch ) +PATCHES=( "${FILESDIR}"/${P}-man.patch ) DIST_TEST="do" diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.70.ebuild index 075e72ec5e4e..5b80c728dbb4 100644 --- a/app-text/po4a/po4a-0.66.ebuild +++ b/app-text/po4a/po4a-0.70.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant" +PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant" inherit perl-module plocale DESCRIPTION="Tools to ease the translation of documentation" HOMEPAGE="https://po4a.org/" -SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/mquinson/${PN}/files/14077820/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -21,6 +21,7 @@ RDEPEND="app-text/opensp dev-perl/Locale-gettext dev-perl/Pod-Parser dev-perl/SGMLSpm + dev-perl/Syntax-Keyword-Try dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak @@ -37,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 virtual/latex-base )" -PATCHES=( "${FILESDIR}"/${P}-man.patch ) +PATCHES=( "${FILESDIR}"/${PN}-man.patch ) DIST_TEST="do" diff --git a/app-text/po4a/po4a-0.68.ebuild b/app-text/po4a/po4a-0.71.ebuild index 0508197665aa..397bab6b1bee 100644 --- a/app-text/po4a/po4a-0.68.ebuild +++ b/app-text/po4a/po4a-0.71.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant" +PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant" inherit perl-module plocale @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -38,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 virtual/latex-base )" -PATCHES=( "${FILESDIR}"/${P}-man.patch ) +PATCHES=( "${FILESDIR}"/${PN}-man.patch ) DIST_TEST="do" diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest index 3049a57c0a5d..ca377eb20e35 100644 --- a/app-text/podofo/Manifest +++ b/app-text/podofo/Manifest @@ -1,2 +1,5 @@ +DIST podofo-0.10.1-test-resources.tar.gz 4228392 BLAKE2B 95526d145a18976d5b9f782dfcac15e17bc4ef20a22ca5892905a19193ad88c2855cb8551886754c334f6ca666b9b74fe9a3b5c89ce774fa24e579f563be57c6 SHA512 4cb33e5a6050ef745cda42b7fdf53fee9f45d4d488555b79c9cdd6680c5265065aac92ad3d72ea0b75eee9a73098f920a3dd61b7728db6d2171888cbc83c6d55 +DIST podofo-0.10.1.tar.gz 1690279 BLAKE2B 0fc161c467ffce07c1b2cb1a2124ffddc6c18189b5c8b31dc1212921637601a667cd2b0d6f1269214bd0fe47e8853367283e3053813d45aed01589f0dfb1c29b SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9 +DIST podofo-0.10.3.tar.gz 1691469 BLAKE2B 986b5e8d5d8d77a21e38b99a08ad0d898c375695072a9795c57715049da2ecb8c15dd8717e5939a37fa94a8b48424b1f7a037fc452f0fde9856e9a840e350913 SHA512 80fa86ff7f256a69b963451ef741e49c56447084b26481e52d1a079940102b5d51d9ff1c43952bba22bae61d95c8c44eacc08f55cd18999aec6c563f615b2cf5 DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6 DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 diff --git a/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch new file mode 100644 index 000000000000..45edd8454dfb --- /dev/null +++ b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch @@ -0,0 +1,37 @@ +https://github.com/podofo/podofo/commit/da91101b7afafa958669e11d0cabaeee3ff50b39 + +From da91101b7afafa958669e11d0cabaeee3ff50b39 Mon Sep 17 00:00:00 2001 +From: Francesco Pretto <ceztko@gmail.com> +Date: Fri, 27 Oct 2023 23:41:22 +0200 +Subject: [PATCH] [FIX] ColorTest: Fixed test under linux when compiled with + -march=x86-64-v3 + +Floating point contractions may cause some level of non determinsm when comparing the result of fp operations . See +https://stackoverflow.com/questions/62353629/does-the-same-floating-point-calculation-producing-different-results-when-perfor + +Fixes #103 +--- + test/unit/ColorTest.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/test/unit/ColorTest.cpp b/test/unit/ColorTest.cpp +index 419052a7..81f99c5b 100644 +--- a/test/unit/ColorTest.cpp ++++ b/test/unit/ColorTest.cpp +@@ -426,7 +426,12 @@ TEST_CASE("testCMYKConstructor") + double dGreen = M_VALUE * (1.0 - B_VALUE) + B_VALUE; + double dBlue = Y_VALUE * (1.0 - B_VALUE) + B_VALUE; + +- REQUIRE(color.ConvertToRGB() == PdfColor(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue)); ++ auto rgb1 = color.ConvertToRGB(); ++ PdfColor rgb2(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue); ++ ++ ASSERT_EQUAL(rgb1.GetRed(), rgb2.GetRed()); ++ ASSERT_EQUAL(rgb1.GetGreen(), rgb2.GetGreen()); ++ ASSERT_EQUAL(rgb1.GetBlue(), rgb2.GetBlue()); + } + + REQUIRE(color.ConvertToCMYK() == PdfColor(C_VALUE, M_VALUE, Y_VALUE, B_VALUE)); +-- +2.41.0 + diff --git a/app-text/podofo/metadata.xml b/app-text/podofo/metadata.xml index c0b71a582307..c274503a81d6 100644 --- a/app-text/podofo/metadata.xml +++ b/app-text/podofo/metadata.xml @@ -11,7 +11,7 @@ </flag> </use> <upstream> + <remote-id type="github">podofo/podofo</remote-id> <remote-id type="sourceforge">podofo</remote-id> - <changelog>https://sourceforge.net/p/podofo/code/commit_browser</changelog> </upstream> </pkgmetadata> diff --git a/app-text/podofo/podofo-0.10.1-r1.ebuild b/app-text/podofo/podofo-0.10.1-r1.ebuild new file mode 100644 index 000000000000..03852080e471 --- /dev/null +++ b/app-text/podofo/podofo-0.10.1-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" +HOMEPAGE="https://github.com/podofo/podofo" +# testsuite resources require separate download. Reported at https://github.com/podofo/podofo/issues/102 +SRC_URI="https://github.com/podofo/podofo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + test? ( + https://github.com/podofo/podofo-resources/archive/4afe5c3fdb543a4347681b2e52252f1b10f12f24.tar.gz + -> ${P}-test-resources.tar.gz + ) +" + +LICENSE="LGPL-2+ tools? ( GPL-2+ )" +SLOT="0/2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="idn jpeg tiff png fontconfig test tools" +RESTRICT="!test? ( test )" + +RDEPEND=" + idn? ( net-dns/libidn:= ) + dev-libs/openssl:= + fontconfig? ( media-libs/fontconfig:= ) + media-libs/freetype:2= + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + dev-libs/libxml2 + tiff? ( media-libs/tiff:= ) + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( fontconfig? ( media-fonts/liberation-fonts ) ) +" + +PATCHES=( + # Dome optimizations cause testsuite failures due to floating point + # contraction. Fixed upstream by adding tolerance to the test itself: + # https://github.com/podofo/podofo/issues/103 + "${FILESDIR}"/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch +) + +src_prepare() { + cmake_src_prepare + if use test; then + rmdir extern/resources || die + mv "${WORKDIR}"/podofo-resources-4afe5c3fdb543a4347681b2e52252f1b10f12f24 extern/resources || die + fi +} + +src_configure() { + local mycmakeargs=( + -DPODOFO_BUILD_TEST=$(usex test ON OFF) + -DPODOFO_BUILD_TOOLS=$(usex tools ON OFF) + $(cmake_use_find_package idn Libidn) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package png PNG) + $(cmake_use_find_package fontconfig Fontconfig) + ) + + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + $(usev !png 'TestImage3') + $(usev !jpeg 'TestImage2 TestImage4 TestImage5') + # relies on finding arial font + $(usev !fontconfig 'testLoadEncrypedFilePdfMemDocument testLoadEncrypedFilePdfParser testCyclicTree testNestedArrayTree testEmptyKidsTree testNestedArrayTree testCreateDelete') + ) + + cmake_src_test +} diff --git a/app-text/podofo/podofo-0.10.3.ebuild b/app-text/podofo/podofo-0.10.3.ebuild new file mode 100644 index 000000000000..d6b9e345c362 --- /dev/null +++ b/app-text/podofo/podofo-0.10.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" +HOMEPAGE="https://github.com/podofo/podofo" +# testsuite resources require separate download. Reported at https://github.com/podofo/podofo/issues/102 +SRC_URI="https://github.com/podofo/podofo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + test? ( + https://github.com/podofo/podofo-resources/archive/4afe5c3fdb543a4347681b2e52252f1b10f12f24.tar.gz + -> podofo-0.10.1-test-resources.tar.gz + ) +" + +LICENSE="LGPL-2+ tools? ( GPL-2+ )" +SLOT="0/2" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86" +IUSE="idn jpeg tiff png fontconfig test tools" +RESTRICT="!test? ( test )" + +RDEPEND=" + idn? ( net-dns/libidn:= ) + dev-libs/openssl:= + fontconfig? ( media-libs/fontconfig:= ) + media-libs/freetype:2= + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) + dev-libs/libxml2 + tiff? ( media-libs/tiff:= ) + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( fontconfig? ( media-fonts/liberation-fonts ) ) +" + +src_prepare() { + cmake_src_prepare + if use test; then + rmdir extern/resources || die + mv "${WORKDIR}"/podofo-resources-4afe5c3fdb543a4347681b2e52252f1b10f12f24 extern/resources || die + fi +} + +src_configure() { + local mycmakeargs=( + -DPODOFO_BUILD_TEST=$(usex test ON OFF) + -DPODOFO_BUILD_TOOLS=$(usex tools ON OFF) + $(cmake_use_find_package idn Libidn) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package png PNG) + $(cmake_use_find_package fontconfig Fontconfig) + ) + + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + $(usev !png 'TestImage3') + $(usev !jpeg 'TestImage2 TestImage4 TestImage5') + # relies on finding arial font + $(usev !fontconfig 'testLoadEncrypedFilePdfMemDocument testLoadEncrypedFilePdfParser testCyclicTree testNestedArrayTree testEmptyKidsTree testNestedArrayTree testCreateDelete') + ) + + cmake_src_test +} diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest index 8e27a6198e35..d5bb2a09ed73 100644 --- a/app-text/poppler-data/Manifest +++ b/app-text/poppler-data/Manifest @@ -1,3 +1,2 @@ DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885 -DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32 DIST poppler-data-0.4.12.tar.gz 4504754 BLAKE2B 0d34ff1fcc9120b5db2baded9d931ca37128106eecdd54892d0256f9736f799d52eacd4017741797432048def914dd13150c6e3bf8d9ea5b8597a799a497d1c7 SHA512 75f201e4c586ba47eb9a48a33ef6663fe353d0694b602feb7db282d73da7f0daffb0ff7e18e4a6cb40324305efa2413df562666939f4214e2dfd7ff00288f3de diff --git a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild deleted file mode 100644 index e9b9b2ccfd10..000000000000 --- a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -POPPLER_DATA_EXTRA_VERSION="0.4.11-2" -DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc" -HOMEPAGE="https://poppler.freedesktop.org/" -SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz" - -# AGPL-3+ for the extra files needed by ghostscript, bug #844115 -LICENSE="AGPL-3+ BSD GPL-2 MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -src_install() { - emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install - - # We need to include extra cMaps for ghostscript, bug #844115 - cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die - - # bug #409361 - dodir /usr/share/poppler/cMaps - cd "${ED}"/usr/share/poppler/cMaps || die - find ../cMap -type f -exec ln -s {} . \; || die -} diff --git a/app-text/poppler-data/poppler-data-0.4.12.ebuild b/app-text/poppler-data/poppler-data-0.4.12.ebuild index f30dc0b9ffac..735eb5a9ab48 100644 --- a/app-text/poppler-data/poppler-data-0.4.12.ebuild +++ b/app-text/poppler-data/poppler-data-0.4.12.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPL # AGPL-3+ for the extra files needed by ghostscript, bug #844115 LICENSE="AGPL-3+ BSD GPL-2 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" src_install() { emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 0f6b0ba5bf66..04cd4849cc7a 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,6 +1,10 @@ -DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07 SHA512 a44fd59cdb4dc1c04765990d9666f27538895883fe98a64e7bea30caebeab10875615282307fbd6eacecf83b7a7c8daa81afa1b13ae6c09b80673e3fb8563053 -DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b -DIST poppler-23.02.0.tar.xz 1847612 BLAKE2B ca5187432c5088372f0b8f4fcd39a93998b28e505d214964de99cd03db555f8f80b05de19874264b1d732d2c45388562faead50b2b82116bb6031690419abd8c SHA512 0765319a1b106da740c7300172866e774ccbeec0bc0e938f009efd1a106b35ca2e5ab60a523e1d1dd5682b30499de4dffed0a1ca129c770263a096f781337a2c -DIST poppler-23.02.0.tar.xz.sig 833 BLAKE2B 48b46b92d8d95f25a0619aaa50c29c652e91ba99c5f8d5f30cbb879a2145e3a21df0258585ee9e44d036f4a8c1d54023e1bb22aa0d90bf69403b37c601b37ef2 SHA512 68fe9d46ec6f7f1b6d0d7becf96675477454af9218ad20ad159d8a06def73f08db59915adbb77b520e3e43091aaf895e045c7ccaafb57d2b2b9390e84e70a963 -DIST poppler-23.03.0.tar.xz 1849324 BLAKE2B 1247b7cf62466f65c46b739f0784e8ba97911940e04f91a7db28bf0663c8fe182f79066aa3925cb338580ccedbf17aecd2a2d2795e859680d1fb721390a1cbe0 SHA512 1c370d9262141ff5b720a4c3cf6f01573047398f8950295e3e99f32700946e3241e26e3d909cf78a278fc402306811fd87977d0f86a744f3eaedb4f39b8e8a2c -DIST poppler-23.03.0.tar.xz.sig 833 BLAKE2B a8a07aac9068a3edc6cdce4d59c2b5d3d792dd6addcd420d5b92f013041cfd934c0da04a21eabefdd25167fb89b940945f8ca03e7a7280d03a47b6df8490bdf4 SHA512 3d950ff4b1a368b6edd8333677d1d125f60b4b1a052e20a2be6a0d38489e7af393be8359fc2c75010b2a28673e201507da4bf4c8458904fa712247d8ebda4786 +DIST poppler-24.02.0.tar.xz 1897604 BLAKE2B ba97ea0807eab8e27112f66bcdcc695fe71881b873e129ebbaab521ad895815cf782faf9e32efd8530ec7c840546a505ef9a1b195258dafd55ce21fe4e11250e SHA512 95a208d21ac4d2d308a7ab3da43b95092ef78cd55ebe873c97e0d6c12d8b9d5c4614f83087616c35e1ed9d67ca606a5e008a98698bd12a332a8206ed4cf55500 +DIST poppler-24.02.0.tar.xz.sig 833 BLAKE2B 9daed6e9c3ba6f42f7b7e81abcf835658a03c4041a221b1de2e3a8e016eebe7b369174379f8faadb6119cac4502bf58e9f1c548e401d417d8ef5c1a2ab5fb322 SHA512 9bb03899e5fc475097a3422ed5f03b528796dc09d14bef0dabbbb457f9d5b20b48db462cc1478522803bae42c5b25ef46715d3ff6c26f4582f2ecf9c1bf1598e +DIST poppler-24.03.0.tar.xz 1902068 BLAKE2B 34cd3b64b1fbee53727d99bf73a896331c15d816ea77aa678a9ebe4bc6ddf8c859ae004915aba36346dbcb13862d7d6670562e45d99888d444c523d83c90b58a SHA512 7b337249b3a3a4b4702447c7a0d19d2fd3ef5a6159d024d75846f397e223805758d4116eb155421545b17f02f151a96228932d162c0ff8a74147ef21424e9a96 +DIST poppler-24.03.0.tar.xz.sig 833 BLAKE2B efdf579fec7d5aca5ec197220d46e4420f60946992e0c6f0a461f4ebc0b45c363eca269e93ffa36e840a7959c8ca2225da17b62b412a0eb37e4d4e74f98a22c6 SHA512 7276311721a7c6ea35773e38147c816b79359422add5f9b954a1e95fd399f16161ff8791a82db56707b143e207e6cf8264d353b3a6da298c9f65f2e9cb2533d0 +DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9 +DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28 +DIST poppler-24.05.0.tar.xz 1909164 BLAKE2B 65d5d1509078012a26d0bd97985516a39c49594a3c83016f1b7c7745caf1d13faaa82bbaea62c16466f4b1c159c765fa88f97e20f10a87b08514b00e5bdb1113 SHA512 caa3d31b8f22186a7218831039c2ff7384b07863de04f166980dfe534a7a5f047e7c21e1114b9ed0ef323beb60983b45a36bb906c4189c0828f4119e3e2dbaa1 +DIST poppler-24.05.0.tar.xz.sig 833 BLAKE2B f1125a8b81089a4b8beb9385fa4a9b170b97f08e2bc732fd1cc2671ed43a81bb7b58b9ced61691e55188af94ee6b2c701be0ea1e12feecebbc7c4062a97b76fb SHA512 3010eeda09ff58d9705465bffe4861d9af1f294597b8eec1e1cc90f59008ab146000fcc694b2fad8bb675d89d68b2b78d54236ae6d42411058b9444b87514db3 +DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76 +DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch deleted file mode 100644 index 234be8222146..000000000000 --- a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 9 Dec 2020 01:28:25 +0100 -Subject: [PATCH] Move Qt5 test dependencies into test dir - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 6 ++---- - qt5/CMakeLists.txt | 10 ++++++++-- - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1573249a..ab91d537 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,10 +157,8 @@ if (ENABLE_QT5) - find_package(Qt5Core 5.5) # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this - find_package(Qt5Gui) - find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)) -- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+ if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)) -+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") - set(ENABLE_QT5 OFF) - endif() - endif() -diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt -index 58b42f5e..e3b26cc2 100644 ---- a/qt5/CMakeLists.txt -+++ b/qt5/CMakeLists.txt -@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500) - add_definitions(-DQT_NO_DEPRECATED_WARNINGS) - - add_subdirectory(src) --add_subdirectory(tests) --add_subdirectory(demos) -+ -+if(BUILD_QT5_TESTS) -+ find_package(Qt5Widgets REQUIRED) -+ find_package(Qt5Test REQUIRED) -+ -+ add_subdirectory(tests) -+ add_subdirectory(demos) -+endif() --- -2.29.2 - diff --git a/app-text/poppler/files/poppler-23.10.0-qt-deps.patch b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch new file mode 100644 index 000000000000..f906e335717d --- /dev/null +++ b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch @@ -0,0 +1,61 @@ +From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 9 Dec 2020 01:28:25 +0100 +Subject: [PATCH] Move Qt test dependencies into test dir + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 8 ++++---- + qt5/CMakeLists.txt | 7 +++++-- + qt6/CMakeLists.txt | 6 ++++-- + 3 files changed, 13 insertions(+), 8 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,15 +212,15 @@ + find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION}) + find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION}) + find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION}) +-find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION}) +-find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION}) ++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Widgets ${QT5_VERSION}) ++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Test ${QT5_VERSION}) + + set(QT6_VERSION "6.2") + SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON) + find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION}) + find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION}) +-find_soft_mandatory_package(ENABLE_QT6 Qt6Widgets ${QT6_VERSION}) +-find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION}) ++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Widgets ${QT6_VERSION}) ++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Test ${QT6_VERSION}) + + # Check for Cairo rendering backend + macro_optional_find_package(Cairo ${CAIRO_VERSION}) +--- a/qt5/CMakeLists.txt ++++ b/qt5/CMakeLists.txt +@@ -9,5 +9,8 @@ + add_definitions(-DQT_NO_DEPRECATED_WARNINGS) + + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(demos) ++ ++if(BUILD_QT5_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif() +--- a/qt6/CMakeLists.txt ++++ b/qt6/CMakeLists.txt +@@ -7,5 +7,7 @@ + + add_subdirectory(src) + +-add_subdirectory(tests) +-add_subdirectory(demos) ++if(BUILD_QT6_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif() +-- +2.29.2 diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml index 96ffce9a0416..ead6228b431b 100644 --- a/app-text/poppler/metadata.xml +++ b/app-text/poppler/metadata.xml @@ -19,9 +19,11 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id> + <remote-id type="freedesktop-gitlab">poppler/poppler</remote-id> </upstream> <use> <flag name="boost">Use boost::small_vector for a serious performance gain</flag> + <flag name="gpgme">Enable signatures handling with <pkg>app-crypt/gpgme</pkg></flag> <flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag> <flag name="utils">Install command-line PDF converters and various utilities.</flag> </use> diff --git a/app-text/poppler/poppler-23.01.0.ebuild b/app-text/poppler/poppler-24.02.0.ebuild index 22a64ecb1a6f..224aa760e772 100644 --- a/app-text/poppler/poppler-23.01.0.ebuild +++ b/app-text/poppler/poppler-24.02.0.ebuild @@ -1,32 +1,32 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake toolchain-funcs xdg-utils +inherit cmake flag-o-matic toolchain-funcs xdg-utils if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" SLOT="0/9999" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc inherit verify-sig + TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/126" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/134" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="https://poppler.freedesktop.org/" LICENSE="GPL-2" -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" COMMON_DEPEND=" >=media-libs/fontconfig-2.13 @@ -38,6 +38,7 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) + gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) @@ -48,6 +49,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtxml:5 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) " RDEPEND="${COMMON_DEPEND} @@ -55,6 +57,13 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} boost? ( >=dev-libs/boost-1.71 ) + test? ( + qt5? ( + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) " BDEPEND=" >=dev-util/glib-utils-2.64 @@ -62,17 +71,27 @@ BDEPEND=" " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { cmake_src_prepare @@ -92,30 +111,34 @@ src_prepare() { src_configure() { xdg_environment_reset + append-lfs-flags # bug #898506 + local mycmakeargs=( -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DUSE_FLOAT=OFF -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF ) use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) diff --git a/app-text/poppler/poppler-23.02.0.ebuild b/app-text/poppler/poppler-24.03.0.ebuild index 7643024ac37a..719b3b8646b8 100644 --- a/app-text/poppler/poppler-23.02.0.ebuild +++ b/app-text/poppler/poppler-24.03.0.ebuild @@ -1,32 +1,32 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake toolchain-funcs xdg-utils +inherit cmake flag-o-matic toolchain-funcs xdg-utils if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" SLOT="0/9999" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc inherit verify-sig + TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/126" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/135" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="https://poppler.freedesktop.org/" LICENSE="GPL-2" -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" COMMON_DEPEND=" >=media-libs/fontconfig-2.13 @@ -38,6 +38,7 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) + gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) @@ -48,6 +49,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtxml:5 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) " RDEPEND="${COMMON_DEPEND} @@ -55,6 +57,13 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} boost? ( >=dev-libs/boost-1.71 ) + test? ( + qt5? ( + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) " BDEPEND=" >=dev-util/glib-utils-2.64 @@ -62,17 +71,27 @@ BDEPEND=" " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { cmake_src_prepare @@ -92,30 +111,34 @@ src_prepare() { src_configure() { xdg_environment_reset + append-lfs-flags # bug #898506 + local mycmakeargs=( -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DUSE_FLOAT=OFF -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF ) use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) diff --git a/app-text/poppler/poppler-23.03.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild index 7643024ac37a..83006151fd51 100644 --- a/app-text/poppler/poppler-23.03.0.ebuild +++ b/app-text/poppler/poppler-24.04.0.ebuild @@ -1,32 +1,32 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake toolchain-funcs xdg-utils +inherit cmake flag-o-matic toolchain-funcs xdg-utils if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" SLOT="0/9999" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc inherit verify-sig + TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/126" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/136" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="https://poppler.freedesktop.org/" LICENSE="GPL-2" -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" COMMON_DEPEND=" >=media-libs/fontconfig-2.13 @@ -38,6 +38,7 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) + gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) @@ -48,6 +49,7 @@ COMMON_DEPEND=" dev-qt/qtgui:5 dev-qt/qtxml:5 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) " RDEPEND="${COMMON_DEPEND} @@ -55,6 +57,13 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} boost? ( >=dev-libs/boost-1.71 ) + test? ( + qt5? ( + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) " BDEPEND=" >=dev-util/glib-utils-2.64 @@ -62,17 +71,27 @@ BDEPEND=" " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { cmake_src_prepare @@ -92,30 +111,34 @@ src_prepare() { src_configure() { xdg_environment_reset + append-lfs-flags # bug #898506 + local mycmakeargs=( -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DUSE_FLOAT=OFF -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF ) use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) diff --git a/app-text/poppler/poppler-24.05.0.ebuild b/app-text/poppler/poppler-24.05.0.ebuild new file mode 100644 index 000000000000..fe2ff39083f0 --- /dev/null +++ b/app-text/poppler/poppler-24.05.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 2005-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic toolchain-funcs xdg-utils + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" + SLOT="0/9999" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + + TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410" + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" + SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/137" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION +fi + +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE="https://poppler.freedesktop.org/" + +LICENSE="GPL-2" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=media-libs/fontconfig-2.13 + >=media-libs/freetype-2.10 + sys-libs/zlib + cairo? ( + >=dev-libs/glib-2.64:2 + >=x11-libs/cairo-1.16 + introspection? ( >=dev-libs/gobject-introspection-1.72:= ) + ) + curl? ( net-misc/curl ) + gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) + jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.49 ) + png? ( media-libs/libpng:0= ) + qt5? ( + >=dev-qt/qtcore-5.15.2:5 + >=dev-qt/qtgui-5.15.2:5 + >=dev-qt/qtxml-5.15.2:5 + ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) + tiff? ( media-libs/tiff:= ) +" +RDEPEND="${COMMON_DEPEND} + cjk? ( app-text/poppler-data ) +" +DEPEND="${COMMON_DEPEND} + boost? ( >=dev-libs/boost-1.74 ) + test? ( + qt5? ( + >=dev-qt/qttest-5.15.2:5 + >=dev-qt/qtwidgets-5.15.2:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) +" +BDEPEND=" + >=dev-util/glib-utils-2.64 + virtual/pkgconfig +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" +fi + +DOCS=( AUTHORS NEWS README.md README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" + "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" +) + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + +src_prepare() { + cmake_src_prepare + + # Clang doesn't grok this flag, the configure nicely tests that, but + # cmake just uses it, so remove it if we use clang + if tc-is-clang ; then + sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die + fi + + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then + sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ + -i CMakeLists.txt || die + else + einfo "policy(SET CMP0002 OLD) - workaround can be removed" + fi +} + +src_configure() { + xdg_environment_reset + append-lfs-flags # bug #898506 + + local mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_BOOST="$(usex boost)" + -DENABLE_ZLIB_UNCOMPRESS=OFF + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DUSE_FLOAT=OFF + -DWITH_Cairo=$(usex cairo) + -DENABLE_LIBCURL=$(usex curl) + -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) + -DWITH_JPEG=$(usex jpeg) + -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) + -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) + -DWITH_PNG=$(usex png) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) + -DENABLE_UTILS=$(usex utils) + ) + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # live version doesn't provide html documentation + if use cairo && use doc && [[ ${PV} != *9999* ]]; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* + fi +} diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index 4834fad51161..fe2ff39083f0 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,23 +10,23 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" SLOT="0/9999" else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc inherit verify-sig + TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )" SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/126" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + SLOT="0/137" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="https://poppler.freedesktop.org/" LICENSE="GPL-2" -IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" +IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils" +RESTRICT="!test? ( test )" COMMON_DEPEND=" >=media-libs/fontconfig-2.13 @@ -35,26 +35,35 @@ COMMON_DEPEND=" cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 - introspection? ( >=dev-libs/gobject-introspection-1.64:= ) + introspection? ( >=dev-libs/gobject-introspection-1.72:= ) ) curl? ( net-misc/curl ) + gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 + >=dev-qt/qtcore-5.15.2:5 + >=dev-qt/qtgui-5.15.2:5 + >=dev-qt/qtxml-5.15.2:5 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) " RDEPEND="${COMMON_DEPEND} cjk? ( app-text/poppler-data ) " DEPEND="${COMMON_DEPEND} - boost? ( >=dev-libs/boost-1.71 ) + boost? ( >=dev-libs/boost-1.74 ) + test? ( + qt5? ( + >=dev-qt/qttest-5.15.2:5 + >=dev-qt/qtwidgets-5.15.2:5 + ) + qt6? ( dev-qt/qtbase:6[widgets] ) + ) " BDEPEND=" >=dev-util/glib-utils-2.64 @@ -62,17 +71,27 @@ BDEPEND=" " if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )" fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-23.10.0-qt-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + src_prepare() { cmake_src_prepare @@ -96,28 +115,30 @@ src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF + -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) + -DBUILD_CPP_TESTS=$(usex test) + -DBUILD_MANUAL_TESTS=$(usex test) + -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_BOOST="$(usex boost)" - -DENABLE_ZLIB=ON -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DUSE_FLOAT=OFF -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF ) use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild index 59d32680b68b..4c07540fcae0 100644 --- a/app-text/ps2eps/ps2eps-1.68.ebuild +++ b/app-text/ps2eps/ps2eps-1.68.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" app-text/ghostscript-gpl diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest index 046d9a807360..6bba4f271f42 100644 --- a/app-text/ps2pkm/Manifest +++ b/app-text/ps2pkm/Manifest @@ -1 +1,2 @@ DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 +DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96 diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild index 252d4f99d3ef..c2bf98350593 100644 --- a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild +++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild @@ -4,19 +4,18 @@ EAPI=7 DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font" -HOMEPAGE="http://tug.org/texlive/" -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz" +S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" DEPEND=">=dev-libs/kpathsea-6.2.1:=" RDEPEND="${DEPEND}" - BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" ) src_configure() { diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild new file mode 100644 index 000000000000..9b5072d13ca3 --- /dev/null +++ b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${PV#*_p}-source.tar.xz" +S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND=">=dev-libs/kpathsea-6.2.1:=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" ) + +src_configure() { + econf \ + --with-system-kpathsea +} diff --git a/app-text/psmark/Manifest b/app-text/psmark/Manifest new file mode 100644 index 000000000000..c22a67413f94 --- /dev/null +++ b/app-text/psmark/Manifest @@ -0,0 +1 @@ +DIST psmark-v2.1.tar.gz 16296 BLAKE2B e4f77b7a3abd86f8214e2f00d85eaef4a7b897b3fad970cf86565ad32ab42e25ab7674e9a1a7116a4cce93f46a99a5d17a21c14fb4ff3b2a860e1e2627b268a7 SHA512 0a765dda878478e767ae02ac0838a9c36a110000b35d557b1b3d17d22c518f42249cd4eba856b476ba8042e026cb49f736077d3bf236f2a9a4f3df4ff4357fef diff --git a/app-text/psmark/files/psmark-2.1-Makefile-QA.patch b/app-text/psmark/files/psmark-2.1-Makefile-QA.patch new file mode 100644 index 000000000000..145fe3a32e8e --- /dev/null +++ b/app-text/psmark/files/psmark-2.1-Makefile-QA.patch @@ -0,0 +1,19 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,14 +3,13 @@ + all: + make clean + make psmark + + psmark: +- gcc $(CFLAGS) -o psmark psmark.c +- strip psmark ++ $(CC) $(CFLAGS) $(LDFLAGS) -o psmark psmark.c + + clean: + rm -f *.o psmark + + install: +- install -s psmark /usr/bin/ ++ install psmark /usr/bin/ + install psmark.1 /usr/man/man1/ diff --git a/app-text/psmark/files/psmark-2.1-string.patch b/app-text/psmark/files/psmark-2.1-string.patch new file mode 100644 index 000000000000..1d1fb3dfbb57 --- /dev/null +++ b/app-text/psmark/files/psmark-2.1-string.patch @@ -0,0 +1,15 @@ +--- a/psmark.c ++++ b/psmark.c +@@ -97,9 +97,9 @@ + progname); + fprintf(stderr,"example:\n %s -i test.ps -o output.ps -b 0.4 -s 15 \"vertical label\"" + "\n\n",progname); +- fprintf(stderr,"Notes: The offsets are measured from the bottom left hand corner, but +- they are not in sync with the page corner: some fiddling is required +- to get text to appear right in the corner.\n" ++ fprintf(stderr,"Notes: The offsets are measured from the bottom left hand corner, but\n" ++ "they are not in sync with the page corner: some fiddling is required\n" ++ "to get text to appear right in the corner.\n" + ); + + exit(error ? EXIT_FAILURE : EXIT_SUCCESS); diff --git a/app-text/psmark/metadata.xml b/app-text/psmark/metadata.xml new file mode 100644 index 000000000000..ecbed5b5dce7 --- /dev/null +++ b/app-text/psmark/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <longdescription> + Command-line Postscript watermark tool; simple, but useful for things + like adding a watermark to outgoing or incoming faxes (eg, use with the + sendfax command from net-misc/hylafax). + </longdescription> +</pkgmetadata> diff --git a/app-text/psmark/psmark-2.1.ebuild b/app-text/psmark/psmark-2.1.ebuild new file mode 100644 index 000000000000..8d8d4e7fd704 --- /dev/null +++ b/app-text/psmark/psmark-2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PN=${PN}-v +MY_P=${MY_PN}${PV} + +DESCRIPTION="Prints watermark-like text on any PostScript document" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="http://www.antitachyon.com/download/${MY_P}.tar.gz" +S="${WORKDIR}"/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-string.patch + "${FILESDIR}"/${P}-Makefile-QA.patch +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin psmark + doman psmark.1 + dodoc README CHANGELOG +} diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild index 5dff5b9d0d33..fa7442cfb931 100644 --- a/app-text/pspdftool/pspdftool-0.03.ebuild +++ b/app-text/pspdftool/pspdftool-0.03.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents" HOMEPAGE="https://sourceforge.net/projects/pspdftool" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -24,6 +24,12 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing; do not trust for LTO-safety either. + # https://bugs.gentoo.org/855023 + # Upstream is dead for nearly a decade. Not forwarded. + append-flags -fno-strict-aliasing + filter-lto + econf $(use_with zlib) } diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild index 87cb65425884..54201ea6112f 100644 --- a/app-text/psutils/psutils-1.17-r5.ebuild +++ b/app-text/psutils/psutils-1.17-r5.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${P}.orig" LICENSE="psutils" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="dev-lang/perl" diff --git a/app-text/psutils/psutils-2.09.ebuild b/app-text/psutils/psutils-2.09.ebuild index 048794948a50..660720704b57 100644 --- a/app-text/psutils/psutils-2.09.ebuild +++ b/app-text/psutils/psutils-2.09.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/rrthomas/psutils/releases/download/v${PV}/${P}.tar.g LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # Newer libpaper needed for fork which provides 'paper' RDEPEND=" diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest index d2b68fab5f83..c868a806c643 100644 --- a/app-text/qpdf/Manifest +++ b/app-text/qpdf/Manifest @@ -1,6 +1,9 @@ -DIST qpdf-11.1.1-doc.zip 7062109 BLAKE2B f9ffa32efa3835427773ee6ef87985388722b868f5a6e9a6df23e5458c2fde049aadbc98dc6966c0b2268c7a264af07cb448f61e49e04b25d908f2bafe140469 SHA512 6e4b87abefedcaf1e3407d1630f9c6e796db64b3cdae25a9489d8f0b1d5c06673821436877c36f015d6a5d126feefda17bb246f0b8ea87c0617238254816f7c2 -DIST qpdf-11.1.1.tar.gz 18464793 BLAKE2B 66fa80b513bc5ef033a60011e34df1c6e9ac6a8b777ab1eb30aeddfa077827dcfe30f6ea5816ab0ec208840d4dc2b4e3823449378b5bc50073ae1d754fb124c4 SHA512 da7540152a82cbb853089afa2503ece04086513bab662171758f1e0e928ac09cc7c00e61470bd5ec5285d99ef586b59ad66d5ff90e9060b1361d837fe18cbc24 -DIST qpdf-11.2.0-doc.zip 7066797 BLAKE2B c30d3d768bc0d49d751a4c15d3dd5c72040a0b983acc4844d57ab445a57b61023f24f21a4fedf5d336cc906c68feba511aa33ab8cfc45a463cc37e9162970ad9 SHA512 388fc34b34a1b2b1ad227c8dec8bc464472b150faba30d403e1256cc20a61921e33758e338a8fb2d177694d80af5b87c32ea3f7f258b4796f5e6688117ced768 -DIST qpdf-11.2.0.tar.gz 18450040 BLAKE2B e42aeaf911f9d912eb0abfbebbe737ab9927c337b46cf96f9286ec3ce562c887c23922695435da90f04e8149e16de204563832e1fd742ffe8665d123efc6c699 SHA512 6e28be1fc9cb6aa124229301a43a565ef80ffffab9bacaeabebfbf4ced17c9702a432330a995be390a8fe3d69ac1773ca72b6c24e40f1bf74a71219e02dbac70 -DIST qpdf-11.3.0-doc.zip 6781831 BLAKE2B 0b494ff62e197a60d82a170a27816676dc465d1a53f4201955dd8063980c09df31ddfd206e6625c5cfdc1994026651a2fe8278b1b73a4bc13de4b0a30c2cbbb4 SHA512 c652ba56b4c740af74889579732e18336910b09edbe125783ad4b6b1556df0cc3f32e2514c9bb611aebe233a8708d58701ed466ba6b4f3ff652ed56527650b9c -DIST qpdf-11.3.0.tar.gz 18732977 BLAKE2B 80dd2a96f3b82b9e530f26c72cd24cd3b111e2e1cbe821b12af13807e8d54fbc7f5632130f5cbd03df1b7c70de3c94a7e889d4ea4f1a3670a28f726364564b16 SHA512 1c8a0b62d50efb4c09885f36244048797dea44f28917aefe0266e2b158858ea19d477bbc445abbd3b7180a3de56d6a819ff44275cdc0979827effba9739b53d2 +DIST qpdf-11.7.0-doc.zip 6874893 BLAKE2B b14b0f68f4599bd4f396cccbc35b13b0f52b72856de1afd3fdb0c70b33e1702c4afd7c954011df72905c06ff262b08dc9519e44dcef9b7633423d38208542795 SHA512 7ceeff62788defe3649a8d242220c7c8208ebe92dbd9d67b4b53d5036afb1cdbcfe46b4140b064b0542cba2d8eaaad6eedec1ed7b7bd0ccafe2dd7aa20efaa69 +DIST qpdf-11.7.0.tar.gz 18124824 BLAKE2B aa10e154899a7fd53d696b9521cc8a44d4a336094711ddc2a506dac8841ae12ce5bcd604555725d2b6bae3c63a6a3f6ef0e9ab6baf38dd3d7fa71507234378a3 SHA512 6ee302671fd4513c5b22f101feb773b4101de6cc5ff6b0e25d1daa03df82420f87ce7db49a6c47758d7e8bbc3beeb997d4671d52e4cf0ac0d4f817f10677d1f9 +DIST qpdf-11.7.0.tar.gz.asc 833 BLAKE2B e0b15e6ed6b67fc222f7b4d9f863e8630af814bede3605ca56b83b287d7e02c700092e59f3805565884b55af96c4ddd407331cae26273287b546c32a7975c331 SHA512 ef5aa1661944fd56c3f929ee1ffc78229667ed1d1c639aab82a0ff3a3891455e4dcf3dffbb17e9d22862d6426a263182360b19dd58435a2413c19761abc9b966 +DIST qpdf-11.8.0-doc.zip 6886718 BLAKE2B de4e706cc27a73dffa40561fc1b0342a6c6d5e2b3bced0dbf6dbe43c969911b61f6e74fd3fd871833078ed70c50fca28dd316ad8d6ff0344d668a958a9d1840b SHA512 5b2748d4b0b0367d4fd2773e697f6e125d92c397b62ee63388bce85c74a051e1b17d487941128927e3493669bd00196caa842eee76db0f05827a650a067b6939 +DIST qpdf-11.8.0.tar.gz 18150965 BLAKE2B 6843a268d472c83169d33ef5f216da9428ec84a73a93cd81fde8f122c088ad1401df47c209d7aa4f3a5b950ddef0d8926908b0a9efefad13757eb0ea7dc1db86 SHA512 e558cd4f0066ace73670ead7a49b0343862cdd275bd013eb10cbef6e161a13955101e6d78de8e87bb05a68498c3018152e9d20d61c01dce55d3810e7f5768aa9 +DIST qpdf-11.8.0.tar.gz.asc 833 BLAKE2B 02c0cfec3bab48a3d49783cb68bd6b6c6382536f5d15a54357b54e02b7ef2b5a3517c7448cebf255eebac60feeef2cfe6b42ffe5bfeec5db07db24059f97df69 SHA512 4dce7d90fef819edbb5bb5a46983c9cd6d181f1e58e36b439a0e9e38aca9cb9954fb5f6886cd2284f9852e205a3a4035827f4baa693a96c293ea604dcddb430e +DIST qpdf-11.9.0-doc.zip 6893438 BLAKE2B 102b7bbe0a7c1b12c2956c3f8e400b4259ca1c95e359308a940a4f8b4c304f6b0866f794fb58eba792fec2e7ad52209cb0c2cad4494358a185b6a9720d0a7cfb SHA512 91a94cbda66a9c3bbbad9a433d9de78b83989757917fb150aa175cebb3aa295ba3e631e84e97cba3df3bdb4715fba411984b293a6b0df0f4549de2a77a4c257f +DIST qpdf-11.9.0.tar.gz 18552462 BLAKE2B 3f79bef4b8d276cb73db1a08eb72cc67dec803c942c5e6f5322ecfc2fb017c7169aebb6b0790f1789970c86f4c8790465d0315ff8b355dd7e395a02192a605cb SHA512 5e0a990797081f121b3a52fddedea199baf1af260093a384ed6df347e052601622b03c9ff62b7ea069d81464eb0381932428cb8c0565b3686961f7505021a165 +DIST qpdf-11.9.0.tar.gz.asc 833 BLAKE2B 6f00b52643b76828f65ce45ac031a72369753495ee96d5facaf708c80a41a669f5eb407c0e5d25492214813b307fc4cc7ae42b97f9ad6d78d92cc51cc98a87ed SHA512 dd58a1721ce6e15b77bfde1ab68bb37a9d2b1d755872811fb24fadef7be4cf562bb8f8371fd56bdc583d0f6da50654696cc4576234d9fd74319e3f1f2bb7b5cf diff --git a/app-text/qpdf/qpdf-11.1.1-r1.ebuild b/app-text/qpdf/qpdf-11.1.1-r1.ebuild deleted file mode 100644 index 3170e89d7707..000000000000 --- a/app-text/qpdf/qpdf-11.1.1-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake bash-completion-r1 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="https://qpdf.sourceforge.net/" -# TODO: verify-sig -SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz" -SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# Subslot for libqpdf soname version (just represent via major version) -SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples gnutls ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/libjpeg-turbo:= - sys-libs/zlib - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) -" -DEPEND=" - ${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" -BDEPEND=" - dev-lang/perl - doc? ( app-arch/unzip ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. - local mycmakeargs=( - -DINSTALL_EXAMPLES=$(usex examples) - - # Breaks install with USE=-doc in 11.0.0? - #-DINSTALL_MANUAL=ON - ) - - if use ssl ; then - local crypto_provider=$(usex gnutls GNUTLS OPENSSL) - local crypto_provider_lowercase=${crypto_provider,,} - mycmakeargs+=( - -DDEFAULT_CRYPTO=${crypto_provider_lowercase} - -DREQUIRE_CRYPTO_${crypto_provider}=ON - ) - fi - - cmake_src_configure -} - -src_install() { - if use doc ; then - mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die - fi - - cmake_src_install - - # Completions - dobashcomp completions/bash/qpdf - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_qpdf -} diff --git a/app-text/qpdf/qpdf-11.2.0-r1.ebuild b/app-text/qpdf/qpdf-11.2.0-r1.ebuild deleted file mode 100644 index 21a7e60c2a70..000000000000 --- a/app-text/qpdf/qpdf-11.2.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake bash-completion-r1 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="https://qpdf.sourceforge.net/" -# TODO: verify-sig -SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz" -SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# Subslot for libqpdf soname version (just represent via major version) -SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples gnutls ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/libjpeg-turbo:= - sys-libs/zlib - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) -" -DEPEND=" - ${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" -BDEPEND=" - dev-lang/perl - doc? ( app-arch/unzip ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. - local mycmakeargs=( - -DINSTALL_EXAMPLES=$(usex examples) - - # Breaks install with USE=-doc in 11.0.0? - #-DINSTALL_MANUAL=ON - ) - - if use ssl ; then - local crypto_provider=$(usex gnutls GNUTLS OPENSSL) - local crypto_provider_lowercase=${crypto_provider,,} - mycmakeargs+=( - -DDEFAULT_CRYPTO=${crypto_provider_lowercase} - -DREQUIRE_CRYPTO_${crypto_provider}=ON - ) - fi - - cmake_src_configure -} - -src_install() { - if use doc ; then - mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die - fi - - cmake_src_install - - # Completions - dobashcomp completions/bash/qpdf - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_qpdf -} diff --git a/app-text/qpdf/qpdf-11.3.0.ebuild b/app-text/qpdf/qpdf-11.3.0.ebuild deleted file mode 100644 index c51d758ec28e..000000000000 --- a/app-text/qpdf/qpdf-11.3.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake bash-completion-r1 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="https://qpdf.sourceforge.net/" -# TODO: verify-sig -SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz" -SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# Subslot for libqpdf soname version (just represent via major version) -SLOT="0/$(ver_cut 1)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples gnutls ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/libjpeg-turbo:= - sys-libs/zlib - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) -" -DEPEND=" - ${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" -BDEPEND=" - dev-lang/perl - doc? ( app-arch/unzip ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. - local mycmakeargs=( - -DINSTALL_EXAMPLES=$(usex examples) - - # Breaks install with USE=-doc in 11.0.0? - #-DINSTALL_MANUAL=ON - ) - - if use ssl ; then - local crypto_provider=$(usex gnutls GNUTLS OPENSSL) - local crypto_provider_lowercase=${crypto_provider,,} - mycmakeargs+=( - -DDEFAULT_CRYPTO=${crypto_provider_lowercase} - -DREQUIRE_CRYPTO_${crypto_provider}=ON - ) - fi - - cmake_src_configure -} - -src_install() { - if use doc ; then - mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die - fi - - cmake_src_install - - # Completions - dobashcomp completions/bash/qpdf - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_qpdf -} diff --git a/app-text/qpdf/qpdf-11.7.0.ebuild b/app-text/qpdf/qpdf-11.7.0.ebuild new file mode 100644 index 000000000000..8139978232c7 --- /dev/null +++ b/app-text/qpdf/qpdf-11.7.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake verify-sig + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE=" + https://qpdf.sourceforge.io/ + https://github.com/qpdf/qpdf/ +" +SRC_URI=" + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz + doc? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip + ) + verify-sig? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc + ) +" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) + verify-sig? ( sec-keys/openpgp-keys-jberkenbilt ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_configure() { + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + + # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. + local mycmakeargs=( + -DINSTALL_EXAMPLES=$(usex examples) + + # Avoid automagic crypto deps + -DUSE_IMPLICIT_CRYPTO=OFF + -DALLOW_CRYPTO_NATIVE=ON + + # Breaks install with USE=-doc in 11.0.0? + #-DINSTALL_MANUAL=ON + + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +} diff --git a/app-text/qpdf/qpdf-11.8.0.ebuild b/app-text/qpdf/qpdf-11.8.0.ebuild new file mode 100644 index 000000000000..055841cf1036 --- /dev/null +++ b/app-text/qpdf/qpdf-11.8.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake verify-sig + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE=" + https://qpdf.sourceforge.io/ + https://github.com/qpdf/qpdf/ +" +SRC_URI=" + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz + doc? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip + ) + verify-sig? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc + ) +" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) + verify-sig? ( sec-keys/openpgp-keys-jberkenbilt ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_configure() { + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + + # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. + local mycmakeargs=( + -DINSTALL_EXAMPLES=$(usex examples) + + # Avoid automagic crypto deps + -DUSE_IMPLICIT_CRYPTO=OFF + -DALLOW_CRYPTO_NATIVE=ON + + # Breaks install with USE=-doc in 11.0.0? + #-DINSTALL_MANUAL=ON + + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +} diff --git a/app-text/qpdf/qpdf-11.9.0.ebuild b/app-text/qpdf/qpdf-11.9.0.ebuild new file mode 100644 index 000000000000..055841cf1036 --- /dev/null +++ b/app-text/qpdf/qpdf-11.9.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake verify-sig + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE=" + https://qpdf.sourceforge.io/ + https://github.com/qpdf/qpdf/ +" +SRC_URI=" + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz + doc? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip + ) + verify-sig? ( + https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc + ) +" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) + verify-sig? ( sec-keys/openpgp-keys-jberkenbilt ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_configure() { + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + + # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html. + local mycmakeargs=( + -DINSTALL_EXAMPLES=$(usex examples) + + # Avoid automagic crypto deps + -DUSE_IMPLICIT_CRYPTO=OFF + -DALLOW_CRYPTO_NATIVE=ON + + # Breaks install with USE=-doc in 11.0.0? + #-DINSTALL_MANUAL=ON + + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +} diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest index 75b9a6a5e99d..c9267bfaca12 100644 --- a/app-text/qpdfview/Manifest +++ b/app-text/qpdfview/Manifest @@ -1 +1,2 @@ DIST qpdfview-0.5.tar.gz 925408 BLAKE2B 8ce8ff82893c90012ea1b35a582e87783da87e6eba3d4a10e78fe7810c269908ed1541cf40b1eb17fc474254131cebbc4832a3f46a2016262c485d48e222791b SHA512 1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278e0a2fb0d21f83bafb467e43dd37352b99ef41795d140220bb82d704e03926 +DIST qpdfview-0.5_p1.tar.gz 922833 BLAKE2B 99d5e818b7c5dd5e583072043be6a282da64277f695cf4c0d38ad339dbdbcb100dcbbf161657f3622a324f691275beb6338c07fe2bbd62e1db896ec759ef162c SHA512 65720f6642b23a23b2d05b38334ce95424e69985b69223d978d4fd59b565d59a37eb43138c2f17fd37d8139b4cc223d5ab32dd18c62f2524792f42b44ba52189 diff --git a/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch new file mode 100644 index 000000000000..07acf1a02bd3 --- /dev/null +++ b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/909037 +--- a/qpdfview.pri ++++ b/qpdfview.pri +@@ -12,4 +12,4 @@ isEmpty(APP_DIR_DATA_PATH):APP_DIR_DATA_PATH = data + win32:include(qpdfview_win32.pri) + os2:include(qpdfview_os2.pri) + +-CONFIG += c++11 ++CONFIG += c++17 diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml index 9e9a7f9e3fdc..8397ee4bec66 100644 --- a/app-text/qpdfview/metadata.xml +++ b/app-text/qpdfview/metadata.xml @@ -5,10 +5,6 @@ <email>grozin@gentoo.org</email> <name>Andrey Grozin</name> </maintainer> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> <use> <flag name="fitz"> Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>, diff --git a/app-text/qpdfview/qpdfview-0.5.ebuild b/app-text/qpdfview/qpdfview-0.5.ebuild index 463443836b8c..23bf1eb4974d 100644 --- a/app-text/qpdfview/qpdfview-0.5.ebuild +++ b/app-text/qpdfview/qpdfview-0.5.ebuild @@ -42,6 +42,10 @@ DEPEND="${RDEPEND}" DOCS=( CHANGES CONTRIBUTORS README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch +) + src_prepare() { default diff --git a/app-text/qpdfview/qpdfview-0.5_p1.ebuild b/app-text/qpdfview/qpdfview-0.5_p1.ebuild new file mode 100644 index 000000000000..caf4f6353347 --- /dev/null +++ b/app-text/qpdfview/qpdfview-0.5_p1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="af ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru rue sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW" +inherit plocale qmake-utils xdg + +DESCRIPTION="A tabbed document viewer" +HOMEPAGE="https://launchpad.net/qpdfview" +# revision 2161 +SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex" + +REQUIRED_USE="?? ( fitz pdf )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + cups? ( net-print/cups ) + djvu? ( app-text/djvu ) + fitz? ( >=app-text/mupdf-1.7:= ) + postscript? ( app-text/libspectre ) + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5[cups?] + dev-qt/qtwidgets:5 + dbus? ( dev-qt/qtdbus:5 ) + pdf? ( >=app-text/poppler-0.35[qt5] + dev-qt/qtxml:5 ) + sqlite? ( dev-qt/qtsql:5[sqlite] ) + svg? ( dev-qt/qtsvg:5 ) + !svg? ( virtual/freedesktop-icon-theme ) + synctex? ( app-text/texlive-core )" +DEPEND="${RDEPEND}" + +DOCS=( CHANGES CONTRIBUTORS README TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch +) + +src_prepare() { + default + + local mylrelease="$(qt5_get_bindir)"/lrelease + p_locale() { + "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed" + } + + rm_help() { + rm -f "help/help_${1}.html" || die "removing ${1} help file failed" + } + + plocale_find_changes translations ${PN}_ .ts + plocale_for_each_locale p_locale + plocale_for_each_disabled_locale rm_help + + # adapt for prefix + sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die +} + +src_configure() { + local myconfig=() i= + for i in cups dbus djvu pdf svg synctex; do + use ${i} || myconfig+=(without_${i}) + done + use fitz && myconfig+=(with_fitz) + use postscript || myconfig+=(without_ps) + use sqlite || myconfig+=(without_sql) + + local myqmakeargs=( + qpdfview.pro + CONFIG+="${myconfig[*]}" + PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" + ) + eqmake5 "${myqmakeargs[@]}" +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs +} diff --git a/app-text/qtikz/Manifest b/app-text/qtikz/Manifest new file mode 100644 index 000000000000..02c04a4cbe9d --- /dev/null +++ b/app-text/qtikz/Manifest @@ -0,0 +1 @@ +DIST ktikz-0.13.2.tar.gz 2043961 BLAKE2B 57c53b70e4d526e8dcec5a1414d76c1d0d7c3412af908e85b56b03605a9c1d097892b7195e7d1e43dcdecd92411e1961276a9f51989797660e3dfd5bdca91acc SHA512 23399a1b70bc6f93683b502160b02fb10e767e51c82b9bf0b4ce985800d8278dec7451442c762919cf37de29d3620cff42661e6c22c63ab1823d087cecb0d847 diff --git a/app-text/qtikz/metadata.xml b/app-text/qtikz/metadata.xml new file mode 100644 index 000000000000..1c5b023661aa --- /dev/null +++ b/app-text/qtikz/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> + <upstream> + <remote-id type="github">fhackenberger/ktikz</remote-id> + <bugs-to>https://github.com/fhackenberger/ktikz/issues</bugs-to> + <changelog>https://github.com/fhackenberger/ktikz/blob/master/Changelog</changelog> + </upstream> +</pkgmetadata> diff --git a/app-text/qtikz/qtikz-0.13.2.ebuild b/app-text/qtikz/qtikz-0.13.2.ebuild new file mode 100644 index 000000000000..b7f3b0979bc2 --- /dev/null +++ b/app-text/qtikz/qtikz-0.13.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg optfeature + +DESCRIPTION="editor for the TikZ drawing language" +HOMEPAGE="https://github.com/fhackenberger/ktikz" +SRC_URI=" + https://github.com/fhackenberger/ktikz/archive/${PV}.tar.gz -> ktikz-${PV}.tar.gz +" +S="${WORKDIR}/ktikz-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + app-text/poppler[qt5] +" +RDEPEND="${DEPEND} + dev-texlive/texlive-latexextra + dev-texlive/texlive-pictures +" +BDEPEND=" + dev-qt/linguist-tools:5 + dev-qt/qthelp:5 +" + +src_configure() { + local myqmakeargs=( + PREFIX=/usr + QMAKECOMMAND="$(qt5_get_bindir)/qmake" + LRELEASECOMMAND="$(qt5_get_bindir)/lrelease" + QCOLLECTIONGENERATORCOMMAND="$(qt5_get_bindir)/qcollectiongenerator" + ) + eqmake5 ${PN}.pro "${myqmakeargs[@]}" +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + local DOCS=( README.md ) + einstalldocs +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "viewing documentation" dev-qt/assistant:5 +} diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest index 08b7e20f9866..fe3f1ccb63c1 100644 --- a/app-text/rarian/Manifest +++ b/app-text/rarian/Manifest @@ -1,2 +1 @@ -DIST rarian-0.8.1-r4-patches.tar.xz 33868 BLAKE2B e272598fce4119ad4995b665b988080dc4aee23ba6d03e462e4c76186a418601cbc5c4f403beb64aad05c9e7003d58c2070122ddcaf7188335ec4b8370eb7afb SHA512 766223faedb743c350de4f5c4dc3081f95a2c617d52ddedd4e78f64b3cbbacc20293cc4e98bbe38b41f795cefbf83d624d4434c2b94129ce224ad66da9e5760c -DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb +DIST rarian-0.8.4.tar.bz2 402769 BLAKE2B bc077a6584f7ad0967cdaf298769d1da5ea4b9545191bcf7a8d4f07178666c416b8471a79447e6e3ff52bb2bfd8c55afc7d1638211d245abd9d4efe82c30a7a2 SHA512 5daf8c70438db566f8c4fc6a9b553898e078882307951e7060873fb4c32c12a6482f560f14dab9376917996a3a2f84a36bdf2721fa94c3e63379e3ea0ed131d4 diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml index 7b343b06be8a..809a04df5730 100644 --- a/app-text/rarian/metadata.xml +++ b/app-text/rarian/metadata.xml @@ -5,4 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> +<upstream> + <remote-id type="freedesktop-gitlab">rarian/rarian</remote-id> +</upstream> </pkgmetadata> diff --git a/app-text/rarian/rarian-0.8.1-r4.ebuild b/app-text/rarian/rarian-0.8.1-r4.ebuild deleted file mode 100644 index 14156fe2ff4c..000000000000 --- a/app-text/rarian/rarian-0.8.1-r4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="A documentation metadata library" -HOMEPAGE="https://rarian.freedesktop.org/" -SRC_URI=" - https://${PN}.freedesktop.org/Releases/${P}.tar.gz - https://dev.gentoo.org/~soap/distfiles/${P}-r4-patches.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" - -RDEPEND=" - dev-libs/libxslt - dev-libs/tinyxml - || ( - sys-apps/util-linux - app-misc/getopt - )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${WORKDIR}"/0001-Fix-uri-of-omf-files-produced-by-rarian-sk-preinstal.patch - "${WORKDIR}"/0002-Allow-building-against-system-copy-of-tinyxml.patch - "${WORKDIR}"/0003-Allow-to-specify-only-the-prefix-of-an-info-page-e.g.patch - "${WORKDIR}"/0004-Fix-a-crash-when-opening-files-without-dots-in-their.patch - "${WORKDIR}"/0005-Make-librarian-obey-to-LC_MESSAGES.patch - "${WORKDIR}"/0006-Fix-m4-syntax-so-that-autoreconf-doesn-t-break.patch - "${WORKDIR}"/0007-Remove-the-nonexistent-dist-gzip-Automake-option.patch - "${WORKDIR}"/0008-Fix-OMF-category-parsing.patch - "${WORKDIR}"/0009-Allow-the-getopt-command-to-be-customized-at-configu.patch - "${WORKDIR}"/0010-Wimplicit-int.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=() - # https://bugs.gentoo.org/show_bug.cgi?id=409811 - # https://bugs.freedesktop.org/show_bug.cgi?id=53264 - if ! has_version sys-apps/util-linux; then - myconf=( --with-getopt=getopt-long ) - fi - - econf \ - --localstatedir="${EPREFIX}"/var \ - "${myconf[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-text/rarian/rarian-0.8.4.ebuild b/app-text/rarian/rarian-0.8.4.ebuild new file mode 100644 index 000000000000..b0989eb38327 --- /dev/null +++ b/app-text/rarian/rarian-0.8.4.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A documentation metadata library" +HOMEPAGE="https://rarian.freedesktop.org/" +SRC_URI="https://gitlab.freedesktop.org/rarian/rarian/-/releases/${PV}/downloads/assets/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +IUSE="test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/libxslt + dev-libs/tinyxml +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-libs/check-0.9.6 ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/util-linux +" + +src_configure() { + local myconf=( + --localstatedir="${EPREFIX}"/var + $(use_with test check) + ) + econf "${myconf[@]}" +} + +src_install() { + default + keepdir /var/lib/rarian + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-text/recode/recode-3.7.12-r1.ebuild b/app-text/recode/recode-3.7.12-r1.ebuild index 59202e801eeb..f1022f1199c3 100644 --- a/app-text/recode/recode-3.7.12-r1.ebuild +++ b/app-text/recode/recode-3.7.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,14 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-3+" # librecode soname version SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="nls test" RESTRICT="!test? ( test )" RDEPEND="virtual/libiconv" DEPEND=" ${RDEPEND} - sys-devel/flex + app-alternatives/lex " BDEPEND=" nls? ( sys-devel/gettext ) diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild index a9904d251fe9..1e3a064b1bd6 100644 --- a/app-text/recode/recode-3.7.13.ebuild +++ b/app-text/recode/recode-3.7.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,14 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-3+" # librecode soname version SLOT="0/3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="nls test" RESTRICT="!test? ( test )" RDEPEND="virtual/libiconv" DEPEND=" ${RDEPEND} - sys-devel/flex + app-alternatives/lex " BDEPEND=" nls? ( sys-devel/gettext ) diff --git a/app-text/recode/recode-3.7.14.ebuild b/app-text/recode/recode-3.7.14.ebuild index 93cea8740428..5c79c92e8c65 100644 --- a/app-text/recode/recode-3.7.14.ebuild +++ b/app-text/recode/recode-3.7.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,14 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-3+" # librecode soname version SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="nls test" RESTRICT="!test? ( test )" RDEPEND="virtual/libiconv" DEPEND=" ${RDEPEND} - sys-devel/flex + app-alternatives/lex " BDEPEND=" nls? ( sys-devel/gettext ) diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest deleted file mode 100644 index 47ba50db7de7..000000000000 --- a/app-text/reed/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST reed-5.4.tar.gz 32414 BLAKE2B 3a74b5d3501a37671247f8f2eb2baa674e6418669ad59825733faeff100ae7920ee43cd5506ecde9a8d733ec8462266166b59b525cf1a74edd1eea9182127ac1 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7 diff --git a/app-text/reed/reed-5.4-r1.ebuild b/app-text/reed/reed-5.4-r1.ebuild deleted file mode 100644 index 65801c720fc7..000000000000 --- a/app-text/reed/reed-5.4-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="This is a text pager (text file viewer), used to display etexts" -# Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist. -HOMEPAGE="http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/" -SRC_URI="http://www.sacredchao.net/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -BDEPEND="virtual/pkgconfig" -DEPEND="sys-libs/ncurses:=" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS BUGS NEWS README ) - -src_prepare() { - default - - sed -e 's;-O2;$(CFLAGS) $(LDFLAGS);' \ - -e 's: wrap::' \ - -e 's:-s reed:reed:' \ - -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i Makefile.in || die - - # Collision with talkfilters, bug #247396 - rm wrap.1 || die - - tc-export CC -} - -src_configure() { - ./configures --prefix=/usr || die -} diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest index 48d6fc624641..624ca952093e 100644 --- a/app-text/restview/Manifest +++ b/app-text/restview/Manifest @@ -1,2 +1 @@ -DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c DIST restview-3.0.0.tar.gz 49774 BLAKE2B 21a8a25964b995287ce8c584424eae8db5d6190ebf60a435a9af50a9995083fba61d5ccd1a06b1eb193590bc68219f98298a4773fab565bd711cca1eacd8149b SHA512 55b053f03964eb637245810894e970e16a3d1be4587e44802410afbb5c046921e7f3c07825e4f7889569d2f7a980f0a320835d0c2994bb5df0d66c3ebcffc797 diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild deleted file mode 100644 index c171a5553a78..000000000000 --- a/app-text/restview/restview-2.9.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_9 ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="reStructuredText viewer" -HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/readme_renderer[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] ) -" - -DOCS=( README.rst CHANGES.rst ) - -python_test() { - esetup.py test -} diff --git a/app-text/restview/restview-3.0.0.ebuild b/app-text/restview/restview-3.0.0.ebuild index f54b105df3de..b26aed69c63b 100644 --- a/app-text/restview/restview-3.0.0.ebuild +++ b/app-text/restview/restview-3.0.0.ebuild @@ -4,19 +4,25 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) + inherit distutils-r1 pypi DESCRIPTION="reStructuredText viewer" -HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/" +HOMEPAGE=" + https://mg.pov.lt/restview/ + https://pypi.org/project/restview/ +" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="dev-python/docutils[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/docutils[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/readme_renderer[${PYTHON_USEDEP}]" + dev-python/readme-renderer[${PYTHON_USEDEP}] +" DOCS=( README.rst CHANGES.rst ) diff --git a/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch b/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch new file mode 100644 index 000000000000..bb7645c23f34 --- /dev/null +++ b/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch @@ -0,0 +1,24 @@ +From 1120713781a5da03a56d3f8d59904c0fd20f6dd6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + <leohdz172@proton.me> +Date: Mon, 11 Dec 2023 17:05:26 -0600 +Subject: [PATCH] fix build with -Werror=incompatible-pointer-types +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me> +--- a/rman.c ++++ b/rman.c +@@ -268,7 +268,7 @@ stricmp(const char *s1, const char *s2) { + else return 1; + } + +-int lcexceptionscmp(const char **a, const char **b) { return stricmp(*a, *b); } ++int lcexceptionscmp(const void *a, const void *b) { return stricmp((const char *)a, (const char *)b); } + + int + strincmp(const char *s1, const char *s2, size_t n) { +-- +2.43.0 + diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild index f64efe6d3b63..9b71cbcf27da 100644 --- a/app-text/rman/rman-3.2-r1.ebuild +++ b/app-text/rman/rman-3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit toolchain-funcs DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" HOMEPAGE="https://sourceforge.net/projects/polyglotman/" -SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/polyglotman/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RESTRICT="test" diff --git a/app-text/rman/rman-3.2-r2.ebuild b/app-text/rman/rman-3.2-r2.ebuild new file mode 100644 index 000000000000..89aa667137fd --- /dev/null +++ b/app-text/rman/rman-3.2-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" +HOMEPAGE="https://sourceforge.net/projects/polyglotman/" +SRC_URI="https://downloads.sourceforge.net/polyglotman/${P}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-incompatible-pointer-types.patch +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 +} diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest index efd19aa84b7a..86ed0c9de3fc 100644 --- a/app-text/rnc2rng/Manifest +++ b/app-text/rnc2rng/Manifest @@ -1 +1,2 @@ DIST rnc2rng-2.6.6.tar.gz 18089 BLAKE2B be9b2a22770bed034b4ad93bba23dba7e1f58c553cef4e1a507a00ffb62c6f6e937df22e4d5f2fd3c542acebd72adb82320cddf34f873d35f442be0d457b3cba SHA512 a0f108383ad927c2d9e1cc11960ddaab99a8cb4bf0417cd8e7ccdbc7925746b2fa8c1cbd96a74e89f7166eb8e330c224a49d97aa2ef5d83d7a0c4254240fb308 +DIST rnc2rng-2.7.0.tar.gz 19000 BLAKE2B 37375d2608c2fc5ffb87521de8d83f0d4a70449d399ea6d181b40c7e6f561c27e0e2ac6d4df5b0086890b626366cd6b8ceca60580f05a3bbd152d7315808fb1f SHA512 29507e49d29f7da23dcf24fd1328dd4ee0aa37192817d6d2c9ec76ede56a1c6b041ffdb6b755e2e9b0c155f4f68616cb7f9a49e711e4e389097c97840b5e3e66 diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild index e291b8cc981a..6128abda57bf 100644 --- a/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild +++ b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi diff --git a/app-text/rnc2rng/rnc2rng-2.7.0.ebuild b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild new file mode 100644 index 000000000000..6128abda57bf --- /dev/null +++ b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="RELAX NG Compact to regular syntax conversion library" +HOMEPAGE="https://github.com/djc/rnc2rng" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/rply[${PYTHON_USEDEP}]" +BDEPEND="test? ( ${RDEPEND} )" + +python_test() { + "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}" +} diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild index 4d5043c9f5c4..2080768a9ae5 100644 --- a/app-text/rnv/rnv-1.7.11-r1.ebuild +++ b/app-text/rnv/rnv-1.7.11-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ inherit unpacker toolchain-funcs DESCRIPTION="A lightweight Relax NG Compact Syntax validator" HOMEPAGE="http://www.davidashen.net/rnv.html" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="BSD" SLOT="0" diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest index 14f24d549d6e..5a7001dc6a9c 100644 --- a/app-text/ronn-ng/Manifest +++ b/app-text/ronn-ng/Manifest @@ -1 +1,2 @@ +DIST ronn-ng-0.10.1.tar.gz 78696 BLAKE2B 1e56b90c5919e0a1af317da78161b34124268521fbc379fbba09ff9cb344073665460abc53fd961e4773ee444f33fba7e72ae3f6af84f8a170cfb1e89e557922 SHA512 3f6ee5355c7a19d5cb04c1b677028dd13ad2ff620acdb2e83d9b6f154a7b1e7b5a77ea0bcfbcef4bbb46a60b1c0fbc52fda079ff860c83a71f89b8fed0b83665 DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf diff --git a/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch b/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch new file mode 100644 index 000000000000..b9e05cfff455 --- /dev/null +++ b/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch @@ -0,0 +1,40 @@ +https://github.com/apjanke/ronn-ng/commit/e194bf62b1d0c0828cc83405e60dc5ece829e62f + +From e194bf62b1d0c0828cc83405e60dc5ece829e62f Mon Sep 17 00:00:00 2001 +From: Andrew Janke <andrew@apjanke.net> +Date: Fri, 6 Jan 2023 07:25:48 -0500 +Subject: [PATCH] Workaround for Psych 4.0+ in tests + +Psych 4.0, shipped with Ruby 3.1, switched to a "safe load" by default, and requires you to explicitly set allowed classes. But previous Psych versions didn't support this kwarg, so the call needs to be made differently depending on which version of Psych/Ruby this is running under. + +Co-authored-by: Takuya Noguchi <takninnovationresearch@gmail.com> +--- + test/test_ronn_document.rb | 7 ++++++- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/test/test_ronn_document.rb b/test/test_ronn_document.rb +index 75788dc..cd573fe 100644 +--- a/test/test_ronn_document.rb ++++ b/test/test_ronn_document.rb +@@ -137,6 +137,11 @@ def canonicalize(text) + + test 'converting to yaml' do + require 'yaml' ++ actual = begin ++ YAML.load(@doc.to_yaml, permitted_classes: [Time]) ++ rescue ArgumentError # Remove this line when Ruby 3.0.x support is dropped ++ YAML.load(@doc.to_yaml) ++ end + assert_equal({ + 'section' => '1', + 'name' => 'hello', +@@ -146,7 +151,7 @@ def canonicalize(text) + 'toc' => [['NAME', 'NAME']], + 'organization' => nil, + 'manual' => nil +- }, YAML.load(@doc.to_yaml)) ++ }, actual) + end + + test 'converting to json' do + diff --git a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild new file mode 100644 index 000000000000..d1fb0d67cc93 --- /dev/null +++ b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32 ruby33" + +RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGELOG.md README.md" +RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown" +HOMEPAGE="https://github.com/apjanke/ronn-ng" +SRC_URI="https://github.com/apjanke/ronn-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +RDEPEND+="!app-text/ronn" + +DEPS=" + >=dev-ruby/kramdown-2.1:2 + >=dev-ruby/kramdown-parser-gfm-1.0.1:1 + >=dev-ruby/nokogiri-1.14.3:0 +" + +ruby_add_rdepend " + =dev-ruby/mustache-1* + ${DEPS} +" + +ruby_add_bdepend "${DEPS}" + +all_ruby_prepare() { + # Avoid tests with code blocks that are fragile for e.g. presence / + # absence of a source highlighter. + rm -f test/code_blocks*.ro{ff,nn} || die +} + +each_ruby_prepare() { + # Make sure that we always use the right interpreter during tests + sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb || die + # ... and during the man page build. + sed -i -e "/sh 'ronn/s:ronn:${RUBY} bin/ronn:" Rakefile || die +} + +all_ruby_install() { + all_fakegem_install + + doman man/ronn.1 man/ronn-format.7 +} diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild index 52501cd297aa..52d4f1f76746 100644 --- a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild +++ b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby26 ruby27 ruby30" +USE_RUBY="ruby27 ruby30 ruby31 ruby32" RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md" RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec" @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~arm64-macos" IUSE="" @@ -32,18 +32,27 @@ ruby_add_rdepend " ruby_add_bdepend "${DEPS}" +PATCHES=( + "${FILESDIR}"/${P}-psych-4-tests.patch +) + all_ruby_prepare() { sed -i -e '/mustache/ s/0.7/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die } each_ruby_prepare() { - # Make sure that we always use the right interpreter during tests. + # Make sure that we always use the right interpreter during tests sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb || die - sed -i -e "1igem 'psych', '~> 3.0'" Rakefile || die + # ... and during the man page build. + sed -i -e "/sh 'ronn/s:ronn:${RUBY} bin/ronn:" Rakefile || die } -all_ruby_compile() { - PATH="${S}/bin:${PATH}" rake man || die +each_ruby_compile() { + #if ! [[ -f man/ronn.1 ]] ; then + # einfo "Building man pages using ${RUBY}" + # PATH="${S}/bin:${PATH}" ${RUBY} -S rake man || die + #fi + :; } all_ruby_install() { diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest deleted file mode 100644 index fe5035bfa679..000000000000 --- a/app-text/ronn/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml deleted file mode 100644 index 62ac5e34fda8..000000000000 --- a/app-text/ronn/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>ruby@gentoo.org</email> - <name>Gentoo Ruby Project</name> - </maintainer> - <upstream> - <remote-id type="github">rtomayko/ronn</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/ronn/ronn-0.7.3-r4.ebuild b/app-text/ronn/ronn-0.7.3-r4.ebuild deleted file mode 100644 index 7822285c4841..000000000000 --- a/app-text/ronn/ronn-0.7.3-r4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md" - -inherit ruby-fakegem - -DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML" -HOMEPAGE="https://github.com/rtomayko/ronn/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - -IUSE="" - -RDEPEND+=" !app-text/ronn-ng" - -DEPS=" - >=dev-ruby/hpricot-0.8.2 - >=dev-ruby/mustache-0.7.0 - >=dev-ruby/rdiscount-1.5.8" - -ruby_add_rdepend "${DEPS}" - -ruby_add_bdepend "${DEPS}" - -all_ruby_prepare() { - # Avoid test failing due to changes in hash handling in ruby 1.8.7: - # https://github.com/rtomayko/ronn/issues/56 - sed -i -e '81 s:^:#:' test/test_ronn.rb || die -} - -each_ruby_prepare() { - # Make sure that we always use the right interpreter during tests. - sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb -} - -all_ruby_compile() { - PATH="${S}/bin:${PATH}" rake man || die -} - -all_ruby_install() { - all_fakegem_install - - doman man/ronn.1 man/ronn-format.7 -} diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest index 1e027aecd9b3..663bf3fe4630 100644 --- a/app-text/rpl/Manifest +++ b/app-text/rpl/Manifest @@ -1 +1,3 @@ +DIST rpl-1.15.2.gh.tar.gz 25452 BLAKE2B 95c826723683786411ff4ff5fe3a31ef4784fd682a735c369b758137aaf94b936aa4c714ed5db51c987710bb79dfeb46a8ec5837f97242d488ea4d92d980f202 SHA512 67418a89e3ab8770dce4945d3db5d7a54986ba4357a902249062d28d9abda5856c82e41092b703e138fe6d70e6ea3c5f5cd57eead83d0d39addda6c746e85d81 +DIST rpl-1.15.5.gh.tar.gz 24401 BLAKE2B 91f0914ce80167305f9b403f691e58cd3f219d9e22f0ae7587b6dc5c60809e03bf38bd3878696916026b7cd0e597b67a6fcbb97d55005fd113e80aa7296f0e95 SHA512 1669a2de5b09090a3058421e2f9560f9b155151ec6d91f9d4f3b43070082d2541981de7754f047771c515e6d1450998c55e3b018a589a5ae4bd48e28464bb858 DIST rpl-1.9.1.gh.tar.gz 22858 BLAKE2B 583a29fd34d7a0d2b3a35b0966a6bd42ac2851750806a97846785dc0331bd5d2199ffba3309184e64a4aa7194f9ae4b9ecb2acc500830b841bd34e2184ec1798 SHA512 be480c6788fa1eb672b892d798deb7d263eae227dac5d93a55f28ebf3b4a43f896eb10edd00e52aad1cd57f4a80faf4a4552b4762b26da273cd05f0c5bce754a diff --git a/app-text/rpl/rpl-1.15.2.ebuild b/app-text/rpl/rpl-1.15.2.ebuild new file mode 100644 index 000000000000..902a5491d3c1 --- /dev/null +++ b/app-text/rpl/rpl-1.15.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 + +DESCRIPTION="Intelligent recursive search/replace utility" +HOMEPAGE="http://rpl.sourceforge.net/ + https://github.com/rrthomas/rpl" +SRC_URI=" + https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND} + dev-python/argparse-manpage[${PYTHON_USEDEP}] + sys-apps/help2man[nls] +" diff --git a/app-text/rpl/rpl-1.15.5.ebuild b/app-text/rpl/rpl-1.15.5.ebuild new file mode 100644 index 000000000000..7137111d7232 --- /dev/null +++ b/app-text/rpl/rpl-1.15.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_11 ) +inherit distutils-r1 + +DESCRIPTION="Intelligent recursive search/replace utility" +HOMEPAGE="https://rpl.sourceforge.net/ https://github.com/rrthomas/rpl" +SRC_URI=" + https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]" +BDEPEND=" + ${RDEPEND} + dev-python/argparse-manpage[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/chainstream[${PYTHON_USEDEP}] + test? ( dev-python/pytest-datafiles[${PYTHON_USEDEP}] ) +" + +distutils_enable_tests pytest + +src_prepare() { + sed -i "s/VERSION = importlib.metadata.version('rpl')/VERSION = '${PV}'/" rpl/__init__.py || die + distutils-r1_src_prepare +} diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest index 9a243f6d8517..80453285cfdd 100644 --- a/app-text/rtf2html/Manifest +++ b/app-text/rtf2html/Manifest @@ -1 +1,2 @@ +DIST rtf2html-0.2.0-stlport.m4 3292 BLAKE2B 137016c605749aca2bd5c3a1ec69930f36d69fd177b70dc64ba67f932ebada4d9818e33ce7dce60d6935ec472dc1862253443487d45143594996a8d15585cae7 SHA512 8b67424a4fa6b4672620ada1e58de28added11e1c8ced5aee12bb2f478f6f9d31de655af91298a16bf05e1608de4f680dfa976513dcb53eee5a3d8088df7a946 DIST rtf2html-0.2.0.tar.bz2 75292 BLAKE2B 18cc67ff3642f68ae262aa6e3368be93defe19ceeab07f9e55fcd2390e4c374c7ab315c0c5f8b7644a458e4100a4be3812767b080842d862266083856f5376aa SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75 diff --git a/app-text/rtf2html/files/buildsystem-fixes.patch b/app-text/rtf2html/files/buildsystem-fixes.patch new file mode 100644 index 000000000000..24642650f8ac --- /dev/null +++ b/app-text/rtf2html/files/buildsystem-fixes.patch @@ -0,0 +1,157 @@ +From 257c8fd42362f158afdcd7d7709aa3743f894468 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 23 May 2024 00:00:26 -0400 +Subject: [PATCH 1/2] configure: remove invalid bashism + +configure scripts are POSIX /bin/sh scripts and cannot have +bash-specific syntax. The test `xxx == yyy` construct with double equals +is a bash-specific alias for single equals. It does exactly the same +thing as single equals -- it provides no additional functionality, no +behavior changes, it is exactly the same but with an additional +alternate spelling. In exchange for doing nothing, it breaks muscle +memory when writing POSIX sh scripts and tricks developers into writing +the wrong thing. + +It should never be used under any circumstances. Ideally it would be +removed altogether from GNU bash. + +Bug: https://bugs.gentoo.org/903291 +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + configure.in | 4 ++-- + stlport.m4 | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/configure.in b/configure.in +index 3207599..f8ba73d 100644 +--- a/configure.in ++++ b/configure.in +@@ -38,7 +38,7 @@ fi + + + AC_LIB_STLPORT(no) +-if test "$ac_stlport_use" == "no"; then ++if test "$ac_stlport_use" = "no"; then + AC_CHECK_LIB(stdc++,main,,AC_MSG_ERROR(rtf2html requires either libstdc++ or libstrloprt)) + fi + +@@ -47,5 +47,5 @@ AC_CHECK_FUNCS(floor strtol,,AC_MSG_ERROR(STDLIB funcs missing)) + AC_CHECK_FUNC(rint,AC_DEFINE(HAVE_RINT,1,Define to 1 if you have rint function)) + + CXXFLAGS="$CPPFLAGS $CFLAGS" +- ++ + AC_OUTPUT(Makefile) +diff --git a/stlport.m4 b/stlport.m4 +index baaf94b..ed7e13e 100644 +--- a/stlport.m4 ++++ b/stlport.m4 +@@ -4,19 +4,19 @@ + # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to + # `yes'. + # +-# If all tests succeed, CPPFLAGS will be *prepended* with ++# If all tests succeed, CPPFLAGS will be *prepended* with + # -nostdinc++ -I<directory> + # and LIBS will be appended with + # -l<library> + # + # directory defaults to /usr/include/stlport, but can be overridden with the + # --with-stlport-headers directive; +-# library defaults to stlport, and can be overridden with the ++# library defaults to stlport, and can be overridden with the + # --with-stlport-libs directive + # + # $Id: stlport.m4,v 1.4 2007-07-31 15:39:42 vlavrinenko Exp $ + # +-# This file is (c) 2001 Jasper Spaans, <jasper@spaans.ds9a.nl> ++# This file is (c) 2001 Jasper Spaans, <jasper@spaans.ds9a.nl> + # Please send your comments, suggestions and bugfixes to the above + # e-mail address. + # +@@ -38,12 +38,12 @@ AC_DEFUN([AC_LIB_STLPORT], + [define([AC_LIB_STLPORT_DEFAULT], ifelse($1, no, no, yes))dnl + AC_MSG_CHECKING(whether to use stlport libraries) + AC_ARG_WITH(stlport, AC_HELP_STRING(--with-stlport,use sgi stlport headers and libraries), +- [ if test "x$withval" == xno ; then ++ [ if test "x$withval" = xno ; then + ac_stlport_use="no" + fi], + ac_stlport_use=AC_LIB_STLPORT_DEFAULT) + AC_ARG_WITH(stlport-headers, AC_HELP_STRING(--with-stlport-headers,where to find stlport headers), +- [ if test "x$withval" == xno ; then ++ [ if test "x$withval" = xno ; then + ac_stlport_use="no" + else + ac_stlport_headers="$with_stlport_headers" +@@ -52,7 +52,7 @@ AC_DEFUN([AC_LIB_STLPORT], + ac_stlport_headers="/usr/include/stlport" + ]) + AC_ARG_WITH(stlport-libs, AC_HELP_STRING(--with-stlport-libs, where to find stlport libraries), +- [ if test "x$withval" == xno ; then ++ [ if test "x$withval" = xno ; then + ac_stlport_use="no" + else + ac_stlport_libs="$with_stlport_libs" +@@ -61,7 +61,7 @@ AC_DEFUN([AC_LIB_STLPORT], + ac_stlport_libs="stlport" + ]) + +- if test "$ac_stlport_use" == no ; then ++ if test "$ac_stlport_use" = no ; then + AC_MSG_RESULT(no) + else + AC_MSG_RESULT(yes) +@@ -70,7 +70,7 @@ AC_DEFUN([AC_LIB_STLPORT], + ac_stlport_save_LIBS="$LIBS" + CPPFLAGS="-I$ac_stlport_headers $CPPFLAGS" + LIBS="-l$ac_stlport_libs $LIBS" +- if test "$MSYSTEM" == "MINGW32"; then ++ if test "$MSYSTEM" = "MINGW32"; then + CPPFLAGS="$CPPFLAGS -mthreads" + fi + AC_LANG_PUSH(C++) +@@ -80,7 +80,7 @@ AC_DEFUN([AC_LIB_STLPORT], + AC_MSG_CHECKING(where to find stlport libraries) + AC_TRY_RUN([#include <stl/_stlport_version.h> + #include <iostream> +-int ++int + main() + { + std::cout << "" << std::ends; +-- +2.44.1 + + +From dd1ca6d0867eaca2b9be8d7efa4d957c96b7aa51 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 23 May 2024 00:24:52 -0400 +Subject: [PATCH 2/2] autotools: ensure aclocal runs successfully by passing + -I. + +autoreconf -fi can update the autotools files automatically, but if +aclocal doesn't know where project-local macros are it will delete them +and then the configure script is malformed and errors out. + +This tells autoreconf to pass -I. to aclocal, that is, it should check +for stlport.m4 in the current directory and use it. + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index e7eb60e..0a5fafd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,3 +2,5 @@ AUTOMAKE_OPTIONS = foreign + bin_PROGRAMS = rtf2html + rtf2html_SOURCES = fmt_opts.cpp rtf2html.cpp rtf_keyword.cpp rtf_table.cpp config.h fmt_opts.h rtf_table.h common.h dbg_iter.h rtf_keyword.h rtf_tools.h + noinst_HEADERS = config.h fmt_opts.h rtf_table.h common.h dbg_iter.h rtf_keyword.h rtf_tools.h README.ru ++ ++ACLOCAL_AMFLAGS = -I. +-- +2.44.1 + diff --git a/app-text/rtf2html/metadata.xml b/app-text/rtf2html/metadata.xml index ed64c873d352..f45fac9d96b4 100644 --- a/app-text/rtf2html/metadata.xml +++ b/app-text/rtf2html/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">rtf2html</remote-id> + <remote-id type="github">lvu/rtf2html</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild deleted file mode 100644 index f48b71d62643..000000000000 --- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="RTF to HTML converter" -HOMEPAGE="http://rtf2html.sourceforge.net/" -SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) - -src_prepare() { - default - - # CFLAGS are incorrectly parsed, so handle this here - sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed' -} diff --git a/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild new file mode 100644 index 000000000000..2855e2bba293 --- /dev/null +++ b/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="RTF to HTML converter" +HOMEPAGE="http://rtf2html.sourceforge.net/" +SRC_URI=" + https://downloads.sourceforge.net/rtf2html/${P}.tar.bz2 + https://github.com/lvu/rtf2html/raw/4b0e5a3cca2d0c81ee50dcfaa7e3d3dd0a89e59b/stlport.m4 -> ${P}-stlport.m4 +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + # make autoreconf work + # https://github.com/lvu/rtf2html/pull/12 + "${FILESDIR}"/buildsystem-fixes.patch +) + +src_prepare() { + cp "${DISTDIR}"/${P}-stlport.m4 stlport.m4 || die + default + eautoreconf + + # CFLAGS are incorrectly parsed, so handle this here + sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed' +} diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch index edc1e3141d94..edc1e3141d94 100644 --- a/app-text/sablotron/files/1.0.3-cxx11.patch +++ b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch diff --git a/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch new file mode 100644 index 000000000000..3dcf8c881efa --- /dev/null +++ b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch @@ -0,0 +1,14 @@ +Bug: https://bugs.gentoo.org/894710 +--- a/src/engine/hash.cpp ++++ b/src/engine/hash.cpp +@@ -305,8 +305,8 @@ void HashTable::report(Sit S, MsgType type, MsgCode code, const Str& arg1, const + + oolong hash(const Str& key) + { +- register oolong a, b, c, len; +- register const char *k = (const char*) key; ++ oolong a, b, c, len; ++ const char *k = (const char*) key; + + /* Set up the internal state */ + len = key.length(); diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch index e4f6c3fdfab3..614a6d7ffe24 100644 --- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch +++ b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch @@ -2,7 +2,7 @@ +++ b/src/engine/Makefile.am @@ -76,4 +76,5 @@ include_HEADERS = \ sabcfg.h - + libsablot_la_LDFLAGS = -version-info 100:3:100 +libsablot_la_LIBADD = @EXPAT_LIBS@ - + diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild index 1b8ec6960d0a..6492100a9034 100644 --- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild +++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P} DESCRIPTION="An XSLT Parser in C++" HOMEPAGE="https://sourceforge.net/projects/sablotron/" -SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sablotron/${MY_P}.tar.gz" # Sablotron can optionally be built under GPL, using MPL for now LICENSE="MPL-1.1" @@ -32,8 +32,8 @@ DOCS=( README README_JS RELEASE src/TODO ) PATCHES=( - "${FILESDIR}"/1.0.3-libsablot-expat.patch - "${FILESDIR}"/1.0.3-cxx11.patch + "${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch + "${FILESDIR}"/${PN}-1.0.3-cxx11.patch ) src_prepare() { diff --git a/app-text/sablotron/sablotron-1.0.3-r3.ebuild b/app-text/sablotron/sablotron-1.0.3-r3.ebuild new file mode 100644 index 000000000000..9d99cace3876 --- /dev/null +++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P="Sablot-${PV}" + +DESCRIPTION="An XSLT Parser in C++" +HOMEPAGE="https://sourceforge.net/projects/sablotron/" +SRC_URI="https://downloads.sourceforge.net/sablotron/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +# Sablotron can optionally be built under GPL, using MPL for now +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="perl" + +DEPEND=">=dev-libs/expat-1.95.6-r1" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-perl/XML-Parser-2.3" + +DOCS=( README README_JS RELEASE src/TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch + "${FILESDIR}"/${PN}-1.0.3-cxx11.patch + "${FILESDIR}"/${PN}-1.0.3-drop-register-keyword.patch +) + +src_prepare() { + default + sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable perl perlconnect) + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest index e5b998c01dd3..c0a6b67afccb 100644 --- a/app-text/scdoc/Manifest +++ b/app-text/scdoc/Manifest @@ -1 +1 @@ -DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3 +DIST scdoc-1.11.3.tar.gz 12768 BLAKE2B c39ed51f9279aa8a08bbd99a3d3780ef37654a37f687c7de340266d9c7a6edceb8f6824baaa34c756440d45bd51611ab28f7f2e42ea632b943f6018d6e5f5a04 SHA512 fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9 diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.3.ebuild index cb92a9c00651..e8aa2def5372 100644 --- a/app-text/scdoc/scdoc-1.11.2-r1.ebuild +++ b/app-text/scdoc/scdoc-1.11.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,6 +40,6 @@ src_compile() { } src_install() { - emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="/usr/$(get_libdir)/pkgconfig" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ + PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install } diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild index 1e3c06c1ea69..938aa8493a7c 100644 --- a/app-text/scdoc/scdoc-9999.ebuild +++ b/app-text/scdoc/scdoc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,6 +40,6 @@ src_compile() { } src_install() { - emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="/usr/$(get_libdir)/pkgconfig" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ + PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install } diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml index 65ccd825a3db..8bfd28e95fc7 100644 --- a/app-text/scrollkeeper-dtd/metadata.xml +++ b/app-text/scrollkeeper-dtd/metadata.xml @@ -5,6 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="sourceforge">scrollkeeper</remote-id> </upstream> diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild index 71794e2fed4c..850565cc4b1b 100644 --- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild +++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DTD_FILE="scrollkeeper-omf.dtd" DESCRIPTION="DTD from the Scrollkeeper package" -HOMEPAGE="http://scrollkeeper.sourceforge.net/" -SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}" +HOMEPAGE="https://scrollkeeper.sourceforge.net/" +SRC_URI="https://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}" +S="${WORKDIR}" LICENSE="FDL-1.1" SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" RDEPEND=">=dev-libs/libxml2-2.4.19" -DEPEND="${RDEPEND} - !<app-text/scrollkeeper-9999-r1" - -S="${WORKDIR}" +DEPEND="${RDEPEND}" src_unpack() { :; } @@ -35,23 +32,23 @@ pkg_postinst() { einfo "Installing catalog..." # Install regular DOCTYPE catalog entry - "${EROOT}"usr/bin/xmlcatalog --noout --add "public" \ + "${EROOT}"/usr/bin/xmlcatalog --noout --add "public" \ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ - "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ - "${EROOT}"etc/xml/catalog + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog # Install catalog entry for calls like: xmllint --dtdvalid URL ... - "${EROOT}"usr/bin/xmlcatalog --noout --add "system" \ + "${EROOT}"/usr/bin/xmlcatalog --noout --add "system" \ "${SRC_URI}" \ - "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ - "${EROOT}"etc/xml/catalog + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog } pkg_postrm() { # Remove all sk-dtd from the cache einfo "Cleaning catalog..." - "${EROOT}"usr/bin/xmlcatalog --noout --del \ - "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ - "${EROOT}"etc/xml/catalog + "${EROOT}"/usr/bin/xmlcatalog --noout --del \ + "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \ + "${EROOT}"/etc/xml/catalog } diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml index 06fc63cfdd2c..734e5e979f92 100644 --- a/app-text/sdcv/metadata.xml +++ b/app-text/sdcv/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="darkterm">Improve readability of color output on terminals with dark background.</flag> diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild index 024ea78f7fd4..3e098b509d52 100644 --- a/app-text/sdcv/sdcv-0.5.4.ebuild +++ b/app-text/sdcv/sdcv-0.5.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" IUSE="darkterm nls readline test" RESTRICT="!test? ( test )" diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild index 0363e17c1eaa..a9d1f6dfcdd8 100644 --- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild +++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,10 +9,9 @@ DESCRIPTION="Base ISO character entities and utilities for SGML" HOMEPAGE="https://www.iso.org/standard/16387.html" SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz" -# install-catalog is GPL -LICENSE="FDL-1.1+ GPL-2" +LICENSE="FDL-1.1+ MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" DEPEND="" diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest index b958473718dc..c51069537b76 100644 --- a/app-text/sigil/Manifest +++ b/app-text/sigil/Manifest @@ -1,2 +1,2 @@ -DIST sigil-1.9.20.tar.gz 25139664 BLAKE2B ca0a8ba5ec9b76ea4016766872e7a70d839c2b3f24a658e90e619fd2feb01de74e05e30cdcf53c79ce92196c380da1d348ec2776f77060b18d2c664ff8171c6a SHA512 07aff142f65084b7900b25b089fca1d9a36022e690acaf0db3c7b2eb310a847834baff42884e73bbe6b31ff2dd7f73e76819c5c7a4292578fbea2edcebec5ad1 -DIST sigil-1.9.30.tar.gz 26602897 BLAKE2B 554af2aa4c26994c065023839ea29b190eea501cac1183d58dcf2439ebca89e0a56848aaec1d668cfb84555c6830eaf6d32efdc82b08e0c94d7b6ba95dd7ff8b SHA512 80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f +DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbbc0c6cd37ae2eb2ff77f46ae36643785fb714d9fbc0fe470d024f7112be2933ca4fb57a4bfdfd340083be15fffca69296640ea9 SHA512 bac3f55d28d02f53c8fdac51333194e0f27c6669876360a6d0244b1e2683dae0e7046977fab6e75dba7170c8aca3a7539f3d6cddab3ddc3e45985930c455968a +DIST sigil-2.1.0.tar.gz 26918715 BLAKE2B d31aeea2ef0de2ecdedd50329bdf306e53aca0d4615cc97efa45013670b1f47af6a6152da4fdee20bf3a02c99f9b1337f07347170d50f28ddf48a52a089a5fc0 SHA512 542d6fc71b0353e3b5440d40e4c9f205c5205fb3e409935015b8f3689f8dcc74d8a96035963a740791f3a8acd63b2e0d81afe9be7716098e0727be6daf6c8ceb diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml index 16a802d7daa4..4daa9a331609 100644 --- a/app-text/sigil/metadata.xml +++ b/app-text/sigil/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="plugins">Installed needed Python packages for using Sigil plugins</flag> - <flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag> </use> <upstream> <remote-id type="github">Sigil-Ebook/Sigil</remote-id> diff --git a/app-text/sigil/sigil-1.9.20.ebuild b/app-text/sigil/sigil-1.9.20.ebuild deleted file mode 100644 index c70034c98975..000000000000 --- a/app-text/sigil/sigil-1.9.20.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="tk" - -inherit xdg cmake python-single-r1 - -DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format" -HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil" -SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P^}" - -LICENSE="GPL-3+ Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+plugins system-mathjax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - app-text/hunspell:= - dev-libs/libpcre2:=[pcre16] - $(python_gen_cond_dep ' - dev-python/css-parser[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]') - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - sys-libs/zlib[minizip] - plugins? ( $(python_gen_cond_dep ' - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/cssselect[${PYTHON_USEDEP}] - dev-python/dulwich[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}]') ) - system-mathjax? ( dev-libs/mathjax ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-qt/linguist-tools:5 -" - -DOCS=( ChangeLog.txt README.md ) - -src_configure() { - local mycmakeargs=( - -DTRY_NEWER_FINDPYTHON3=1 - -DPython3_INCLUDE_DIR="$(python_get_includedir)" - -DPython3_LIBRARY="$(python_get_library_path)" - -DPython3_EXECUTABLE="${PYTHON}" - - -DINSTALL_BUNDLED_DICTS=0 - -DSYSTEM_LIBS_REQUIRED=1 - -DUSE_SYSTEM_LIBS=1 - -DUSE_QT6=0 - ) - use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - python_fix_shebang "${ED}"/usr/share/sigil/ - python_optimize "${ED}"/usr/share/sigil/ -} diff --git a/app-text/sigil/sigil-1.9.30.ebuild b/app-text/sigil/sigil-2.1.0-r1.ebuild index 4574fdd28962..9de727940f0c 100644 --- a/app-text/sigil/sigil-1.9.30.ebuild +++ b/app-text/sigil/sigil-2.1.0-r1.ebuild @@ -1,52 +1,77 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="tk" +PYTHON_COMPAT=( python3_{10..12} ) inherit xdg cmake python-single-r1 +DOC_VERSION="2022.05.17" +DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub" + DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format" HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil" -SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )" S="${WORKDIR}/${P^}" LICENSE="GPL-3+ Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+plugins system-mathjax" +KEYWORDS="amd64" +IUSE="doc +plugins qt6" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} app-text/hunspell:= dev-libs/libpcre2:=[pcre16] + sys-libs/zlib[minizip] $(python_gen_cond_dep ' dev-python/css-parser[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]') - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - sys-libs/zlib[minizip] + ') plugins? ( $(python_gen_cond_dep ' dev-python/chardet[${PYTHON_USEDEP}] dev-python/cssselect[${PYTHON_USEDEP}] - dev-python/dulwich[${PYTHON_USEDEP}] dev-python/html5lib[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}]') ) - system-mathjax? ( dev-libs/mathjax ) + dev-python/regex[${PYTHON_USEDEP}] + ') + $(python_gen_impl_dep 'tk') ) + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + plugins? ( $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + ') ) + ) + qt6? ( + dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] + dev-qt/qt5compat:6 + dev-qt/qtwebengine:6[widgets] + dev-qt/qtsvg:6 + plugins? ( $(python_gen_cond_dep ' + dev-python/PyQt6[${PYTHON_USEDEP}] + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}] + ') ) + ) " DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} - dev-qt/linguist-tools:5 + virtual/pkgconfig + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) " DOCS=( ChangeLog.txt README.md ) @@ -58,12 +83,12 @@ src_configure() { -DPython3_LIBRARY="$(python_get_library_path)" -DPython3_EXECUTABLE="${PYTHON}" + -DUSE_QT5=$(usex !qt6) -DINSTALL_BUNDLED_DICTS=0 -DSYSTEM_LIBS_REQUIRED=1 -DUSE_SYSTEM_LIBS=1 - -DUSE_QT6=0 ) - use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax ) + # use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax ) cmake_src_configure } @@ -72,4 +97,9 @@ src_install() { cmake_src_install python_fix_shebang "${ED}"/usr/share/sigil/ python_optimize "${ED}"/usr/share/sigil/ + + if use doc; then + dodoc "${DISTDIR}/${DOC_FILE}" + docompress -x /usr/share/doc/${PF}/${DOC_FILE} + fi } diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild index 6b6eb6730501..8c1be8fa076d 100644 --- a/app-text/sloccount/sloccount-2.26-r3.ebuild +++ b/app-text/sloccount/sloccount-2.26-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="dev-lang/perl" DEPEND="${RDEPEND}" diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest deleted file mode 100644 index 6eaa470c5b06..000000000000 --- a/app-text/stardict/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689a44d4e24978ef3535def3c8c45c37f066ea3969d141aef0c34c6040dcdaf6b3f337b178bbffaf52d86f SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae -DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0 -DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 -DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a diff --git a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch deleted file mode 100644 index 49cb284253af..000000000000 --- a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 Mon Sep 17 00:00:00 2001 -From: Nikolay Korotkiy <sikmir@gmail.com> -Date: Thu, 1 Sep 2016 14:11:41 +0300 -Subject: [PATCH] tabfile: incorrectly handles whitespace in file name - -Signed-off-by: Andrew Savchenko <bircoph@gmail.com> ---- - tools/src/libtabfile.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/src/libtabfile.cpp b/tools/src/libtabfile.cpp -index dda256a..2ee9dfd 100644 ---- a/tools/src/libtabfile.cpp -+++ b/tools/src/libtabfile.cpp -@@ -22,6 +22,7 @@ - #include <cstring> - #include <cstdlib> - #include <string> -+#include <sstream> - #include <glib/gstdio.h> - #include <glib.h> - -@@ -228,9 +229,10 @@ static bool write_dictionary(const char *filename, GArray *array) - g_message("%s wordcount: %d.", get_impl(basefilename), array->len); - - #ifndef _WIN32 -- std::string command(std::string("dictzip ") + dicfilename); -+ std::stringstream command; -+ command << "dictzip \"" << dicfilename << "\""; - int result; -- result = system(command.c_str()); -+ result = system(command.str().c_str()); - if (result == -1) { - g_print("system() error!\n"); - } --- -2.10.2 - diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml deleted file mode 100644 index 2734425ad0ed..000000000000 --- a/app-text/stardict/metadata.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - <longdescription> - StarDict is an international dictionary Software. It has powerful features - such as "Glob-style pattern matching", "Scan selection word," "Fuzzy - query," etc. Stardict Version3.0 has developed a lot of new functions, such - as Full-text translation, Net Dict. - </longdescription> - <use> - <flag name="advertisement">Enable stardict advertisements plugin</flag> - <flag name="cal">Enable calendar support using cal program</flag> - <flag name="dictdotcn">Enable dict.cn network plugin (for Chinese language)</flag> - <flag name="espeak">Enable text to speech synthesizer plugin using <pkg>app-accessibility/espeak</pkg> engine</flag> - <flag name="flite">Enable text to speech synthesizer plugin using <pkg>app-accessibility/flite</pkg> engine</flag> - <flag name="fortune">Enable plugin to read fortune messages using <pkg>games-misc/fortune-mod</pkg>. You may consider installing <pkg>games-misc/fortune-mod-all</pkg> to get all fortune messages.</flag> - <flag name="gucharmap">Enable plugin for unicode symbols description using <pkg>gnome-extra/gucharmap</pkg></flag> - <flag name="htmlparse">Enable plugin to parse dictionaries with html content</flag> - <flag name="info">Enable plugin to read info pages</flag> - <flag name="man">Enable plugin to read manual pages</flag> - <flag name="powerwordparse">Enable plugin to parse powerword dictionaries</flag> - <flag name="pronounce">Install WyabdcRealPeopleTTS package (it is just many .wav files) to make StarDict pronounce English words</flag> - <flag name="qqwry">Enable QQWry plugin, which provides information (in Chinese language) about geographical positions, owner, etc. for IP addresses</flag> - <flag name="tools">Build and install dictionary management tools and converters from various dictionary formats</flag> - <flag name="updateinfo">Enable plugin to check for stardict updates</flag> - <flag name="wikiparse">Enable plugin to parse dictionaries in wikimedia format</flag> - <flag name="wordnet">Enable wordnet plugin to find similar English words using lexical database</flag> - <flag name="xdxfparse">Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)</flag> - <flag name="youdaodict">Enable youdao.com network plugin (for Chinese language)</flag> - </use> - <upstream> - <remote-id type="sourceforge">stardict-4</remote-id> - <remote-id type="github">huzheng001/stardict-3</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild deleted file mode 100644 index 717768451a5b..000000000000 --- a/app-text/stardict/stardict-3.0.6-r4.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files, -# their indexes seem to be in a different format. So we'll keep them -# seperate for now. - -GNOME2_LA_PUNT=yes - -inherit flag-o-matic gnome2 - -DESCRIPTION="A international dictionary supporting fuzzy and glob style matching" -HOMEPAGE="http://stardict-4.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2 - pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) - qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )" - -LICENSE="CPL-1.0 GPL-3 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="advertisement debug dictdotcn espeak examples +gucharmap -+htmlparse man perl +powerwordparse pronounce qqwry spell -tools updateinfo +wikiparse +wordnet +xdxfparse" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.16:2 - dev-libs/libsigc++:2= - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.20:2 - x11-libs/libX11 - x11-libs/pango - gucharmap? ( gnome-extra/gucharmap:0= ) - spell? ( >=app-text/enchant-1.2:0 ) - tools? ( - dev-db/mysql-connector-c - dev-libs/libpcre:= - dev-libs/libxml2:= - ) -" -RDEPEND="${COMMON_DEPEND} - espeak? ( >=app-accessibility/espeak-1.29 ) - perl? ( dev-lang/perl ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/gnome-doc-utils - dev-libs/libxslt - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -# docs are messy, installed manually below -DOCS="" - -src_prepare() { - # From Fedora - # Remove unneeded sigc++ header files to make it sure - # that we are using system-wide libsigc++ - # (and these does not work on gcc43) - find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die - - # libsigc++ started to require c++11 support - append-cxxflags "-std=c++11" - - eapply_user - gnome2_src_prepare -} - -src_configure() { - # Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of - # libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will - # give you GNOME 2.x support, that is otherwise considered deprecated - # because of the deep GNOME 2.x core library dependencies - - # Festival plugin crashes, bug 188684. Disable for now. - gnome2_src_configure \ - --disable-festival \ - --disable-gnome-support \ - --disable-gpe-support \ - --disable-schemas-install \ - --disable-scrollkeeper \ - $(use_enable advertisement) \ - $(use_enable debug) \ - $(use_enable dictdotcn) \ - $(use_enable espeak) \ - $(use_enable gucharmap) \ - $(use_enable htmlparse) \ - $(use_enable man) \ - $(use_enable powerwordparse) \ - $(use_enable qqwry) \ - $(use_enable spell) \ - $(use_enable tools) \ - $(use_enable updateinfo) \ - $(use_enable wikiparse) \ - $(use_enable wordnet) \ - $(use_enable xdxfparse) -} - -src_install() { - gnome2_src_install - - dodoc AUTHORS ChangeLog README - - docinto dict - dodoc dict/{AUTHORS,ChangeLog,README,TODO} - dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation} - - docinto lib - dodoc lib/{AUTHORS,ChangeLog,README} - - if use examples; then - docinto dict - dodoc dict/doc/stardict-textual-dict* - docompress -x /usr/share/doc/${PF}/dict - fi - - if use qqwry; then - insinto /usr/share/${PN}/data - doins ../QQWry.Dat - fi - - if use pronounce; then - docinto WyabdcRealPeopleTTS - dodoc ../WyabdcRealPeopleTTS/{README,readme.txt} - rm -f ../WyabdcRealPeopleTTS/{README,readme.txt} - insinto /usr/share - doins -r ../WyabdcRealPeopleTTS - fi - - # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773 - # and additional scripts from tools dir - if use tools; then - local app - local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic - dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova - xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist - tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf - jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon - ${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki - ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan - xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb - resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin - ${PN}-bin2text ${PN}-repair" - - use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl" - - for app in ${apps}; do - if [[ "${app}" =~ ^${PN} ]]; then - dobin "tools/src/${app}" - else - newbin "tools/src/${app}" "${PN}_${app}" - fi - done - - docinto tools - dodoc tools/{AUTHORS,ChangeLog,README} - - if use examples; then - docinto tools - dodoc tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2} - docompress -x /usr/share/doc/${PF}/tools - fi - fi -} - -pkg_postinst() { - elog - elog "Note: festival text to speech (TTS) plugin is not built. To use festival" - elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:' - elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:' - elog '"echo %s | festival --tts"' - elog - elog "You will now need to install ${PN} dictionary files. If" - elog "you have not, execute the below to get a list of dictionaries:" - elog " emerge -s ${PN}-" - elog - elog "Additionally you may install any stardict dictionary from the net" - elog "by unpacking it to:" - elog " /usr/share/stardict/dic" - elog - - gnome2_pkg_postinst -} diff --git a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild deleted file mode 100644 index 5f1a969db7bd..000000000000 --- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files, -# their indexes seem to be in a different format. So we'll keep them -# seperate for now. - -GNOME2_LA_PUNT=yes - -inherit autotools flag-o-matic gnome2 - -DESCRIPTION="A international dictionary supporting fuzzy and glob style matching" -HOMEPAGE="http://stardict-4.sourceforge.net/ - https://github.com/huzheng001/stardict-3" -SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz - pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) - qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )" - -LICENSE="CPL-1.0 GPL-3 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="advertisement cal debug dictdotcn espeak examples flite -fortune gucharmap +htmlparse info man perl +powerwordparse -pronounce qqwry spell tools updateinfo +wikiparse +wordnet -+xdxfparse youdaodict" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/libsigc++:2= - media-libs/libcanberra[gtk3] - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - espeak? ( >=app-accessibility/espeak-1.29 ) - flite? ( app-accessibility/flite ) - gucharmap? ( gnome-extra/gucharmap:2.90= ) - spell? ( >=app-text/enchant-1.2:0 ) - tools? ( - dev-db/mysql-connector-c - dev-libs/expat - dev-libs/libpcre:= - dev-libs/libxml2:= - ) -" -RDEPEND="${COMMON_DEPEND} - info? ( sys-apps/texinfo ) - fortune? ( games-misc/fortune-mod ) - perl? ( dev-lang/perl ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/gnome-doc-utils - dev-libs/libxslt - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -# docs are messy, installed manually below -DOCS="" - -PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20160518-tabfile.patch" ) - -src_prepare() { - # From Fedora - # Remove unneeded sigc++ header files to make it sure - # that we are using system-wide libsigc++ - # (and these does not work on gcc43) - find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die - - # libsigc++ started to require c++11 support - append-cxxflags "-std=c++11" - - # bug 604318 - sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die - - eapply_user - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # Festival plugin crashes, bug 188684. Disable for now. - # Gnome2 support is disabled due to deprecation request, bug 644346 - gnome2_src_configure \ - --disable-darwin-support \ - --disable-festival \ - --disable-gnome-support \ - --disable-gpe-support \ - --disable-maemo-support \ - --disable-schemas-install \ - --disable-scrollkeeper \ - $(use_enable advertisement) \ - $(use_enable cal) \ - $(use_enable debug) \ - $(use_enable dictdotcn) \ - $(use_enable espeak) \ - $(use_enable flite) \ - $(use_enable fortune) \ - $(use_enable gucharmap) \ - $(use_enable htmlparse) \ - $(use_enable info) \ - $(use_enable man) \ - $(use_enable powerwordparse) \ - $(use_enable qqwry) \ - $(use_enable spell) \ - $(use_enable tools) \ - $(use_enable updateinfo) \ - $(use_enable wikiparse) \ - $(use_enable wordnet) \ - $(use_enable xdxfparse) \ - $(use_enable youdaodict) -} - -src_install() { - gnome2_src_install - - dodoc AUTHORS ChangeLog README - - docinto dict - dodoc dict/{AUTHORS,ChangeLog,README,TODO} - dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation} - dodoc -r dict/doc/wiki - - docinto lib - dodoc lib/{AUTHORS,ChangeLog,README} - - if use examples; then - docinto dict - dodoc dict/doc/stardict-textual-dict* - docompress -x /usr/share/doc/${PF}/dict - fi - - if use qqwry; then - insinto /usr/share/${PN}/data - doins ../QQWry.Dat - fi - - if use pronounce; then - docinto WyabdcRealPeopleTTS - dodoc ../WyabdcRealPeopleTTS/{README,readme.txt} - rm -f ../WyabdcRealPeopleTTS/{README,readme.txt} - insinto /usr/share - doins -r ../WyabdcRealPeopleTTS - fi - - # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773 - # and additional scripts from tools dir - if use tools; then - local app - local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic - wquick2dic ec50 directory2treedic treedict2dir jdictionary mova xmlinout - soothill kanjidic2 powerword kdic 21tech 21shiji buddhist tabfile - cedict edict duden ${PN}-dict-update degb2utf frgb2utf jpgb2utf gmx2utf - rucn kingsoft kingsoft2 wikipedia wikipediaImage babylon ${PN}2txt ${PN}-verify - fest2dict i2e2dict downloadwiki ooo2dict myspell2dic exc2i2e - dictbuilder tabfile2sql KangXi Unihan xiaoxuetang-ja wubi ydp2dict - wordnet lingvosound2resdb resdatabase2dir dir2resdatabase ${PN}-index - sd2foldoc - ${PN}-text2bin ${PN}-bin2text ${PN}-repair" - - use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl" - - for app in ${apps}; do - if [[ "${app}" =~ ^${PN} ]]; then - dobin "tools/src/${app}" - else - newbin "tools/src/${app}" "${PN}_${app}" - fi - done - - docinto tools - dodoc tools/{AUTHORS,ChangeLog,README} - - if use examples; then - docinto tools - dodoc tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2} - docompress -x /usr/share/doc/${PF}/tools - fi - fi -} - -pkg_postinst() { - elog - elog "Note: festival text to speech (TTS) plugin is not built. To use festival" - elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:' - elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:' - elog '"echo %s | festival --tts"' - elog - elog "You will now need to install ${PN} dictionary files. If" - elog "you have not, execute the below to get a list of dictionaries:" - elog " emerge -s ${PN}-" - elog - elog "Additionally you may install any stardict dictionary from the net" - elog "by unpacking it to:" - elog " /usr/share/stardict/dic" - elog - - gnome2_pkg_postinst -} diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild index 861c4f49af05..a37710bda3de 100644 --- a/app-text/sword/sword-1.9.0-r1.ebuild +++ b/app-text/sword/sword-1.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~loong ~ppc ~riscv x86 ~ppc-macos" +KEYWORDS="amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos" IUSE="clucene curl debug doc icu" RDEPEND="sys-libs/zlib diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild index 107e1b6ad9b4..28e57fb49920 100644 --- a/app-text/t1utils/t1utils-1.42.ebuild +++ b/app-text/t1utils/t1utils-1.42.ebuild @@ -6,7 +6,7 @@ EAPI=7 DESCRIPTION="Type 1 Font utilities" SRC_URI="http://www.lcdf.org/type/${P}.tar.gz" HOMEPAGE="http://www.lcdf.org/type/#t1utils" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" LICENSE="BSD" IUSE="" diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild index e39e7e2835a9..7dda52e34809 100644 --- a/app-text/tabler/tabler-2-r1.ebuild +++ b/app-text/tabler/tabler-2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A utility to create text art tables from delimited input" HOMEPAGE="https://sourceforge.net/projects/tabler/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild index 1b29eb2eb33a..6147418b0d58 100644 --- a/app-text/teckit/teckit-2.5.10.ebuild +++ b/app-text/teckit/teckit-2.5.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz" LICENSE="|| ( CPL-0.5 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/expat diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest index 22de478c5b30..316b6b3f4802 100644 --- a/app-text/tesseract/Manifest +++ b/app-text/tesseract/Manifest @@ -1,3 +1,4 @@ -DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 -DIST tesseract-5.2.0.tar.gz 1913462 BLAKE2B 6b80e5bb71543cf971683f66b87fd45a971a6f337ca53567d134c3bdc227f1338a3340f5bb5c2f183288135acd6521031b0f6de6e96e333fed4dc10e93b7319e SHA512 23ed931495e4ea793904f99a06a95a47873b923c4e5d8f3fc8f9203cac86b0e0013c416ab4d8d4a863a081eea00a196a0198c6fb17a39917a1baea2280d84794 DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34 +DIST tesseract-5.3.2.tar.gz 1916850 BLAKE2B d900f7e21a53a4ca77ab820359cf8b528ac0114816029c257dffa141ae9fdecfe4ddb97160b598d1f144c139f3fbceea080fb050802d6d3fa7ac8bc8e1353d72 SHA512 92db2a513f00b931a0207cc705020bee9fea4ff7fa93c57a6f446b5777713864cce19121b316ef8b78b6bd625ee7e6fd473352515f98c4a2187569cbd0a9713a +DIST tesseract-5.3.3.tar.gz 1918172 BLAKE2B 84676368e23d5d51462bbdaa5723d582cdcec3958e4224c6147ef35d260c933f0a217f1ddca2f71b37aa3045714d3a9f31980f02b8ff7a85fed5db072e0827cf SHA512 c04ae68ac4ecf85243c54feb4233e282cd420522588fd4b3eaa87619cb236a575052e3667a806c2f56de06dc013b88926c2dbea4cb4ee02f0119c032598169f2 +DIST tesseract-5.3.4.tar.gz 1918319 BLAKE2B f4becd425594be132df2c206847faa91daf9bc58d83eac31096f92cf7d7b6c9234ae224ee94ed1f3099414bde393bb86f94d1f76fdc05b4310b415b0d7eb05af SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a diff --git a/app-text/tesseract/tesseract-5.3.0.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild index 1fdc5a483f5c..bca9d3973c0e 100644 --- a/app-text/tesseract/tesseract-5.3.0.ebuild +++ b/app-text/tesseract/tesseract-5.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0/5" -KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" PATCHES=( "${FILESDIR}"/${P}-gcc-13.patch diff --git a/app-text/tesseract/tesseract-5.2.0-r1.ebuild b/app-text/tesseract/tesseract-5.3.2.ebuild index 0a4c4d47b1ba..aff1d194ec10 100644 --- a/app-text/tesseract/tesseract-5.2.0-r1.ebuild +++ b/app-text/tesseract/tesseract-5.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/app-text/tesseract/tesseract-4.1.1-r1.ebuild b/app-text/tesseract/tesseract-5.3.3.ebuild index da21cdb9b7cb..aff1d194ec10 100644 --- a/app-text/tesseract/tesseract-4.1.1-r1.ebuild +++ b/app-text/tesseract/tesseract-5.3.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools multilib-minimal toolchain-funcs @@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/tesseract-ocr" SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="doc jpeg opencl openmp png static-libs tiff training webp" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] opencl? ( @@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -55,6 +55,7 @@ multilib_src_configure() { local myeconfargs=( --enable-shared --disable-graphics + $(use_enable float32) $(use_enable opencl) $(use_enable openmp) $(use_enable static-libs static) diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild new file mode 100644 index 000000000000..aff1d194ec10 --- /dev/null +++ b/app-text/tesseract/tesseract-5.3.4.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal toolchain-funcs + +DESCRIPTION="An OCR Engine, originally developed at HP, now open source" +HOMEPAGE="https://github.com/tesseract-ocr" +SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" + +COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] + opencl? ( + virtual/opencl[${MULTILIB_USEDEP}] + media-libs/tiff:=[${MULTILIB_USEDEP}] + media-libs/leptonica:=[tiff] + ) + training? ( + dev-libs/icu:= + x11-libs/pango:= + x11-libs/cairo:= + )" +RDEPEND="${COMMON_DEPEND} + || ( + >=app-text/tessdata_fast-4.0.0 + >=app-text/tessdata_best-4.0.0 + >=app-text/tessdata_legacy-4.0.0 + )" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + doc? ( app-text/doxygen )" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + # scrollview disabled for now, see bug #686944 + local myeconfargs=( + --enable-shared + --disable-graphics + $(use_enable float32) + $(use_enable opencl) + $(use_enable openmp) + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + if multilib_is_native_abi; then + use doc && emake doc + use training && emake training + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md ) + if use doc; then + HTML_DOCS=( doc/html/. ) + fi + einstalldocs + + if use training; then + emake DESTDIR="${D}" training-install + fi + fi + emake DESTDIR="${D}" install +} + +multilib_src_install_all() { + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild index c5874d14572d..4c31653fca31 100644 --- a/app-text/tesseract/tesseract-9999.ebuild +++ b/app-text/tesseract/tesseract-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,14 +12,9 @@ EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="" -IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp" +IUSE="doc float32 jpeg openmp png static-libs tiff training webp" COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?] - opencl? ( - virtual/opencl[${MULTILIB_USEDEP}] - media-libs/tiff:=[${MULTILIB_USEDEP}] - media-libs/leptonica:=[tiff] - ) training? ( dev-libs/icu:= x11-libs/pango:= @@ -35,7 +30,7 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -56,7 +51,6 @@ multilib_src_configure() { --enable-shared --disable-graphics $(use_enable float32) - $(use_enable opencl) $(use_enable openmp) $(use_enable static-libs static) ) diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild index 884da901cc17..3901e29fb5c1 100644 --- a/app-text/texi2html/texi2html-5.0-r1.ebuild +++ b/app-text/texi2html/texi2html-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="unicode" RESTRICT="test" #411523 diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest index 8dbfede79199..b699c8e6db21 100644 --- a/app-text/texlive-core/Manifest +++ b/app-text/texlive-core/Manifest @@ -1,6 +1,47 @@ +DIST autosp.doc.r58211.tar.xz 282136 BLAKE2B 2e82f41d20f8883cf277527e6e0fdcb9b402520109d94bf76668ad603d15e192970c576fffa17bde092d8f2a6d92db021fbd408e3df2e282bbad738edfed7136 SHA512 2905669b9e2b61749cb7b1eaa02be889c4e8d8adbd78b126e7ee6d894f24f623c888a24abac1d163f3332c5cfa9cd1f64d0de95200350b88a7f47faeacb841a6 +DIST autosp.r58211.tar.xz 696 BLAKE2B 4a533789fc9572e48da68d7fb284df4461e42a717edd0f4578ab83c7e58841bbc1d3c2821e41840a531077ec887203752f5c40f51849129aed8e6f8971c728cf SHA512 67587e8b456257be9b924a5bb8c8f4def22fa9aa9678663975ef74e346dc186ae7848a9dc043733cf1244f254750ef4f34204575f62195d4b966ed8336781bce +DIST axodraw2.doc.r58155.tar.xz 489832 BLAKE2B d0678cc4eff41ff235dcc8465cc62ad9fb9c52a7eb24487f9ca1766197c0c29111bb11931ca4fba537b8540e242257734c81c15e65ee3713028c78d1edb2385f SHA512 927e42358d543f46ccabb8184e35b6f0a5848783ce9eea09e6c780fc83955d5f37b998254153b1954cf1a59be6cfe573a6c79c2c328ab2a22a6e5f6764a50fa1 +DIST axodraw2.r58155.tar.xz 25592 BLAKE2B aa1cebf422d8eb6257d8baf743b24bddc4b666f968e4f89c77463f9c979412a0e59f3d3a1a1728f1a5f782e4725d85f1d320ae1e8932174526ea1176ab7f9138 SHA512 bc9923a9614ef9d7bece20e682729347dc942470a927b40736d6868f02867408b5fba51b117edd8745f96df23b9c1e93792d321291db13b7fdfdae0ee32bb7fd +DIST axodraw2.source.r58155.tar.xz 34604 BLAKE2B 44f52a481e6f1610a698fd498689be272450548129ad3d28abbd20773d8d2cd901ffa57391695f7fa19e5ae22948eb2fb77bc17cf107b241439d82d3e21067b5 SHA512 3c2fbbff234836ffe40edb7f38c77c5986cca7fc68b3dd7672bb4f1ce9327a12fa8c51d38461d914cd6466bac8b2b578a151d09d4e84dd903530f7a545d707d9 +DIST chktex.doc.r64797.tar.xz 425796 BLAKE2B 4a0d4456231003362c41ec5360b21721bd5ac28489e8105ef749029d20482b69d49b9674055744fd3cda45fda824e0665b6fa54b6289945d4044211bfe592eb5 SHA512 28df4bed075d66d9f25bcbe332731f1d5f0bb0f7f92bd2f3618c84adf788d0f429bd0c6e75381ebf7bbeac98409d94f85d17ebd752f9e4af707d9e3373d45f97 +DIST chktex.r64797.tar.xz 9920 BLAKE2B cb6c37daae77ed5d4fc50e00249a92cc614ff0086e006e471d1ac4fb5dfacb76856d619248eba15923b34d422884923b4fec6c693133f4d8e2aad52693920902 SHA512 7c28847e87e788d0f50c07c1c3140962a70173d2a36997720f3066755740744060ecd03272662aff563de39102052e91a4582a4bb63e35f918ad8f517dff55e6 +DIST detex.doc.r66186.tar.xz 21900 BLAKE2B 84b515297cf285e37d6de400e0f1e201afc60cca9aab68678adf31a5aaa2e03e68e9d8e13a6b41afa177c4d3e01fbbbefc9900fb6a5120eaa802429abcaf4710 SHA512 3d5a3b371e007bda61441460479a208062fd0d477d1fc9ab9a6764c1969fd383acec9e336e8d0b16aab5606444f5d87335320e010657cf088e9caeb18d6dddf5 +DIST detex.r66186.tar.xz 592 BLAKE2B 48daa6b86bab76f7c58cbb159838d03e7a82990bb1cf3ba382169d9b33b42585c11d7822fcc01d33f58ba8e62dc28a6eb8092ff595f6b07d9716a8311b70685f SHA512 e258d80d1509831132c4f70df81b8e93cfc9d92ee74c5d39e7f35bd4f71a3eb93fe3594afbd5ab0e33cf0b6f45c816506e32ca8f41427f3c3fe661f3086100d1 +DIST dvi2tty.doc.r66186.tar.xz 37148 BLAKE2B 67491285e41c035d2f6d0c69bcae2b98614db421462a3171cc68592ee78345b9651d09efd344268d2130c2fb33c4f3cf777656a984b45d796c9ababa17ee74d3 SHA512 3ee736f5fbf91472008a5c8613c0e629a9f76f61fee4c4491b67045ddaad7aa2f89a22937b172e058b072ae1a013478fdf5a9f68dd2e225e8a8e77c8e3b3a289 +DIST dvi2tty.r66186.tar.xz 480 BLAKE2B 3cfea2173611e643b27bc6828dca68e6fae60a147b347c589ec176974db03c36bb1c97a734cd5010a8979dca9a3b515255dedeb2a0d82513ce2667bffcf698f3 SHA512 1051c3448703fdd6395d78b0d8b7658197da6114fb7455b31502bad5c2eda24fd4eba2ceaba1f65d106f981bbc60caf9f3bd0db29403e898b293514d086bf91d +DIST dvidvi.doc.r65952.tar.xz 19328 BLAKE2B 7b443d8c60106025209ca693cc810afefdf4c3b389478c32caa70ae1d1d25720a42b687fc27753009dbd07520f8276beecb90877e5f84d2d4ec32aa42283e1f5 SHA512 b571021445b822e9824782ab35a0743ca23f69b809354dea6676c58209a451be5bf595641fbcb461211e6dec15e765bbfaf8164c0ce1ed4204ea72a2073ecb92 +DIST dvidvi.r65952.tar.xz 440 BLAKE2B 2c5e584b38c74ba3e929671b87ab0f9d9b783feab2ab91ef6e62e4aa38548615284ec98686e0d00fdc91549c04e5a2d6bd197e18f4138a0c00d52d3ddec450ac SHA512 81c58f4e1352a8e5133de1ad86b6b37c47f9b0d29307354001693ebc4975c30808e349c73a477283a16df4219fd5702b733ecb5abe2043aff1d1b537b7fa6a3c +DIST dviljk.doc.r66186.tar.xz 74932 BLAKE2B bbc6fb3ef83ab413582847ada4f562c8d1921b78f45619b7e18867fb9cf94723c699b9d83252e8f8796b5693371770af8b0316818c09bb7632588832ff195a9d SHA512 4b5815d766a41eb74125269e297eb6f7d1626d68b3f2cf9d6c4f8734721e3c71b63e84e729c39fef41320e4f728888796e421bb5c7ea5ffe76cd549400d18d37 +DIST dviljk.r66186.tar.xz 508 BLAKE2B 2c5dab57224abbdd47a77312e1c83da9c9aaa47213925782beb014d7a4963f12169676114fcbf61fdc15fc8daa5ad6d2dc983fc105186bc70804c1f7d84039af SHA512 0d34e837c0f67ac43dd8ef5bfb9a11d2821188ef8259f41b0cf9454bfa6641f956c21d63fe15fbd68dd59f89c1da820cab4ec5c4579fc0255a771c47010821cc +DIST dvipdfmx.doc.r69127.tar.xz 3125132 BLAKE2B b29cc6a2f1934fdeab678a5246154b1bef498dad8bcc47dcfc5e3a3bd2580ecbbf887aec527095e1542f763919e650d96592c391adb35668e9802491f6c33a32 SHA512 d2fb71e116470d2d629613401f448ad9aa8cfdfa9ada68ed324061e4ac614efc4fd2c4ea2542c8fae32f476b92aafbabe4a5be648f28f16708c43958d7aa99fd +DIST dvipdfmx.r69127.tar.xz 26704 BLAKE2B 7d2790d9aa6b994ab3619bd96ea6880e9243105001224d7bbadd130b03c7b8335fe751bdcbb90ef5ad92d60d3a80e63f0f152d50725a80cf1c78e45ab5c9245d SHA512 75703f600365c90379c5d009e00d35d2e514a76b2556c96c84fc2a717287441af419a26fc9ef087d111f2e77c7180f6371ca2ec33b66052ab63ca3d11f48e788 +DIST dvipos.doc.r66186.tar.xz 28764 BLAKE2B 7bc90b21109d52375ffdfef601722d0d3bb36932556f8f29ae62cd4f62c2171da2cf08f9bec72f368711dea071cd15b09f3d3661a91013a086c3a6621abc8794 SHA512 254a1db41636608a133e7807a8d4ea8ddd99ac646f35b66a43205ac7fdaf4a15c21eafbb85e23a182506e509895776d1fcbe63b3b8a7f197d577c6405ece5c44 +DIST dvipos.r66186.tar.xz 296 BLAKE2B 1560c5a795df9c095c8115e7f0296ffa3206dd2630a8cf2df9dd76aa2ae1c6b5f044d327c44d026bd94bf80d6bab12cf7da04ef5b7ccb3291762a495d8a4764c SHA512 9e949fb402facda9c30fa2f388b80f2cfc530670b33cbd78559e4449fa6004c5d4082e4fb895ea397a334a333e5d5ae1a4f66fde3885f0a9eb28c9d9ebbecd0a +DIST gentoo-tex-patches-3.tar.bz2 3860 BLAKE2B 048d1fb59909f0f319f7a77ca424dd48d1f879d7c97be5c683e6c76142d1a878705adfd3cd734e401bbf2cf319c7e539540781bd9ab0fc937b2c93e129e3ceac SHA512 6976ddf60b6b61fb04c04ddae1fcc98372047b7186a34cd531f0a5011b69310b598db89f216265d91e9a465fd4a4e7410920ae1373b378495beeeb537c73a17a +DIST gsftopk.doc.r52851.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805 +DIST gsftopk.r52851.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413 +DIST hyphen-base.r68321.tar.xz 22604 BLAKE2B b11b688304c3622c71ddbb38e9095e550871360418d176ab717bdc59954c0648636e5627f55180980e789efed918dfdbab55c25b1b95c8ab0467398b1b2592c4 SHA512 d3f2749cc6946702ff0d51c1d823531bc92b77c1106aec252c84cc8649aa56048556c90e9792f1b0749bba0b86b7c34aa2b04fe2946d1226315dbc73add36913 +DIST lacheck.doc.r66186.tar.xz 21012 BLAKE2B 3a7fa847b83a105c8a6c0d8210f0bc344642e8503700b32b58a43b66a2a97dfaf4ef08af1005588ef16e688af3c00202a3a5142074cd7f767956900a7182f8e4 SHA512 cf4355d56985f9335270e4280d10602299fadfd01605e83edb4e8b89cf0d91b3e8ca671257a9599d5f5578e7a85140d390edd40c3b109f77bb9fca5ba47ca517 +DIST lacheck.r66186.tar.xz 436 BLAKE2B bd36c4f98235e682a3b40fec649b0eb1e800ad268a69ddf42daa32dd72f670809b15c50b98e717b98b25eef844ea0a0b1a5c962d62fe254d30f2fb7e499e5f49 SHA512 5a27d940fe59c61539d053bc6602bf37df1f538679eaf34d0e8b3ec3aed74ff619e4843ae2769aeafd10074328e9e27255376bc9e809d373d3913995a2a95b87 +DIST m-tx.doc.r64182.tar.xz 739512 BLAKE2B b4c79ffe3272e00caa4b256b118f43752adecc49f726722dc18276ca0092920908859a150915178c3bad460fd172762c1d016c55e886475582b3ac2c99200741 SHA512 316fbc2b37b903cae8da6bb9f44b8afad0e3e577c6fd84664e1724ffe318bbdbf9609dcadd5cde6a14cc5acbc134f69bd7a87dd90d9da7d4442a5f913b8132f5 +DIST m-tx.r64182.tar.xz 4524 BLAKE2B 79addf613831e0c1db995c627dc0557245cefc980e3e058db130db52179bd3bde7bddf23f29c60f062a6313ef51e269e8937e6195813982139ef279d9168d138 SHA512 b56bc4432bcd340f3e92f5043c38bde7f14b5f2d32b9433fa21c73c20f7ebb981714175aa6f4f871636efb62a52cd24aa639e87a320039313b16db1b027ee2f5 +DIST makeindex.doc.r62517.tar.xz 466380 BLAKE2B a192f04417e76a387c9dec21705704911e016e54911d0dc83d7ee511f86f74edd615378aa1e0cf3cc2c10a6cb56244b6c2ccf40e3ae09b17ceb4e0c01d76d39e SHA512 40b9ee1ebf7dba9a4bb4bb3077cdb1e88b07f276a9d0ae9c2817bd76a2f742ec9237d1b6d9658694fc5fc4e8f82591194862637bd83ea8e106c0541591d343ee +DIST makeindex.r62517.tar.xz 4608 BLAKE2B d86957d1598cdd16025d43cca88547893824ef9bce3f75190874de40949ec0995db039b42d38b4514fd256feb6f3dd4352357de84c0d9a087aa48d0f7d17ca29 SHA512 5967ba4123fd4c708ce841d29211fdb66c28518f4b418903be0ddf2a49964f706af96b250eec814c547e0703460c1273ce72a7acf3ea9fe28cc1c7073af29d3c +DIST pmx.doc.r65926.tar.xz 636768 BLAKE2B 5b499d950581b5b6ca1e27aa54dbe1e324d4462999f9a8f52c314c9a4827183079dbc0d945542d304621ad94aca3f7f4cfdcb985e40c7be00c7fdff8fb95825a SHA512 dedba4570b68a8628442716dc3a9b1699e5f531aef2737e4b3f47862a91ba69bda91d6fe6692914d2bd7b8fe3188a83fdfce8bdd219ab7c4f238a9c6ec273ffb +DIST pmx.r65926.tar.xz 10184 BLAKE2B 550140955d4033c258c7793c56846d8a0d235fcb2def0469f9b0ca5189eea4c3ba569fc3e7002bafe57f0bb7fbb9738debd7b1d867cfaf32493b3558f0a3ed97 SHA512 433287732fbb2cb47886c6c78c923d5b6a1b5c1e71e3990084cde9bb288a282fff7fb9134a5165e0fc0908b8e60547e23cb900bc82b99717133d7600fa17dc31 +DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 4878654c60e2fb3a1415f492894a3d956d86cdd6f8ebc337e4ec928a55ccd2b8c202a3c06b3c8687530a505f45e740eb33005e2cd4c2f65aa68ec77e3990ed31 SHA512 fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba +DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6 SHA512 f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 +DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96 +DIST texlive-core-2021-CVE-2023-32700.patch.xz 8824 BLAKE2B 5df988abb12626210b372618cc0a623ed2f6f42cf2f03dca143f94b928fc0fd2e28e53574c9ca23295f55fb56cd908a3e8603161fa3f13c37b9397163479aa9f SHA512 16d34b5b0cc1b85ec412798caa582f71b15c2d57bb486064c5fb48304eea32a13f69677c228c82c88e026ba5885acd201449ec69bc6c7bf9396eebb3d1358717 DIST texlive-core-patches-2021-1.tar.xz 4820 BLAKE2B 1316cdc65c8f0a7164169fc6a795c50f7fccc99cea7a80290c18189f931b002e47b081de593c47d8da9650498a279f7d0473f115f02b37993859fcd475dbebed SHA512 4267934427265995c2a0c00d837399ec9670ba5c7df5c4599a486a2098de9a05640ff77f29bd7390070f3c973e5cc067356cfdd6b2c9415b7a56b96de789fb82 +DIST texlive-scripts-extra.doc.r62517.tar.xz 197196 BLAKE2B 80d2fd7b53ffbe21f975156cf0d5f52826faebc422d3e66c342c8237d7da27ba58b1ffc56f83a040ae4b4e870c8063c0d53392f9cc7e3bb3da30ebe5a258a40a SHA512 22cf59bf4dafc7ad9425086bc0aaedb2bf5f7d8aa6ea9c65abde2d523be37665b9c9bee4acb399857eae03613e7241ca1d6099f43cab77a95c10eced8813ad80 +DIST texlive-scripts-extra.r62517.tar.xz 23540 BLAKE2B 85762b7a74f5132ec550033e08caef5f6fd145ef367475a1b3ebaccfefdcfb426f2e12e647e45a35daa2a44cf0c2fba8d6ed8afec88ed6fccee0cf7eb52c2c50 SHA512 46ac37826d3c60de6c9260bf83d6275d49a35cbde88fb03481a050f92e87b698e9a94b2e520a74edc0417419f5a2dee53000a529b9c81ea6f6244a83480e56e7 +DIST texlive-scripts.doc.r69754.tar.xz 432212 BLAKE2B a1597fea1443974012eac8b0b060c770e5421ee08b8a8aea8c32c94abf153ae22cac29015e074ffd164e0c5c355034c0fefb673fa917ccf98afebb511492ccc5 SHA512 0a319e6864787c0b62a7f0fb389497a94449c6b420573805a1ba49fb11d0453f5727d2f44a935468cb6c7945d177a5ca828ef4209f717aeb5b21d2b523f21b82 +DIST texlive-scripts.r69754.tar.xz 114048 BLAKE2B cf5151516f46405c0ade2bedf033f58751f5ea2d3e54aaa1227ddf761c86ef3110621ed8bca4647503aa24d628cd77d7ceac927427dcdcb1bf98ce2d98039647 SHA512 18bbec6acc0a6b1686daaef95627acd27975f37c3908584f3fadb2a35c8f632c62b6ad4aa214bb894af2e07b984f7950178924ad4d295b1339fcefdf2c19fa55 DIST texlive-tlpdb-2021.tar.xz 1335040 BLAKE2B a5608b329666ad55032fb9dbf7fc6da9b8b2c94c03aed838cf8575742a23294f3319ad8e45fd6b4f65cc59f673c78b9d96b4f24e2ad07a8a08aa313822eea137 SHA512 ca9d5f2231246984ec489b4dfffb93c8b9540b8479a521aa91658fba3ce452c814e9e24e28d9ab6a0124d8eaf4cf7c14fefb379e84b3495752a9a2b8a2add3db +DIST texlive.infra.doc.r69740.tar.xz 203936 BLAKE2B d7628b83989ca3def86fa86ef4056e3ab8dd5e262d45b39d550ab7940c4a387b77156ae14a4dd64ed8fa6610a84559f85236908a83be05a1dae3949ef0a22325 SHA512 fb06ad12bea2d062dd5e2049e74e096064198242f010cd6e04e2d4a92a7fc39ae829003c7ed3f8347f96c99c31e26ec44073b45ed3ebbe9e18fc78e801d00c94 +DIST texlive.infra.r69740.tar.xz 361928 BLAKE2B 233fd046a446c9de00b167aac93ea4a2499b1e23c24eae5f2dd72e2340650d34580fa07640ab3b423fcf91809b247289e91322db72b365681cadbf045ee1d4f5 SHA512 d3ef23150149d240d8b74f5b9f6126de90f44960238deefa94415310586790d5324f9fd83478fa4d726ef6dff516f5382222f56933599b384101521a66d0a248 DIST tl-a2ping-2021.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420 DIST tl-a2ping.doc-2021.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb DIST tl-adhocfilelist-2021.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954 @@ -191,3 +232,15 @@ DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23 DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404 +DIST tpic2pdftex.doc.r52851.tar.xz 54400 BLAKE2B 66f8087a6f8a1337a55bb3b29a9d407a54a5b79dc48eb50144eb0b505d3735ccc3d192669a95ea9e62ffc20927f48f03933c353557f7c49df5edc27c4573a6f1 SHA512 f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547 +DIST tpic2pdftex.r52851.tar.xz 444 BLAKE2B 37bb1d8799068bc09fca6fffc5d43ab314f44b564221faa9ca23aecb84b3686b9e279b1aa3ee4664537fd943d944158034943ea4d1f8fcaedd4cdb2acc5dbfaf SHA512 fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226 +DIST upmendex.doc.r66381.tar.xz 968624 BLAKE2B 193cadbed3430f4636ef0a3cd86e972d510c113e60ca26f15547b081ae7992195a991bbff8409721ec1bd9a7596d4b29994e1d4b566adcbfa8af693225212c39 SHA512 ec4d1670ff84680fcab88e29ca5f4306f44450ccca9cba06282ad34bd026f74b46d166724a06a313957ca8d798b0c296e848bb248ad416597a99afb16b4b5a0c +DIST upmendex.r66381.tar.xz 740 BLAKE2B 8eb905b2c6c03ed922580e8e4753e67430de76376ca10b1517bb4f974fabbf428a286876656d210d6ff9c433f79a6fccad9353d08aed73d1b8a3952383361ba1 SHA512 947d733e5b96ee6a621e9686357b8c3f8638c0bc482f4efaac87a72117160f81ad7aa0d34088e61e67982b345b56ec478ef3b6a49865ffb3d5512a7bf18d2b8e +DIST velthuis.doc.r66186.tar.xz 979936 BLAKE2B e1ac5b3bc747b17c5ab39e89d7f1634ac48cc9cc0b3883ca54ca039cf1f69e4b7f025f4cc0fcdaea85c921147db525e836e3201f387a84413db9c916c40fc268 SHA512 06a9330410b55052759e18efa8720ef65f0f3dc8a2f15d3c0a0c8f70edaf8de65eeef8ec10a9a376b4b285b1c8f619278f68e9a2bd7ba1622da72b6ff488f8f7 +DIST velthuis.r66186.tar.xz 4149432 BLAKE2B 84e6a6c390e5e2f4082229d688761596880f8115531587df7ac637c6eb53090e035e758d0cde60ba30559d856df2108637d19c8282279d5d95a28dd3e950b635 SHA512 b7901813517790a92a921b1202c39a058d53a4159634cae79960ec7ce2da08acb757b307b5066ab1251e4b460234fd9dd98c2e404c05fc6384c656472302e3ec +DIST vlna.doc.r66186.tar.xz 142752 BLAKE2B 2a7a5aa68e189e8297c0bb714ae80ef33b765de542626f5800dc1ef87dc8e66a613eb055ece652124c340b159ec7a317d2d3a44bb2c8e01187b9b9d5392b5a25 SHA512 921d76535cbe7e940617355c74b82acfc61edb840db8ed9cae1aaf987fe6b83245505048c7c550d59829b204f139ae1cfd44601435e2fff2b0d5230b45a27b77 +DIST vlna.r66186.tar.xz 380 BLAKE2B 91840e28251f06b724eb5860c853d54db9cc0ce0063b911d7c28d24e1b7bc863bec0eaf7f595e666938d8c2a54c2438d52d086fc5c8b70ebf20f3998d0258381 SHA512 6c66717442bca3306e23f5d546e17929240ce9626a562b9e56512446998996d38f83f78fbb39e46bde0b9faf0db7eb0c0218c79e1d66711d6cd3c64a8778edec +DIST xindy.doc.r65958.tar.xz 461176 BLAKE2B 417d49c0fbc35ea5e24146894284cd2ec9109271570f49aca90352d2d38969ee60b934134babe8107161e2f2975d91787f321b805dded6eae96add1e5ebfa9dc SHA512 d0dacd7cfa169b03b7fa9d0b351133582577c3908323f501d7bca7b0165159b72c34f62abfd73b97065baef8cf179b292e654759f3b3e324112623539e5acfd6 +DIST xindy.r65958.tar.xz 143636 BLAKE2B 72c6f4a78e77d3a348c4666dd8e322b446b7dd6d418c1f9880ea2508e274878d3f2a992e5876fb410ab4c39d7f317a6b236afc65c5486d04dbe0838c0a07eca4 SHA512 9b7fe97c14e3cf30d1e6743c2d7b4460e8bca901ba3ee216001f1518ff4d834fb3d9b67085825a6e152c6acde544c41cf16d56e609016caab89a594305a21599 +DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a483181544afd319b501ea0f4b0c74ce9d049840c65fa5e7e497571ae04c409b8c3cb11815f0dbfff4c8c3ae01a3e639f6ca8 SHA512 973960f65159f5107caa7e9a041dca75f0171fc61f94794c7b7560eb9b6898534974fb8b360a28dfa3a01d422b71618bcaf8aba2ed25ae4d4b9f67d24ab730be +DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b diff --git a/app-text/texlive-core/texlive-core-2021-r6.ebuild b/app-text/texlive-core/texlive-core-2021-r6.ebuild index 5f3008ea928a..7dae7935c65b 100644 --- a/app-text/texlive-core/texlive-core-2021-r6.ebuild +++ b/app-text/texlive-core/texlive-core-2021-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,9 +17,9 @@ HOMEPAGE="https://tug.org/texlive/" SLOT="0" LICENSE="GPL-2 LPPL-1.3c TeX" -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${MY_P}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz" # We ship binextra collection alongside TL_CORE_BINEXTRA_MODULES=" @@ -62,21 +62,21 @@ TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${T TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}" for i in ${TL_CORE_EXTRA_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} doc? ( " for i in ${TL_CORE_EXTRA_DOC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} )" SRC_URI="${SRC_URI} source? ( " for i in ${TL_CORE_EXTRA_SRC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cjk X doc source tk +luajittex xetex xindy" TEXMF_PATH=/usr/share/texmf-dist @@ -111,7 +111,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} >=dev-libs/kpathsea-6.3.2:=" BDEPEND="sys-apps/ed - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" DEPEND="${COMMON_DEPEND}" diff --git a/app-text/texlive-core/texlive-core-2021-r3.ebuild b/app-text/texlive-core/texlive-core-2021-r7.ebuild index bc3e5846cb3e..bd89b0fca8e3 100644 --- a/app-text/texlive-core/texlive-core-2021-r3.ebuild +++ b/app-text/texlive-core/texlive-core-2021-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,9 +17,12 @@ HOMEPAGE="https://tug.org/texlive/" SLOT="0" LICENSE="GPL-2 LPPL-1.3c TeX" -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${MY_P}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz" +SRC_URI=" + https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/texlive-core-2021-CVE-2023-32700.patch.xz +" # We ship binextra collection alongside TL_CORE_BINEXTRA_MODULES=" @@ -62,21 +65,21 @@ TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${T TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}" for i in ${TL_CORE_EXTRA_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} doc? ( " for i in ${TL_CORE_EXTRA_DOC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} )" SRC_URI="${SRC_URI} source? ( " for i in ${TL_CORE_EXTRA_SRC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" + SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz" done SRC_URI="${SRC_URI} )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cjk X doc source tk +luajittex xetex xindy" TEXMF_PATH=/usr/share/texmf-dist @@ -111,7 +114,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} >=dev-libs/kpathsea-6.3.2:=" BDEPEND="sys-apps/ed - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" DEPEND="${COMMON_DEPEND}" @@ -165,14 +168,24 @@ src_prepare() { eapply "${WORKDIR}"/patches eapply "${FILESDIR}"/${P}-cairo-strings.patch + eapply "${FILESDIR}"/${P}-slibtool.patch + eapply "${FILESDIR}"/${P}-clang-16.patch + eapply "${WORKDIR}"/${P}-CVE-2023-32700.patch default elibtoolize + + # Drop this on 2022 bump! "${B}"/reautoconf libs/cairo || die } src_configure() { + # TODO: report upstream + # bug #915223 + append-flags -fno-strict-aliasing + filter-lto + # It fails on alpha without this use alpha && append-ldflags "-Wl,--no-relax" @@ -185,6 +198,9 @@ src_configure() { # Also only pkg-config works for prefix as described in bug #690094 export ac_cv_prog_ac_ct_FT2_CONFIG=no + # revisit/upstream once we bupm to 2022, bug #882245 + append-cppflags -D_GNU_SOURCE + tc-export CC CXX AR RANLIB ECONF_SOURCE="${B}" \ econf -C \ @@ -266,6 +282,7 @@ src_configure() { src_compile() { tc-export CC CXX AR RANLIB + emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} cd "${B}" || die @@ -285,6 +302,7 @@ src_compile() { src_install() { dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c + emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install cd "${B}" || die @@ -354,6 +372,24 @@ pkg_postinst() { elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge," elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update." elog + + local display_migration_hint=false + if [[ -n ${REPLACING_VERSIONS} ]]; then + local new_texlive_ver=$(ver_cut 1) + local replaced_version + for replaced_version in ${REPLACING_VERSIONS}; do + replaced_version=$(ver_cut 1 ${replaced_version}) + if (( replaced_version < new_texlive_version )); then + display_migration_hint=true + break + fi + done + fi + + if ! ${display_migration_hint}; then + return + fi + ewarn "If you are migrating from an older TeX distribution" ewarn "Please make sure you have read:" ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide" diff --git a/app-text/texlive-core/texlive-core-2021-r2.ebuild b/app-text/texlive-core/texlive-core-2023-r1.ebuild index ab7fa1955b85..5132353ada60 100644 --- a/app-text/texlive-core/texlive-core-2021-r2.ebuild +++ b/app-text/texlive-core/texlive-core-2023-r1.ebuild @@ -1,140 +1,193 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -TL_SOURCE_VERSION=20210325 +EAPI="8" +TL_SOURCE_VERSION=20230311 inherit flag-o-matic toolchain-funcs libtool texlive-common MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source -PATCHLEVEL=1 - DESCRIPTION="A complete TeX distribution" HOMEPAGE="https://tug.org/texlive/" SLOT="0" -LICENSE="GPL-2 LPPL-1.3c TeX" - -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${MY_P}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz - https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz" - -# We ship binextra collection alongside -TL_CORE_BINEXTRA_MODULES=" - a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk - clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro - dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph - fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize - latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg - listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam - pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps - seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten - texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate - texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra - " -TL_CORE_BINEXTRA_DOC_MODULES=" - a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc - checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc - ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc - dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc - dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc - ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc - latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc - make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc - pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc - pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc - sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc - texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc - texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc - typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc +LICENSE="BSD GPL-1 GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free" +GENTOO_TEX_PATCHES_NUM=3 +SRC_URI=" + https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz + https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2 + -> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2 +" + +# Macros that are not a part of texlive-sources or or pulled in from collection-binextra +# but still needed for other packages during installation +TL_CORE_EXTRA_CONTENTS=" + autosp.r58211 + axodraw2.r58155 + chktex.r64797 + detex.r66186 + dvi2tty.r66186 + dvidvi.r65952 + dviljk.r66186 + dvipdfmx.r69127 + dvipos.r66186 + gsftopk.r52851 + hyphen-base.r68321 + lacheck.r66186 + m-tx.r64182 + makeindex.r62517 + pmx.r65926 + texlive-scripts.r69754 + texlive-scripts-extra.r62517 + texlive.infra.r69740 + tpic2pdftex.r52851 + upmendex.r66381 + velthuis.r66186 + vlna.r66186 + xml2pmx.r57972 +" +TL_CORE_EXTRA_DOC_CONTENTS=" + autosp.doc.r58211 + axodraw2.doc.r58155 + chktex.doc.r64797 + detex.doc.r66186 + dvi2tty.doc.r66186 + dvidvi.doc.r65952 + dviljk.doc.r66186 + dvipdfmx.doc.r69127 + dvipos.doc.r66186 + gsftopk.doc.r52851 + lacheck.doc.r66186 + m-tx.doc.r64182 + makeindex.doc.r62517 + pmx.doc.r65926 + texlive-scripts.doc.r69754 + texlive-scripts-extra.doc.r62517 + texlive.infra.doc.r69740 + tpic2pdftex.doc.r52851 + upmendex.doc.r66381 + velthuis.doc.r66186 + vlna.doc.r66186 + xml2pmx.doc.r57972 " -TL_CORE_BINEXTRA_SRC_MODULES=" - adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source - listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source - texdef.source texosquery.source texplate.source tlcockpit.source +TL_CORE_EXTRA_SRC_CONTENTS=" + axodraw2.source.r58155 +" + +TEXLIVE_MODULE_BINSCRIPTS=" + texmf-dist/scripts/m-tx/m-tx.lua + texmf-dist/scripts/texlive/fmtutil-sys.sh + texmf-dist/scripts/texlive/fmtutil-user.sh + texmf-dist/scripts/texlive/fmtutil.pl + texmf-dist/scripts/texlive/mktexlsr + texmf-dist/scripts/texlive/mktexlsr.pl + texmf-dist/scripts/texlive/mktexmf + texmf-dist/scripts/texlive/mktexpk + texmf-dist/scripts/texlive/mktextfm + texmf-dist/scripts/texlive/rungs.lua + texmf-dist/scripts/texlive/tlmgr.pl + texmf-dist/scripts/texlive/updmap-sys.sh + texmf-dist/scripts/texlive/updmap-user.sh + texmf-dist/scripts/texlive/updmap.pl + texmf-dist/scripts/texlive-extra/allcm.sh + texmf-dist/scripts/texlive-extra/allneeded.sh + texmf-dist/scripts/texlive-extra/dvi2fax.sh + texmf-dist/scripts/texlive-extra/dvired.sh + texmf-dist/scripts/texlive-extra/e2pall.pl + texmf-dist/scripts/texlive-extra/kpsetool.sh + texmf-dist/scripts/texlive-extra/kpsewhere.sh + texmf-dist/scripts/texlive-extra/ps2frag.sh + texmf-dist/scripts/texlive-extra/pslatex.sh + texmf-dist/scripts/texlive-extra/texconfig-dialog.sh + texmf-dist/scripts/texlive-extra/texconfig-sys.sh + texmf-dist/scripts/texlive-extra/texconfig.sh + texmf-dist/scripts/texlive-extra/texlinks.sh +" + +TEXLIVE_MODULE_BINLINKS=" + fmtutil:mktexfmt + mktexlsr:texhash + allcm:allec + kpsetool:kpsexpand + kpsetool:kpsepath " -# Macros that are not a part of texlive-sources or collection-binextra but still needed -# for other packages during installation -TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}" -TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}" -TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}" - -for i in ${TL_CORE_EXTRA_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" -done - -SRC_URI="${SRC_URI} doc? ( " -for i in ${TL_CORE_EXTRA_DOC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" -done -SRC_URI="${SRC_URI} )" -SRC_URI="${SRC_URI} source? ( " -for i in ${TL_CORE_EXTRA_SRC_MODULES}; do - SRC_URI="${SRC_URI} https://dev.gentoo.org/~{zlogene,sam}/distfiles/texlive/tl-${i}-${PV}.tar.xz" -done -SRC_URI="${SRC_URI} )" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris" +texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS + +SRC_URI+=" doc? ( " +texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS +SRC_URI+=" )" + +SRC_URI+=" source? ( " +texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS +SRC_URI+=" )" + +KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86" IUSE="cjk X doc source tk +luajittex xetex xindy" TEXMF_PATH=/usr/share/texmf-dist - -MODULAR_X_DEPEND="X? ( - x11-libs/libX11 - x11-libs/libXmu +MODULAR_X_DEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXmu )" -COMMON_DEPEND="${MODULAR_X_DEPEND} +COMMON_DEPEND=" + ${MODULAR_X_DEPEND} !app-text/epspdf !app-text/pdfjam sys-libs/zlib >=media-libs/harfbuzz-1.4.5:=[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] - media-gfx/graphite2 + media-gfx/graphite2:= + media-gfx/potrace:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib:= app-text/libpaper:= dev-libs/gmp:= dev-libs/mpfr:= - >=dev-libs/ptexenc-1.3.8 + >=dev-libs/ptexenc-1.4.3 xetex? ( - >=app-text/teckit-2.5.3 + >=app-text/teckit-2.5.10 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= - >=dev-libs/kpathsea-6.3.2:=" + >=dev-libs/kpathsea-6.3.5:= +" -BDEPEND="sys-apps/ed +BDEPEND=" + sys-apps/ed sys-devel/flex - virtual/pkgconfig" + virtual/pkgconfig +" -DEPEND="${COMMON_DEPEND}" +DEPEND=" + ${COMMON_DEPEND} +" -RDEPEND="${COMMON_DEPEND} - >=app-text/ps2pkm-1.8_p20170524 - >=app-text/dvipsk-5.997 - >=dev-tex/bibtexu-3.71_p20170524 +RDEPEND=" + ${COMMON_DEPEND} virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( - dev-lang/tk - dev-perl/Tk - )" + dev-lang/tk + dev-perl/Tk + ) +" -S="${WORKDIR}/${P}_build" -B="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${MY_P}" +BUILDDIR="${WORKDIR}/${P}_build" src_unpack() { - unpack ${A} - mkdir -p "${S}" || die "failed to create build dir" + default + + mkdir -p "${BUILDDIR}" || die "failed to create build dir" } RELOC_TARGET=texmf-dist @@ -142,27 +195,25 @@ RELOC_TARGET=texmf-dist src_prepare() { cd "${WORKDIR}" || die - mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb" - # From texlive-module.eclass. sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" | sort -u | xargs mkdir -p || die local i - while read i; do + while read -r i; do mv "${i}" "${RELOC_TARGET}/${i%/*}" || die done < "${T}/reloclist" + mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files" - mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files" - - cd "${B}" || die + cd "${S}" || die sed -i \ - -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \ + -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,$(pkg-config kpathsea --variable=includedir)\"," \ texk/web2c/configure || die - eapply "${WORKDIR}"/patches + local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}" + eapply "${patch_dir}" default @@ -170,6 +221,11 @@ src_prepare() { } src_configure() { + # TODO: report upstream + # bug #915223 + append-flags -fno-strict-aliasing + filter-lto + # It fails on alpha without this use alpha && append-ldflags "-Wl,--no-relax" @@ -182,11 +238,46 @@ src_configure() { # Also only pkg-config works for prefix as described in bug #690094 export ac_cv_prog_ac_ct_FT2_CONFIG=no + # revisit/upstream once we bump to 2022, bug #882245 + append-cppflags -D_GNU_SOURCE + + local econf_new_2023=( + --enable-ptex=no + --enable-uptex=no + --enable-autosp=yes + --enable-axodraw2=yes + --enable-devnag=yes + --enable-lacheck=yes + --enable-m-tx=yes + --enable-pmx=yes + --enable-tpic2pdftex=yes + --with-clisp-runtime=system + --enable-xml2pmx=yes + $(use_enable X xpdfopen) + --enable-web2c=yes + --enable-afm2pl=yes + --enable-dvidvi=yes + --enable-dviljk=yes + $(use_enable cjk dvipdfm-x) + --enable-dvipos=yes + --enable-gregorio=yes + --enable-gsftopk=yes + --enable-makeindexk=yes + --enable-musixtnt=yes + --enable-seetexk=yes + --enable-ttfdump=yes + --enable-upmendex=yes + --enable-texlive=yes + --enable-linked-scripts=no + # web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio + ) + tc-export CC CXX AR RANLIB - ECONF_SOURCE="${B}" \ + cd "${BUILDDIR}" || die + ECONF_SOURCE="${S}" \ econf -C \ --bindir="${EPREFIX}"/usr/bin \ - --datadir="${S}" \ + --datadir="${BUILDDIR}" \ --with-system-freetype2 \ --with-system-zlib \ --with-system-libpng \ @@ -197,7 +288,6 @@ src_configure() { --with-system-icu \ --with-system-ptexenc \ --with-system-harfbuzz \ - --with-system-icu \ --with-system-graphite2 \ --with-system-cairo \ --with-system-pixman \ @@ -206,6 +296,7 @@ src_configure() { --with-system-gmp \ --with-system-gd \ --with-system-mpfr \ + --with-system-potrace \ --without-texinfo \ --disable-dialog \ --disable-multiplatform \ @@ -258,19 +349,22 @@ src_configure() { $(use_enable cjk upmp) \ $(use_enable tk texdoctk) \ $(use_with X x) \ - $(use_enable xindy) + $(use_enable xindy) \ + "${econf_new_2023[@]}" } src_compile() { + cd "${BUILDDIR}" || die tc-export CC CXX AR RANLIB + emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} - cd "${B}" || die + cd "${S}" || die # Mimic updmap --syncwithtrees to enable only fonts installed # Code copied from updmap script - for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do + while read -r i; do texlive-common_is_file_present_in_texmf "${i}" || echo "${i}" - done > "${T}/updmap_update" + done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@') { sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" @@ -281,10 +375,12 @@ src_compile() { } src_install() { + cd "${BUILDDIR}" || die dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c + emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install - cd "${B}" || die + cd "${S}" || die dodir /usr/share # just in case cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees" cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files" @@ -294,19 +390,19 @@ src_install() { use X || dosym mf /usr/bin/mf-nowin docinto texk - cd "${B}/texk" || die + cd "${S}/texk" || die dodoc ChangeLog README docinto dviljk - cd "${B}/texk/dviljk" || die + cd "${S}/texk/dviljk" || die dodoc ChangeLog README NEWS docinto makeindexk - cd "${B}/texk/makeindexk" || die + cd "${S}/texk/makeindexk" || die dodoc ChangeLog NOTES README docinto web2c - cd "${B}/texk/web2c" || die + cd "${S}/texk/web2c" || die dodoc ChangeLog NEWS PROJECTS README use doc || rm -rf "${ED}/usr/share/texmf-dist/doc" @@ -327,9 +423,18 @@ src_install() { # Remove bundled and invalid updmap.cfg rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die - texlive-common_handle_config_files + rm -f "${ED}/usr/bin/"{,u}ptex - keepdir /usr/share/texmf-site + [[ -n ${TEXLIVE_MODULE_BINSCRIPTS} ]] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} + if [[ -n ${TEXLIVE_MODULE_BINLINKS} ]] ; then + dodir "/usr/bin" + for i in ${TEXLIVE_MODULE_BINLINKS} ; do + [[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug." + dosym "${i%:*}" "/usr/bin/${i#*:}" + done + fi + + texlive-common_handle_config_files # the virtex symlink is not installed # The links has to be relative, since the targets @@ -342,15 +447,39 @@ src_install() { } pkg_postinst() { - etexmf-update + # Note that the etexmf-update and efmtutil-sys use nonfatal. We are + # pkg_postinst, so invoking die will merely print an error message + # but not abort the installation as it already happened. However, + # unlike the texlive modules, we observed fmtutil-sys failures in + # texlive-core. - einfo "Regenerating TeX formats" - fmtutil-sys --all &> /dev/null + # TODO: Research the rationale of calling etexmf-update and + # eftmutil-sys here and the reasons why it sometimes fails. + nonfatal etexmf-update + nonfatal efmtutil-sys elog elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge," elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update." elog + + local display_migration_hint=false + if [[ -n ${REPLACING_VERSIONS} ]]; then + local new_texlive_version=$(ver_cut 1) + local replaced_version + for replaced_version in ${REPLACING_VERSIONS}; do + replaced_version=$(ver_cut 1 "${replaced_version}") + if ver_test "${replaced_version}" -lt "${new_texlive_version}" ; then + display_migration_hint=true + break + fi + done + fi + + if ! ${display_migration_hint}; then + return + fi + ewarn "If you are migrating from an older TeX distribution" ewarn "Please make sure you have read:" ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide" diff --git a/app-text/texlive-core/texlive-core-2023-r6.ebuild b/app-text/texlive-core/texlive-core-2023-r6.ebuild new file mode 100644 index 000000000000..ecaf3b447552 --- /dev/null +++ b/app-text/texlive-core/texlive-core-2023-r6.ebuild @@ -0,0 +1,485 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +TL_SOURCE_VERSION=20230311 +inherit flag-o-matic toolchain-funcs libtool texlive-common + +MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source + +DESCRIPTION="A complete TeX distribution" +HOMEPAGE="https://tug.org/texlive/" +SLOT="0" +LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free" +GENTOO_TEX_PATCHES_NUM=3 +SRC_URI=" + https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz + https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2 + -> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2 +" + +# Macros that are not a part of texlive-sources or or pulled in from collection-binextra +# but still needed for other packages during installation. +TL_CORE_EXTRA_CONTENTS=" + autosp.r58211 + axodraw2.r58155 + chktex.r64797 + detex.r66186 + dvi2tty.r66186 + dvidvi.r65952 + dviljk.r66186 + dvipdfmx.r69127 + dvipos.r66186 + gsftopk.r52851 + hyphen-base.r68321 + lacheck.r66186 + m-tx.r64182 + makeindex.r62517 + pmx.r65926 + texdoctk.r62186 + texlive-scripts.r69754 + texlive-scripts-extra.r62517 + texlive.infra.r69740 + tpic2pdftex.r52851 + upmendex.r66381 + velthuis.r66186 + vlna.r66186 + xindy.r65958 + xml2pmx.r57972 +" +TL_CORE_EXTRA_DOC_CONTENTS=" + autosp.doc.r58211 + axodraw2.doc.r58155 + chktex.doc.r64797 + detex.doc.r66186 + dvi2tty.doc.r66186 + dvidvi.doc.r65952 + dviljk.doc.r66186 + dvipdfmx.doc.r69127 + dvipos.doc.r66186 + gsftopk.doc.r52851 + lacheck.doc.r66186 + m-tx.doc.r64182 + makeindex.doc.r62517 + pmx.doc.r65926 + texdoctk.doc.r62186 + texlive-scripts.doc.r69754 + texlive-scripts-extra.doc.r62517 + texlive.infra.doc.r69740 + tpic2pdftex.doc.r52851 + upmendex.doc.r66381 + velthuis.doc.r66186 + vlna.doc.r66186 + xindy.doc.r65958 + xml2pmx.doc.r57972 +" +TL_CORE_EXTRA_SRC_CONTENTS=" + axodraw2.source.r58155 +" + +TEXLIVE_MODULE_BINSCRIPTS=" + texmf-dist/scripts/m-tx/m-tx.lua + texmf-dist/scripts/texlive/fmtutil-sys.sh + texmf-dist/scripts/texlive/fmtutil-user.sh + texmf-dist/scripts/texlive/fmtutil.pl + texmf-dist/scripts/texlive/mktexlsr + texmf-dist/scripts/texlive/mktexlsr.pl + texmf-dist/scripts/texlive/mktexmf + texmf-dist/scripts/texlive/mktexpk + texmf-dist/scripts/texlive/mktextfm + texmf-dist/scripts/texlive/rungs.lua + texmf-dist/scripts/texlive/tlmgr.pl + texmf-dist/scripts/texlive/updmap-sys.sh + texmf-dist/scripts/texlive/updmap-user.sh + texmf-dist/scripts/texlive/updmap.pl + texmf-dist/scripts/texlive-extra/allcm.sh + texmf-dist/scripts/texlive-extra/allneeded.sh + texmf-dist/scripts/texlive-extra/dvi2fax.sh + texmf-dist/scripts/texlive-extra/dvired.sh + texmf-dist/scripts/texlive-extra/e2pall.pl + texmf-dist/scripts/texlive-extra/kpsetool.sh + texmf-dist/scripts/texlive-extra/kpsewhere.sh + texmf-dist/scripts/texlive-extra/ps2frag.sh + texmf-dist/scripts/texlive-extra/pslatex.sh + texmf-dist/scripts/texlive-extra/texconfig-dialog.sh + texmf-dist/scripts/texlive-extra/texconfig-sys.sh + texmf-dist/scripts/texlive-extra/texconfig.sh + texmf-dist/scripts/texlive-extra/texlinks.sh +" + +TEXLIVE_MODULE_BINLINKS=" + fmtutil:mktexfmt + mktexlsr:texhash + allcm:allec + kpsetool:kpsexpand + kpsetool:kpsepath +" +texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS + +SRC_URI+=" doc? ( " +texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS +SRC_URI+=" )" + +SRC_URI+=" source? ( " +texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS +SRC_URI+=" )" + +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="cjk X doc source tk +luajittex xetex xindy" + +TEXMF_PATH=/usr/share/texmf-dist +MODULAR_X_DEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXmu + )" + +COMMON_DEPEND=" + ${MODULAR_X_DEPEND} + !app-text/epspdf + !app-text/pdfjam + sys-libs/zlib + >=media-libs/harfbuzz-1.4.5:=[icu,graphite] + >=media-libs/libpng-1.2.43-r2:0= + media-libs/gd[png] + media-gfx/graphite2:= + media-gfx/potrace:= + >=x11-libs/cairo-1.12 + >=x11-libs/pixman-0.18 + dev-libs/zziplib:= + app-text/libpaper:= + dev-libs/gmp:= + dev-libs/mpfr:= + >=dev-libs/ptexenc-1.4.3 + xetex? ( + >=app-text/teckit-2.5.10 + media-libs/fontconfig + ) + xindy? ( dev-lisp/clisp:= ) + media-libs/freetype:2 + >=dev-libs/icu-50:= + >=dev-libs/kpathsea-6.3.5:= +" + +BDEPEND=" + sys-apps/ed + sys-devel/flex + virtual/pkgconfig +" + +DEPEND=" + ${COMMON_DEPEND} +" + +# !<dev-texlive/texlive-langother-2023 see https://bugs.gentoo.org/928307 +RDEPEND=" + ${COMMON_DEPEND} + virtual/perl-Getopt-Long + dev-perl/File-HomeDir + dev-perl/Log-Dispatch + dev-perl/Unicode-LineBreak + dev-perl/YAML-Tiny + tk? ( + dev-lang/tk + dev-perl/Tk + ) + !<dev-texlive/texlive-basic-2023 + !<dev-texlive/texlive-mathscience-2023 + !<dev-texlive/texlive-langother-2023 + !<dev-texlive/texlive-music-2023 +" + +S="${WORKDIR}/${MY_P}" +BUILDDIR="${WORKDIR}/${P}_build" + +src_unpack() { + default + + mkdir -p "${BUILDDIR}" || die "failed to create build dir" +} + +RELOC_TARGET=texmf-dist + +src_prepare() { + cd "${WORKDIR}" || die + + # From texlive-module.eclass. + sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die + sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" | + sort -u | + xargs mkdir -p || die + local i + while read -r i; do + mv "${i}" "${RELOC_TARGET}/${i%/*}" || die + done < "${T}/reloclist" + mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files" + + cd "${S}" || die + + TL_KPATHSEA_INCLUDES=$($(tc-getPKG_CONFIG) kpathsea --variable=includedir || die "failed to invoke pkg-config") + sed -i \ + -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${TL_KPATHSEA_INCLUDES}\"," \ + texk/web2c/configure || die + + local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}" + eapply "${patch_dir}" + + default + + elibtoolize + + # Drop this once cairo's autoconf patches are gone. See + # https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121. + "${S}"/reautoconf libs/cairo || die +} + +src_configure() { + # TODO: report upstream + # bug #915223 + append-flags -fno-strict-aliasing + filter-lto + + # It fails on alpha without this + use alpha && append-ldflags "-Wl,--no-relax" + + # Too many regexps use A-Z a-z constructs, what causes problems with locales + # that don't have the same alphabetical order than ascii. Bug #242430 + # So we set LC_ALL to C in order to avoid problems. + export LC_ALL=C + + # Disable freetype-config as this is considered obsolete. + # Also only pkg-config works for prefix as described in bug #690094 + export ac_cv_prog_ac_ct_FT2_CONFIG=no + + local my_conf=( + --bindir="${EPREFIX}"/usr/bin + --datadir="${BUILDDIR}" + --with-system-freetype2 + --with-system-zlib + --with-system-libpng + --with-system-teckit + --with-system-kpathsea + --with-kpathsea-includes="${TL_KPATHSEA_INCLUDES}" + --with-system-icu + --with-system-ptexenc + --with-system-harfbuzz + --with-system-graphite2 + --with-system-cairo + --with-system-pixman + --with-system-zziplib + --with-system-libpaper + --with-system-gmp + --with-system-gd + --with-system-mpfr + --with-system-potrace + --disable-multiplatform + --enable-chktex + --enable-epsfwin + --enable-detex + --enable-dvi2tty + --enable-mftalkwin + --enable-regiswin + --enable-shared + --enable-tektronixwin + --enable-unitermwin + --enable-vlna + --disable-psutils + --disable-t1utils + --enable-ipc + --disable-bibtex-x + --disable-dvipng + --disable-dvipsk + --disable-lcdf-typetools + --disable-ps2pk + --disable-ttf2pk2 + --disable-tex4htk + --disable-cjkutils + --disable-xdvik + --enable-luatex + --disable-dvisvgm + --disable-ps2eps + --disable-static + --disable-native-texlive-build + --disable-largefile + --disable-xindy-docs + --disable-xindy-rules + --with-banner-add=" Gentoo Linux" + $(use_enable luajittex) + $(use_enable luajittex luajithbtex) + $(use_enable luajittex mfluajit) + $(use_enable xetex) + $(use_enable cjk dviout-util) + $(use_enable cjk ptex) + $(use_enable cjk eptex) + $(use_enable cjk uptex) + $(use_enable cjk euptex) + $(use_enable cjk mendexk) + $(use_enable cjk makejvf) + $(use_enable cjk pmp) + $(use_enable cjk upmp) + $(use_enable tk texdoctk) + $(use_with X x) + $(use_enable xindy) + --enable-ptex=no + --enable-autosp=yes + --enable-axodraw2=yes + --enable-devnag=yes + --enable-lacheck=yes + --enable-m-tx=yes + --enable-pmx=yes + --enable-tpic2pdftex=yes + --with-clisp-runtime=system + --enable-xml2pmx=yes + $(use_enable X xpdfopen) + --enable-web2c=yes + --enable-afm2pl=yes + --enable-dvidvi=yes + --enable-dviljk=yes + --enable-dvipdfm-x + --enable-dvipos=yes + --enable-gregorio=yes + --enable-gsftopk=yes + --enable-makeindexk=yes + --enable-musixtnt=yes + --enable-seetexk=yes + --enable-ttfdump=yes + --enable-upmendex=yes + --enable-texlive=yes + --enable-linked-scripts=no + # web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio + ) + + # Enable the following on version bumps. While it makes the build + # always fail, presumably because texlive passes these configure + # options to sub-configures, it still points out dropped + # options. See https://bugs.gentoo.org/828591 + my_conf+=( + # --enable-option-checking=fatal + ) + + tc-export CC CXX AR RANLIB + cd "${BUILDDIR}" || die + ECONF_SOURCE="${S}" \ + econf -C "${my_conf[@]}" +} + +src_compile() { + cd "${BUILDDIR}" || die + tc-export CC CXX AR RANLIB + + emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} + + cd "${S}" || die + # Mimic updmap --syncwithtrees to enable only fonts installed + # Code copied from updmap script + while read -r i; do + texlive-common_is_file_present_in_texmf "${i}" || echo "${i}" + done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@') + { + sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update" + } > "${T}/updmap_update2" + sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\ + && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg" +} + +src_install() { + cd "${BUILDDIR}" || die + dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c + + emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install + + cd "${S}" || die + dodir /usr/share # just in case + cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees" + cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files" + + # When X is disabled mf-nowin doesn't exist but some scripts expect it to + # exist. Instead, it is called mf, so we symlink it to please everything. + use X || dosym mf /usr/bin/mf-nowin + + docinto texk + cd "${S}/texk" || die + dodoc ChangeLog README + + docinto dviljk + cd "${S}/texk/dviljk" || die + dodoc ChangeLog README NEWS + + docinto makeindexk + cd "${S}/texk/makeindexk" || die + dodoc ChangeLog NOTES README + + docinto web2c + cd "${S}/texk/web2c" || die + dodoc ChangeLog NEWS PROJECTS README + + use doc || rm -rf "${ED}/usr/share/texmf-dist/doc" + + dodir /etc/env.d + echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive" + # populate /etc/texmf + keepdir /etc/texmf/web2c + + # take care of updmap.cfg and language.d files + keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d} + + mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed" + + # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files + # by texmf-update + rm "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die + + if use cjk; then + rm "${ED}/usr/bin/"{,u}ptex || die + fi + + if ! use xindy; then + rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy + rm "${ED}"/usr/share/tlpkg/tlpobj/xindy.* || die + fi + + dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} + + dodir "/usr/bin" + for i in ${TEXLIVE_MODULE_BINLINKS} ; do + [[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug." + + dosym "${i%:*}" "/usr/bin/${i#*:}" + done + + # https://bugs.gentoo.org/832139 + rm "${ED}"/usr/bin/tlmgr || die + + texlive-common_handle_config_files + + # the virtex symlink is not installed + # The links has to be relative, since the targets + # is not present at this stage and MacOS doesn't + # like non-existing targets + dosym tex /usr/bin/virtex + dosym pdftex /usr/bin/pdfvirtex + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # Note that the etexmf-update and efmtutil-sys use nonfatal. We are + # pkg_postinst, so invoking die will merely print an error message + # but not abort the installation as it already happened. However, + # unlike the texlive modules, we observed fmtutil-sys failures in + # texlive-core. + + # TODO: Research the rationale of calling etexmf-update and + # eftmutil-sys here and the reasons why it sometimes fails. + nonfatal etexmf-update + nonfatal efmtutil-sys + + texlive-common_update_tlpdb +} + +pkg_postrm() { + texlive-common_update_tlpdb +} diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021-r1.ebuild index 8a26c0091664..446fbb70cc7a 100644 --- a/app-text/texlive/texlive-2021.ebuild +++ b/app-text/texlive/texlive-2021-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/" LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X" LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he @@ -46,7 +46,7 @@ RDEPEND="${DEPEND} extra? ( app-text/dvisvgm dev-tex/latexdiff - >=dev-tex/latexmk-418 + dev-tex/latexmk >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV} >=${TEXLIVE_CAT}/texlive-fontsextra-${PV} >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} diff --git a/app-text/texlive/texlive-2023.ebuild b/app-text/texlive/texlive-2023.ebuild new file mode 100644 index 000000000000..c97002e8c1b5 --- /dev/null +++ b/app-text/texlive/texlive-2023.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="A complete TeX distribution" +HOMEPAGE="http://tug.org/texlive/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X" + +LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he + hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa + pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh" + +for X in ${LANGS}; do + IUSE="${IUSE} l10n_${X}" +done + +TEXLIVE_CAT="dev-texlive" + +DEPEND=">=app-text/texlive-core-${PV}" +RDEPEND="${DEPEND} + app-text/psutils + >=${TEXLIVE_CAT}/texlive-fontutils-${PV} + media-gfx/sam2p + texi2html? ( app-text/texi2html ) + sys-apps/texinfo + app-text/t1utils + >=app-text/lcdf-typetools-2.92[kpathsea] + truetype? ( >=app-text/ttf2pk2-2.0_p20230311 ) + app-text/ps2eps + png? ( app-text/dvipng ) + X? ( >=app-text/xdvik-22.87 ) + >=${TEXLIVE_CAT}/texlive-basic-${PV} + >=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV} + >=${TEXLIVE_CAT}/texlive-latex-${PV} + luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} ) + >=${TEXLIVE_CAT}/texlive-latexrecommended-${PV} + metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV} ) + >=${TEXLIVE_CAT}/texlive-plaingeneric-${PV} + pdfannotextractor? ( dev-tex/pdfannotextractor ) + extra? ( + >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV} + >=${TEXLIVE_CAT}/texlive-binextra-${PV} + >=${TEXLIVE_CAT}/texlive-fontsextra-${PV} + >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} + >=${TEXLIVE_CAT}/texlive-latexextra-${PV} + ) + xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} ) + graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV} ) + science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} ) + publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} ) + music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} ) + pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} ) + context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} ) + games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} ) + humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} ) + tex4ht? ( >=dev-tex/tex4ht-20230311_p69739 ) + xml? ( >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} ) + l10n_af? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} ) + l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} ) + l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} ) + l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} ) + l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_ru? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} ) + l10n_uk? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} ) + l10n_cs? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} ) + l10n_sk? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} ) + l10n_da? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_nl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_en? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} ) + l10n_fi? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_eu? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} ) + l10n_fr? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} ) + l10n_de? ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} ) + l10n_el? ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} ) + l10n_he? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_hu? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_as? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_bn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_gu? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_hi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_kn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_ml? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_mr? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_or? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_pa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_sa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_ta? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_te? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_it? ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} ) + l10n_ja? ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} ) + l10n_ko? ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} ) + l10n_la? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_lt? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_lv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_mn? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} ) + l10n_nb? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_nn? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_no? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_cy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_eo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_et? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_ga? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_rm? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_hsb? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_ia? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_id? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_is? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_lo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_ro? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_sq? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_sr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} + >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} ) + l10n_sl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_tr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_pl? ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} ) + l10n_pt? ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} ) + l10n_ca? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} ) + l10n_gl? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} ) + l10n_es? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} ) + l10n_sco? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_sv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_tk? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} ) + l10n_vi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} ) + l10n_zh? ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} ) +" diff --git a/app-text/tkman/tkman-2.2-r3.ebuild b/app-text/tkman/tkman-2.2-r3.ebuild index dea248e90be4..8340230d824c 100644 --- a/app-text/tkman/tkman-2.2-r3.ebuild +++ b/app-text/tkman/tkman-2.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit desktop DESCRIPTION="Graphical, hypertex man and info page browser" HOMEPAGE="https://sourceforge.net/projects/tkman/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" LICENSE="Artistic" SLOT="0" diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml index 35e9588fb69b..582c6fa79201 100644 --- a/app-text/trang/metadata.xml +++ b/app-text/trang/metadata.xml @@ -7,6 +7,5 @@ </maintainer> <upstream> <remote-id type="github">relaxng/jing-trang</remote-id> - <remote-id type="google-code">jing-trang</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest index bdbfe971a219..f7761a570ad0 100644 --- a/app-text/tree/Manifest +++ b/app-text/tree/Manifest @@ -1,2 +1,2 @@ -DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6 DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc +DIST unix-tree-2.1.1.tar.bz2 52550 BLAKE2B 0f20009a6c64b07a0742637bf32366b038f5c9bb025755a0aa45edb8c92741dfbff1486179caeeb73cfa8f10de3ed8678b948c7416ee0463e785cf153e808ff0 SHA512 ed34b1d0df049986295e7f5539491acd6134fbe69050ac2634037d700a878b4937700bed777ef0624e2bb0fc8c2815bb5139272ffe575ecc9362b84e0fafc9c2 diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild index fbad3d309fd4..dd393b5c6efc 100644 --- a/app-text/tree/tree-2.1.0.ebuild +++ b/app-text/tree/tree-2.1.0.ebuild @@ -11,22 +11,10 @@ SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" S=${WORKDIR}/unix-${P} -RDEPEND="" -DEPEND="" - -src_prepare() { - if use !elibc_glibc ; then - # 433972, also previously done only for elibc_uclibc - sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die - fi - default -} - src_compile() { append-lfs-flags emake \ diff --git a/app-text/tree/tree-2.1.1-r1.ebuild b/app-text/tree/tree-2.1.1-r1.ebuild new file mode 100644 index 000000000000..1fb745f40e2f --- /dev/null +++ b/app-text/tree/tree-2.1.1-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Lists directories recursively, and produces an indented listing of files" +HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree" +SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + +S=${WORKDIR}/unix-${P} + +src_compile() { + append-lfs-flags + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin tree + doman doc/tree*.1 + einstalldocs +} diff --git a/app-text/tree/tree-2.0.4.ebuild b/app-text/tree/tree-2.1.1.ebuild index 75fc979ed4ec..dd393b5c6efc 100644 --- a/app-text/tree/tree-2.0.4.ebuild +++ b/app-text/tree/tree-2.1.1.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + inherit toolchain-funcs flag-o-matic bash-completion-r1 DESCRIPTION="Lists directories recursively, and produces an indented listing of files" HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree" -SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.gz" +SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" S=${WORKDIR}/unix-${P} -RDEPEND="" -DEPEND="" - src_compile() { append-lfs-flags emake \ diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest index 046d9a807360..6bba4f271f42 100644 --- a/app-text/ttf2pk2/Manifest +++ b/app-text/ttf2pk2/Manifest @@ -1 +1,2 @@ DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213 +DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96 diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild index 249b1db56776..a6a15aa046a2 100644 --- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild +++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild @@ -4,13 +4,13 @@ EAPI=7 DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter" -HOMEPAGE="http://tug.org/texlive/" -SRC_URI="https://dev.gentoo.org/~{zlogene,sam}/texlive/texlive-${PV#*_p}-source.tar.xz" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://dev.gentoo.org/~sam/texlive/texlive-${PV#*_p}-source.tar.xz" +S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # Note about blockers: it is a freetype2 based replacement for ttf2pk and # ttf2tfm from freetype1, so block freetype1. @@ -24,8 +24,6 @@ RDEPEND=">=dev-libs/kpathsea-6.2.1 DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN} - src_configure() { econf --with-system-kpathsea \ --with-system-freetype2 \ diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild new file mode 100644 index 000000000000..c15767ae7644 --- /dev/null +++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter" +HOMEPAGE="https://tug.org/texlive/" +SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${PV#*_p}-source.tar.xz" +S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +# Note about blockers: it is a freetype2 based replacement for ttf2pk and +# ttf2tfm from freetype1, so block freetype1. +# It installs some data that collides with +# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012, +# meanwhile we can start dropping freetype1. +RDEPEND=" + >=dev-libs/kpathsea-6.2.1 + media-libs/freetype:2 + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + econf \ + --with-system-kpathsea \ + --with-system-freetype2 \ + --with-system-zlib +} diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch new file mode 100644 index 000000000000..cb54195872e9 --- /dev/null +++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch @@ -0,0 +1,61 @@ +https://sourceforge.net/p/ttf2pt1/mailman/message/37804025/ +https://bugs.gentoo.org/881321 + +Avoid implicit ints and implicit function declarations, and build +failures with future compilers which do not support this pre-C99 +features by default. + +--- a/other/bmpfont.h ++++ b/other/bmpfont.h +@@ -2,7 +2,9 @@ + * see COPYRIGHT + */ + ++#include <stdlib.h> + ++void + fchkneg(file, line, rc, cmd) + char *file; + int line; +@@ -17,6 +19,7 @@ fchkneg(file, line, rc, cmd) + } + } + ++void + fchknull(file, line, rc, cmd) + char *file; + int line; +--- a/other/cmpf.c ++++ b/other/cmpf.c +@@ -14,7 +14,7 @@ + + #include "bmpfont.h" + +- ++int + main(ac, av) + int ac; + char **av; +--- a/other/dmpf.c ++++ b/other/dmpf.c +@@ -14,7 +14,7 @@ + + #include "bmpfont.h" + +- ++int + main(ac, av) + int ac; + char **av; +--- a/t1asm.c ++++ b/t1asm.c +@@ -59,6 +59,8 @@ static char portnotice[] = + # define WINDOWS_FUNCTIONS + # include "windows.h" + # endif ++#else ++# include <unistd.h> + #endif + + /* int32 must be at least 32-bit and uint16 must be at least 16-bit */ + diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild index fcc8361c32a0..c585a80d4676 100644 --- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild +++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="True Type Font to Postscript Type 1 Converter" -HOMEPAGE="http://ttf2pt1.sourceforge.net/" -SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz" +HOMEPAGE="https://ttf2pt1.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/ttf2pt1/${P}.tgz" LICENSE="ttf2pt1" SLOT="0" @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff "${FILESDIR}"/${P}-freetype.patch + "${FILESDIR}"/${P}-clang16.patch ) src_prepare() { diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild index 9e0b156a0585..e076255aaeeb 100644 --- a/app-text/txt2man/txt2man-1.7.1.ebuild +++ b/app-text/txt2man/txt2man-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="app-shells/bash diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest index d8d500471721..3b4bb7d6b4b4 100644 --- a/app-text/txt2tags/Manifest +++ b/app-text/txt2tags/Manifest @@ -1 +1 @@ -DIST txt2tags-3.8.tar.gz 252139 BLAKE2B ed830ccd8b8487ce65bdd7a07dba567bb6ea7814d20c38aa7d8a2a5b15f9aa0eca379b0a8f2ff5a0571c151fcdb0152fff4d8a2ae9b4ae275fef8b94d926d0a2 SHA512 a3679505baa12388327a3cdc177c7c218707549140477189960c1172c1c495e193d7d7cb663a546bfec3e6ae6efd4d8936d94f08661ef7195087403855ebe66f +DIST txt2tags-3.9.tar.gz 252334 BLAKE2B 2052af87989b636cc3ed99b3fa8f884abbb175a19af709396b96ede9f10afca4d6764651b3c35ce60e52dad687b8f9b7b7b31f6d01a23a58c7c328a084067f7b SHA512 f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea diff --git a/app-text/txt2tags/txt2tags-3.8.ebuild b/app-text/txt2tags/txt2tags-3.9.ebuild index c934e6641e5e..a493a4969d04 100644 --- a/app-text/txt2tags/txt2tags-3.8.ebuild +++ b/app-text/txt2tags/txt2tags-3.9.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup" @@ -13,7 +13,7 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" +KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" python_test() { cd test || die diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild index be6d4c8b5d4c..0429ec9a2cec 100644 --- a/app-text/unrtf/unrtf-0.21.10.ebuild +++ b/app-text/unrtf/unrtf-0.21.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff new file mode 100644 index 000000000000..30b900d4509b --- /dev/null +++ b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff @@ -0,0 +1,12 @@ +diff --git a/configure.in b/configure.in +index 4ea5965..49100ff 100644 +--- a/configure.in ++++ b/configure.in +@@ -518,6 +518,7 @@ AC_CHECK_FUNC([mkstemp],,[AC_MSG_ERROR([needs mkstemp])]) + # + AC_MSG_CHECKING([for strerror]) + AC_TRY_LINK([ ++#include <string.h> + char *blubb() { return (char *) strerror (42); } + ],[ + (void) blubb(); diff --git a/app-text/uudeview/uudeview-0.5.20-r4.ebuild b/app-text/uudeview/uudeview-0.5.20-r4.ebuild new file mode 100644 index 000000000000..798e5b521e49 --- /dev/null +++ b/app-text/uudeview/uudeview-0.5.20-r4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="uu, xx, base64, binhex decoder" +HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/" +SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +PATCHES=( + "${FILESDIR}"/${P}-bugfixes.patch + "${FILESDIR}"/${P}-CVE-2004-2265.patch + "${FILESDIR}"/${P}-CVE-2008-2266.patch + "${FILESDIR}"/${P}-man.patch + "${FILESDIR}"/${P}-rename.patch + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-fix-append_signature.patch + "${FILESDIR}"/${P}-string_format_issue.patch + "${FILESDIR}"/${P}-format-string-warning-inews.patch + "${FILESDIR}"/${P}-fix-function-definitions-clang16.patch + "${FILESDIR}"/${P}-fix-implicit.diff +) + +DOCS=( HISTORY INSTALL README ) + +src_prepare() { + sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die + + default + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + --disable-tcl \ + --disable-tk +} diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest index 9f8a1d57e833..dfc67e995979 100644 --- a/app-text/vgrep/Manifest +++ b/app-text/vgrep/Manifest @@ -1 +1,2 @@ DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846 +DIST vgrep-2.7.0.tar.gz 1998937 BLAKE2B 8f5bf53814604ff3bdf7492ec8ad96811a62c9accc0664d07db86039e117686f551c6aaba40e5af4e1b646289a0e996b4f1cade9fc1a197778504e5c8d114830 SHA512 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d diff --git a/app-text/vgrep/vgrep-2.6.0.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild index e8310a63f2f7..1b3329afca49 100644 --- a/app-text/vgrep/vgrep-2.6.0.ebuild +++ b/app-text/vgrep/vgrep-2.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -9,7 +9,7 @@ DESCRIPTION="A pager for grep, git-grep and similar grep implementations" HOMEPAGE="https://github.com/vrothberg/vgrep" SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD GPL-3+ MIT MIT-with-advertising" +LICENSE="Apache-2.0 BSD GPL-3 MIT" SLOT="0" KEYWORDS="amd64" diff --git a/app-text/vgrep/vgrep-2.7.0.ebuild b/app-text/vgrep/vgrep-2.7.0.ebuild new file mode 100644 index 000000000000..eac568a4d663 --- /dev/null +++ b/app-text/vgrep/vgrep-2.7.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A pager for grep, git-grep and similar grep implementations" +HOMEPAGE="https://github.com/vrothberg/vgrep" +SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD GPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64" + +# tests just run golangci-lint +RESTRICT="test" + +BDEPEND="dev-go/go-md2man" + +DOCS=( README.md ) + +src_prepare() { + default + sed -e '/-ldflags/s/-s //' -i Makefile || die # bug 795345 +} + +src_compile() { + emake build +} + +src_install() { + emake PREFIX="${ED}/usr" install + einstalldocs +} diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild index 0e4e9fd91365..35607e1283a8 100644 --- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild +++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="unicode" # Known test failures nobody cares about diff --git a/app-text/wdiff/wdiff-1.2.2-r2.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild index 3b9589a64dcd..66179b426012 100644 --- a/app-text/wdiff/wdiff-1.2.2-r2.ebuild +++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="experimental test" RESTRICT="!test? ( test )" diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest index f80e35d2fba4..2b0b1f67a3c7 100644 --- a/app-text/webgen/Manifest +++ b/app-text/webgen/Manifest @@ -1 +1,2 @@ DIST webgen-1.7.2.gem 201728 BLAKE2B abd3a8a9accfbc1a1e0070b7cbd4d0cc24796540ce1c8c0cfd3dc50882bf953b1e794971a90e2a429b3ecd64b1cb009b16c96ce1e6cfa05516ce48c10e39cd95 SHA512 806303f56319b6f55d8457b0b68438a9732bc1adc95ea50a955ad02b184814d0b878d618fc0547831cac53292208f1d0837d190b078ebb2ba42641dbaa5ffd93 +DIST webgen-1.7.3.gem 201728 BLAKE2B fc3c63d12b547c14e7900dfe881c95150de2f4783bfcbdd3f9a0bff6cd88d8278f1f2b0d7281394b35c3032e0cec639e01911807ddcc8b8114890bb4e404e2a4 SHA512 7e5738f66a2095fbfde922cf6711735273109bd10ebf12e2ebbbf4aa72cd54a8d4d50057d5aba8a428c154654000b718850e8c23391736123ea38f2f3b75cf50 diff --git a/app-text/webgen/webgen-1.7.2.ebuild b/app-text/webgen/webgen-1.7.2.ebuild index 10ee616bc170..f6e1b0bec434 100644 --- a/app-text/webgen/webgen-1.7.2.ebuild +++ b/app-text/webgen/webgen-1.7.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby27 ruby30" +USE_RUBY="ruby30 ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="task" RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc" @@ -46,6 +46,9 @@ all_ruby_prepare() { # Avoid tests failing with newer Psych versions rm -f test/test_documentation.rb || die + + # Fix minitest deprecation + sed -i -e 's/MiniTest/Minitest/' $(find test -type f -print) || die } all_ruby_install() { diff --git a/app-text/webgen/webgen-1.7.3.ebuild b/app-text/webgen/webgen-1.7.3.ebuild new file mode 100644 index 000000000000..c630a650eedd --- /dev/null +++ b/app-text/webgen/webgen-1.7.3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_DOC="task" +RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc" +RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS" +RUBY_FAKEGEM_EXTRAINSTALL="data" + +inherit ruby-fakegem + +DESCRIPTION="A template-based static website generator" +HOMEPAGE="https://webgen.gettalong.org" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="builder doc highlight markdown" + +ruby_add_bdepend "doc? ( dev-ruby/rdoc ) + test? ( + dev-ruby/minitest:5 + dev-ruby/rdiscount + >=dev-ruby/sass-3.2:* )" + +ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3 + >=dev-ruby/systemu-2.5 =dev-ruby/systemu-2* + >=dev-ruby/kramdown-2.3:2 + >=dev-ruby/psych-5.1:5 + builder? ( >=dev-ruby/builder-2.1.0:* ) + highlight? ( >=dev-ruby/coderay-1.0 ) + markdown? ( dev-ruby/maruku )" + +all_ruby_prepare() { + # Avoid a test fragile for sass version differences + sed -i -e '/test_static_call/,/^ end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die + # Avoid a test with fragile whitespace tests + rm -f test/webgen/content_processor/test_haml.rb || die + + # Avoid tests for rdoc since that requires an obsolete version + sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die + + # Avoid tests for unpackaged dependencies + rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die + + # Avoid tests failing with newer Psych versions + rm -f test/test_documentation.rb || die + + # Fix minitest deprecation + sed -i -e 's/MiniTest/Minitest/' $(find test -type f -print) || die +} + +all_ruby_install() { + all_fakegem_install + + doman man/man1/webgen.1 +} diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest index 1d552853b25f..e957693da79a 100644 --- a/app-text/wgetpaste/Manifest +++ b/app-text/wgetpaste/Manifest @@ -1 +1,2 @@ DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab +DIST wgetpaste-2.34.tar.xz 16640 BLAKE2B 6bc71d74945b88774f866a8c1bb693d52b3d5d680a04e45ec29acfb6dd9d9de16433ed9d675db1d63705dac356e44c89d7af0e7b18a71089778bfa92833d95d3 SHA512 9f334299d0314e821d989c785aaae9e8e9c0e4972ced9330039f7e2ca1867528a2d4f090dd754ec72e8a9d7005d8f5154266cd0769627b1023d1199893cf4f8c diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch b/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch new file mode 100644 index 000000000000..e55c8192dac7 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch @@ -0,0 +1,39 @@ +From 9614658e6a31bf1b318972008fd9fd1301e9d92f Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Sun, 13 Aug 2023 14:32:34 -0500 +Subject: [PATCH 2/3] Add -A/--ansi + +Don't strip ANSI codes. +--- +See also: https://github.com/zlin/wgetpaste/pull/46 +- Oskari + + wgetpaste | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/wgetpaste b/wgetpaste +index 5f4152d..1e3ae35 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -556,6 +556,8 @@ Options: + -X, --xpaste write resulting url to the X primary selection buffer (requires x11-misc/xclip) + -C, --xclippaste write resulting url to the X clipboard selection buffer (requires x11-misc/xclip) + -N, --no-ansi strip ANSI codes such as colors before pasting (requires app-text/ansifilter) ++ -A, --ansi don't strip ANSI codes ++ (useful for undoing NOANSI specified in a config file) + + -r, --raw show url for the raw paste (no syntax highlighting or html) + -t, --tee use tee to show what is being pasted +@@ -789,6 +791,9 @@ while [[ -n $1 ]]; do + -- ) + shift && getfilenames "$@" && break + ;; ++ -A | --ansi ) ++ NOANSI= ++ ;; + -c | --command ) + requiredarg "$@" + SOURCE="command" +-- +2.41.0 + diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch b/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch new file mode 100644 index 000000000000..5b9fcc5f4618 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch @@ -0,0 +1,69 @@ +From cc41231b0ea2ec5cc0a8353fd4a9b6b71301f819 Mon Sep 17 00:00:00 2001 +From: Christopher Fore <csfore@posteo.net> +Date: Sat, 14 Oct 2023 21:48:39 -0400 +Subject: [PATCH] Add new service - paste.gentoo.zip + +Specified in the code with `pgz` and in the cli for usage and brevity. +--- +See also: https://github.com/zlin/wgetpaste/pull/48 +- Oskari + + wgetpaste | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +diff --git a/wgetpaste b/wgetpaste +index b3a537b..fc0b559 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -41,7 +41,7 @@ POST_generic() { + } + + ### services +-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets" ++SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets" + # 0x0 + ENGINE_0x0=0x0 + URL_0x0="http://0x0.st" +@@ -68,6 +68,10 @@ URL_gists="https://api.github.com/gists" + ENGINE_ix_io=ix_io + URL_ix_io="http://ix.io" + SIZE_ix_io="1000000 1%MB" ++# paste.gentoo.zip ++ENGINE_pgz=pgz ++URL_pgz="https://paste.gentoo.zip" ++SIZE_pgz="2000000 2%MB" + # snippets + ENGINE_snippets=snippets + URL_snippets="https://gitlab.com/api/v4/snippets" +@@ -139,7 +143,6 @@ POST_dpaste() { + } + REGEX_RAW_dpaste='s|^http.*|\0.txt|' + REGEX_URL_dpaste='s|^http.*|\0|p' +- + # gists + LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly + Augeas AutoHotkey Batchfile Befunge BlitzMax Boo Brainfuck Bro C C# C++ +@@ -230,6 +233,20 @@ POST_lodgeit() { + POST_generic "submit=Paste! % % language % % code" "$1" "$2" "$3" "$4" "$5" "$6" + } + REGEX_RAW_lodgeit='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|' ++# paste.gentoo.zip ++escape_input_pgz() { echo "$*"; } ++POST_pgz() { ++ local content="${6}" ++ local boundary="WGETPASTE-3d8dfd9bff2b12a7410328d2ec1ed145" ++ echo "--${boundary}" ++ echo "Content-Disposition: form-data; name=\"file\"" ++ echo "" ++ echo "${content}" ++ echo "--${boundary}--" ++ ADDITIONAL_HEADERS_pgz=("Content-Type: multipart/form-data; boundary=${boundary}") ++} ++REGEX_RAW_pgz='s|^http.*|\0|' ++REGEX_URL_pgz='s|^http.*|\0|p' + # pinnwand + LANGUAGES_pinnwand="ABAP ActionScript%3 ActionScript Ada ANTLR ANTLR%With%ActionScript%Target \ + ANTLR%With%CPP%Target ANTLR%With%C#%Target ANTLR%With%Java%Target ANTLR%With%ObjectiveC%Target \ +-- +2.41.0 + diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch b/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch new file mode 100644 index 000000000000..b56322430364 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch @@ -0,0 +1,61 @@ +From fa0bd6dd8b7bc21b292e4f94eaa4fbf71d5240f1 Mon Sep 17 00:00:00 2001 +From: Richard-Rogalski <rrogalski@tutanota.com> +Date: Mon, 6 Nov 2023 14:00:02 -0600 +Subject: [PATCH] Added --quiet flag + +Signed-off-by: Richard Rogalski <rrogalski@firemail.cc> +Closes: #19 +--- +See also: https://github.com/zlin/wgetpaste/pull/51 +- Oskari + + _wgetpaste | 1 + + wgetpaste | 6 +++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/_wgetpaste b/_wgetpaste +index c4703e5..63696ad 100644 +--- a/_wgetpaste ++++ b/_wgetpaste +@@ -50,6 +50,7 @@ _arguments -s : \ + '(--xclippaste -C)'{--xclippaste,-C}'[write resulting url to the X clipboard selection buffer]' \ + '(--raw -r)'{--raw,-r}'[show url for the raw paste]' \ + '(--tee -t)'{--tee,-t}'[use tee to show what is being pasted]' \ ++ '(--quiet -q)'{--quiet,-q}'[show the url only]' \ + '(--verbose -v)'{--verbose,-v}'[show wget stderr output if no url is received]' \ + '--debug[be very verbose]' \ + '(--help -h)'{--help,-h}'[show help and exit]' \ +diff --git a/wgetpaste b/wgetpaste +index 1e3ae35..e38f9e5 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -561,6 +561,7 @@ Options: + + -r, --raw show url for the raw paste (no syntax highlighting or html) + -t, --tee use tee to show what is being pasted ++ -q, --quiet show the url only + -v, --verbose show wget stderr output if no url is received + --completions emit output suitable for shell completions (only affects --list-*) + --debug be *very* verbose (implies -v) +@@ -659,7 +660,7 @@ showexpirations() { + } + + showurl() { +- echo -n "Your ${2}paste can be seen here: " >&2 ++ [[ $QUIET ]] || echo -n "Your ${2}paste can be seen here: " >&2 + echo "$1" + [[ $XPASTE ]] && x_paste "$1" primary + [[ $XCLIPPASTE ]] && x_paste "$1" clipboard +@@ -841,6 +842,9 @@ while [[ -n $1 ]]; do + -N | --no-ansi ) + NOANSI=0 + ;; ++ -q | --quiet) ++ QUIET=0 ++ ;; + -r | --raw ) + RAW=0 + ;; +-- +2.41.0 + diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch b/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch new file mode 100644 index 000000000000..144d622f1243 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch @@ -0,0 +1,95 @@ +From cfe7dcd8a0e40b8c18556aad0b657f431c90505a Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Sun, 13 Aug 2023 14:25:35 -0500 +Subject: [PATCH 1/3] Change arg parsing priority + +Read config files before parsing CLI args. Allows all options to be set +via config and overridden on the CLI. +--- +See also: https://github.com/zlin/wgetpaste/pull/46 +- Oskari + + wgetpaste | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) + +diff --git a/wgetpaste b/wgetpaste +index fc0b559..5f4152d 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -720,7 +720,32 @@ geturl() { + fi | tail -n1 + } + +-### read cli options ++# read the config files ++load_configs() { ++ if [[ ! $IGNORECONFIGS ]]; then ++ # compatibility code ++ local f deprecated= ++ for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do ++ if [[ -f $f ]]; then ++ if [[ -z $deprecated ]]; then ++ echo "The config files for wgetpaste have changed to *.conf.$N" >&2 ++ deprecated=0 ++ fi ++ echo "Please move ${f} to ${f%.bash}.conf" >&2 ++ source "$f" || die "Failed to source $f" ++ fi ++ done ++ [[ -n $deprecated ]] && echo >&2 ++ # new locations override old ones in case they collide ++ for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do ++ if [[ -f $f ]]; then ++ source "$f" || die "Failed to source $f" ++ fi ++ done ++ fi ++} ++ ++### get runtime options + + # separate groups of short options. replace --foo=bar with --foo bar + while [[ -n $1 ]]; do +@@ -756,6 +781,8 @@ done + # set the separated options as input options. + set -- "${ARGS[@]}" + ++load_configs ++ + while [[ -n $1 ]]; do + ((args=1)) + case "$1" in +@@ -859,30 +886,6 @@ if [[ $NOANSI ]]; then + fi + + ### defaults +-load_configs() { +- if [[ ! $IGNORECONFIGS ]]; then +- # compatibility code +- local f deprecated= +- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do +- if [[ -f $f ]]; then +- if [[ -z $deprecated ]]; then +- echo "The config files for wgetpaste have changed to *.conf.$N" >&2 +- deprecated=0 +- fi +- echo "Please move ${f} to ${f%.bash}.conf" >&2 +- source "$f" || die "Failed to source $f" +- fi +- done +- [[ -n $deprecated ]] && echo >&2 +- # new locations override old ones in case they collide +- for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do +- if [[ -f $f ]]; then +- source "$f" || die "Failed to source $f" +- fi +- done +- fi +-} +-load_configs + [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET") + DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed" + DEFAULT_SERVICE=${DEFAULT_SERVICE:-bpaste} +-- +2.41.0 + diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch new file mode 100644 index 000000000000..8c6a523ac5cd --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch @@ -0,0 +1,31 @@ +https://github.com/zlin/wgetpaste/pull/45 + +From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Fri, 28 Jul 2023 18:55:10 -0500 +Subject: [PATCH] Disable sprunge + +Sprunge seems to have recently died. Disable it by removing it from the +service list, but keep the core bits in case it decides to come back. + +RIP ;( +--- + wgetpaste | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wgetpaste b/wgetpaste +index 864d5ef..b3a537b 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -41,7 +41,7 @@ POST_generic() { + } + + ### services +-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets sprunge" ++SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets" + # 0x0 + ENGINE_0x0=0x0 + URL_0x0="http://0x0.st" +-- +2.41.0 + diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch b/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch new file mode 100644 index 000000000000..14e8f2f6482a --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch @@ -0,0 +1,171 @@ +From a1c0782e828bc5f0fc8b79d0131f1847c5e7b359 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Sun, 13 Aug 2023 14:52:20 -0500 +Subject: [PATCH 3/3] test_ansi: add -A to the tests + +--- +See also: https://github.com/zlin/wgetpaste/pull/46 +- Oskari + + test/test_ansi.sh | 92 +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 81 insertions(+), 11 deletions(-) + +diff --git a/test/test_ansi.sh b/test/test_ansi.sh +index 23b27a8..e1e95f0 100755 +--- a/test/test_ansi.sh ++++ b/test/test_ansi.sh +@@ -94,8 +94,8 @@ fi + + # Paste stuff. Use a short timeout between requests (we're friendly after all!) + sleep 1 +-echo -n "Pasting command output (cat): " +-ERROR_LOG="$DL_DIR/command-error.log" ++echo -n "Pasting command output with ANSI stripping (cat): " ++ERROR_LOG="$DL_DIR/command-noansi-error.log" + URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")" + if [ $? -ne 0 ]; then + echo "FAILED!" +@@ -104,7 +104,7 @@ else + echo "SUCCESS!" + + echo -n "Downloading: " +- if ! (wget -q "$URL" -O "$DL_DIR/command.txt" 2>>"$ERROR_LOG"); then ++ if ! (wget -q "$URL" -O "$DL_DIR/command-noansi.txt" 2>>"$ERROR_LOG"); then + echo "FAILED!" + FAILED_PASTE=$((FAILED_PASTE + 1)) + else +@@ -112,13 +112,35 @@ else + rm "$ERROR_LOG" + + echo "Removing 'command run' header" +- sed -i -e '1d' "$DL_DIR/command.txt" ++ sed -i -e '1d' "$DL_DIR/command-noansi.txt" ++ fi ++fi ++sleep 1 ++echo -n "Pasting command output without ANSI stripping (cat): " ++ERROR_LOG="$DL_DIR/command-ansi-error.log" ++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")" ++if [ $? -ne 0 ]; then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++else ++ echo "SUCCESS!" ++ ++ echo -n "Downloading: " ++ if ! (wget -q "$URL" -O "$DL_DIR/command-ansi.txt" 2>>"$ERROR_LOG"); then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++ else ++ echo "SUCCESS" ++ rm "$ERROR_LOG" ++ ++ echo "Removing 'command run' header" ++ sed -i -e '1d' "$DL_DIR/command-ansi.txt" + fi + fi + + sleep 1 +-echo -n "Pasting stdin (cat | wgetpaste): " +-ERROR_LOG="$DL_DIR/stdin-error.log" ++echo -n "Pasting stdin with ANSI stripping (cat | wgetpaste): " ++ERROR_LOG="$DL_DIR/stdin-noansi-error.log" + URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v 2>"$ERROR_LOG")" + if [ $? -ne 0 ]; then + echo "FAILED!" +@@ -127,7 +149,26 @@ else + echo "SUCCESS!" + + echo -n "Downloading: " +- if ! (wget -q "$URL" -O "$DL_DIR/stdin.txt" 2>>"$ERROR_LOG"); then ++ if ! (wget -q "$URL" -O "$DL_DIR/stdin-noansi.txt" 2>>"$ERROR_LOG"); then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++ else ++ echo "SUCCESS!" ++ rm "$ERROR_LOG" ++ fi ++fi ++sleep 1 ++echo -n "Pasting stdin without ANSI stripping (cat | wgetpaste): " ++ERROR_LOG="$DL_DIR/stdin-ansi-error.log" ++URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v 2>"$ERROR_LOG")" ++if [ $? -ne 0 ]; then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++else ++ echo "SUCCESS!" ++ ++ echo -n "Downloading: " ++ if ! (wget -q "$URL" -O "$DL_DIR/stdin-ansi.txt" 2>>"$ERROR_LOG"); then + echo "FAILED!" + FAILED_PASTE=$((FAILED_PASTE + 1)) + else +@@ -137,8 +178,8 @@ else + fi + + sleep 1 +-echo -n "Pasting a file: " +-ERROR_LOG="$DL_DIR/file-error.log" ++echo -n "Pasting a file with ANSI stripping: " ++ERROR_LOG="$DL_DIR/file-noansi-error.log" + URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")" + if [ $? -ne 0 ]; then + echo "FAILED!" +@@ -147,7 +188,26 @@ else + echo "SUCCESS!" + + echo -n "Downloading: " +- if ! (wget -q "$URL" -O "$DL_DIR/file.txt" 2>>"$ERROR_LOG"); then ++ if ! (wget -q "$URL" -O "$DL_DIR/file-noansi.txt" 2>>"$ERROR_LOG"); then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++ else ++ echo "SUCCESS!" ++ rm "$ERROR_LOG" ++ fi ++fi ++sleep 1 ++echo -n "Pasting a file without ANSI stripping: " ++ERROR_LOG="$DL_DIR/file-ansi-error.log" ++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")" ++if [ $? -ne 0 ]; then ++ echo "FAILED!" ++ FAILED_PASTE=$((FAILED_PASTE + 1)) ++else ++ echo "SUCCESS!" ++ ++ echo -n "Downloading: " ++ if ! (wget -q "$URL" -O "$DL_DIR/file-ansi.txt" 2>>"$ERROR_LOG"); then + echo "FAILED!" + FAILED_PASTE=$((FAILED_PASTE + 1)) + else +@@ -157,7 +217,7 @@ else + fi + + # Compare downloaded files +-for dl_file in "$DL_DIR"/*.txt; do ++for dl_file in "$DL_DIR"/*-noansi.txt; do + echo -n "Testing file $dl_file: " + # Ignore missing trailing newline and extra empty lines in downloaded file + if (diff -q -Z -B "$NOANSI_FILE" "$dl_file" &>/dev/null); then +@@ -167,6 +227,16 @@ for dl_file in "$DL_DIR"/*.txt; do + DL_MISMATCH=$((DL_MISMATCH + 1)) + fi + done ++for dl_file in "$DL_DIR"/*-ansi.txt; do ++ echo -n "Testing file $dl_file: " ++ # Ignore missing trailing newline and extra empty lines in downloaded file ++ if (diff -q -Z -B "$ANSI_FILE" "$dl_file" &>/dev/null); then ++ echo "SUCCESS!" ++ else ++ echo "FAILED!" ++ DL_MISMATCH=$((DL_MISMATCH + 1)) ++ fi ++done + + echo "Total failed pastes: $FAILED_PASTE" + echo "Total mismatches: $DL_MISMATCH" +-- +2.41.0 + diff --git a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild index 4c9afff880ea..89f63061351c 100644 --- a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild +++ b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+ssl" PROPERTIES="test_network" @@ -21,6 +21,8 @@ RDEPEND="net-misc/wget[ssl?]" PATCHES=( "${FILESDIR}"/${PN}-2.33-tests.patch + "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch + "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch ) src_prepare() { @@ -42,4 +44,19 @@ src_install() { pkg_postinst() { optfeature "ANSI (color code) stripping support" app-text/ansifilter optfeature "xclip support" x11-misc/xclip + + if [[ -n ${REPLACING_VERSIONS} ]]; then + local old + + for old in ${REPLACING_VERSIONS}; do + if ver_test ${old} -lt '2.33-r2'; then + ewarn + ewarn "Sprunge is dead and the service has been dropped from the code. Remove or" + ewarn "replace sprunge as the default service in the system or user wgetpaste" + ewarn "config if applicable." + ewarn + break + fi + done + fi } diff --git a/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild new file mode 100644 index 000000000000..6c78bad4e65a --- /dev/null +++ b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Command-line interface to various pastebins" +HOMEPAGE="https://github.com/zlin/wgetpaste" +SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="+ssl" + +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND="net-misc/wget[ssl?]" + +PATCHES=( + "${FILESDIR}"/${PN}-2.33-tests.patch + "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch + "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch + "${FILESDIR}"/${PN}-2.33-change-arg-parsing-priority.patch + "${FILESDIR}"/${PN}-2.33-add-A-ansi.patch + "${FILESDIR}"/${PN}-2.33-test_ansi-add-A-to-the-tests.patch + "${FILESDIR}"/${PN}-2.33-added-quiet-flag.patch +) + +src_prepare() { + default + + sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die +} + +src_test() { + test/test.sh || die +} + +src_install() { + dobin ${PN} + insinto /usr/share/zsh/site-functions + doins _wgetpaste +} + +pkg_postinst() { + optfeature "ANSI (color code) stripping support" app-text/ansifilter + optfeature "xclip support" x11-misc/xclip + + if [[ -n ${REPLACING_VERSIONS} ]]; then + local old + + for old in ${REPLACING_VERSIONS}; do + if ver_test ${old} -lt '2.33-r2'; then + ewarn + ewarn "Sprunge is dead and the service has been dropped from the code. Remove or" + ewarn "replace sprunge as the default service in the system or user wgetpaste" + ewarn "config if applicable." + ewarn + break + fi + done + fi +} diff --git a/app-text/wgetpaste/wgetpaste-2.34.ebuild b/app-text/wgetpaste/wgetpaste-2.34.ebuild new file mode 100644 index 000000000000..9cc20b68190a --- /dev/null +++ b/app-text/wgetpaste/wgetpaste-2.34.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Command-line interface to various pastebins" +HOMEPAGE="https://github.com/zlin/wgetpaste" +SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="+ssl" + +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND="net-misc/wget[ssl?]" + +src_prepare() { + default + + sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die +} + +src_test() { + test/test.sh || die +} + +src_install() { + dobin ${PN} + insinto /usr/share/zsh/site-functions + doins _wgetpaste +} + +pkg_postinst() { + optfeature "ANSI (color code) stripping support" app-text/ansifilter + optfeature "xclip support" x11-misc/xclip + + if [[ -n ${REPLACING_VERSIONS} ]]; then + local old + + for old in ${REPLACING_VERSIONS}; do + if ver_test ${old} -lt '2.33-r2'; then + ewarn + ewarn "Sprunge is dead and the service has been dropped from the code. Remove or" + ewarn "replace sprunge as the default service in the system or user wgetpaste" + ewarn "config if applicable." + ewarn + break + fi + done + fi +} diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild index 2f41e96f67e2..577ba3e01b4c 100644 --- a/app-text/wiki2beamer/wiki2beamer-0.10.0-r1.ebuild +++ b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools inherit python-single-r1 diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild deleted file mode 100644 index f4ed8432bf39..000000000000 --- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) - -inherit python-single-r1 - -DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input" - -MY_P=wiki2beamer-v${PV} -HOMEPAGE="https://wiki2beamer.github.io/" -SRC_URI="https://github.com/wiki2beamer/wiki2beamer/archive/${MY_P}.tar.gz" - -LICENSE="GPL-2+ FDL-1.3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +examples" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-ruby/asciidoctor )" - -S="${WORKDIR}/wiki2beamer-${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-doc-examples-makefile.patch - "${FILESDIR}"/${P}-doc-man-makefile.patch -) - -src_compile() { - use doc && emake -C doc/man/ wiki2beamer.1 -} - -src_install() { - use examples && dodoc -r doc/examples - - use doc && doman doc/man/${PN}.1 - dodoc ChangeLog README.md - - python_doscript code/${PN} -} diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild index 2b9e931375ca..befcd33cd6e5 100644 --- a/app-text/writerperfect/writerperfect-0.9.6.ebuild +++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Various formats to Open document format converter" HOMEPAGE="http://libwpd.sf.net" -SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/libwpd/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -KEYWORDS="amd64 ~riscv x86 ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~riscv x86 ~x86-linux" IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf" # configure fails if no import library is selected... diff --git a/app-text/wv2/wv2-0.4.2-r3.ebuild b/app-text/wv2/wv2-0.4.2-r3.ebuild index 4b22d2a50e99..136b69d8ce8c 100644 --- a/app-text/wv2/wv2-0.4.2-r3.ebuild +++ b/app-text/wv2/wv2-0.4.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,12 +6,12 @@ EAPI=8 inherit cmake flag-o-matic DESCRIPTION="Excellent MS Word filter lib, used in most Office suites" -HOMEPAGE="http://wvware.sourceforge.net" -SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2" +HOMEPAGE="https://wvware.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/wvware/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="zlib" RDEPEND="dev-libs/glib diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest index db9cbceff7e4..a16ba7a583d1 100644 --- a/app-text/xapers/Manifest +++ b/app-text/xapers/Manifest @@ -1 +1,3 @@ DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7 +DIST xapers-0.9.2.tar.bz2 155239 BLAKE2B 918ce421b154291deeb636b50c0dd0db2e523405d66105e3799a7abb054411b15b02cc5fa55e9667fb7c8fe98664778fb90e7c77aaa716b66c0f4dc4d463aae7 SHA512 73604490278bcdb228333dc677be12f6110cc11ab96a8a0d3c4590c5e6383d0869db2e82fbed88e4bf82fd997025ca831b6412bb00a54a7ab8ba3309b755d84b +DIST xapers-0.9.3.tar.bz2 155307 BLAKE2B e448303ae6ee5fba41fd38814dc63d44b8b362f778677f55d8deecbb3b27572b7db5b4f274b5d33dc6d052b87b7379b34246eca6b182989511e5da635219be22 SHA512 84ef543b4fd3400ac796944e9baec92a4df9c09d2779184595cc582d2c91f6b8a9f500956d77266f733a830ca5416b3db8a189323781b7d5283ebfc8aece94b0 diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml index 2541df48c09d..4e0bcb47f23f 100644 --- a/app-text/xapers/metadata.xml +++ b/app-text/xapers/metadata.xml @@ -10,9 +10,6 @@ <name>Proxy maintainers</name> </maintainer> <upstream> - <maintainer status="active"> - <name>Jameson Graef Rollins</name> - <email>jrollins@finestructure.net</email> - </maintainer> + <remote-id type="gitlab">wpettersson/xapers</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/xapers/xapers-0.9.0.ebuild b/app-text/xapers/xapers-0.9.0.ebuild index c3a2f529ed90..f2d6b0f70140 100644 --- a/app-text/xapers/xapers-0.9.0.ebuild +++ b/app-text/xapers/xapers-0.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 diff --git a/app-text/xapers/xapers-0.9.2.ebuild b/app-text/xapers/xapers-0.9.2.ebuild new file mode 100644 index 000000000000..cee8778f4ad9 --- /dev/null +++ b/app-text/xapers/xapers-0.9.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Personal document indexing system" +HOMEPAGE="https://gitlab.com/wpettersson/xapers/" +SRC_URI="https://gitlab.com/wpettersson/${PN}/-/archive/${PV}/${P}.tar.bz2" +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="app-text/poppler[utils] + dev-libs/xapian-bindings[python,${PYTHON_USEDEP}] + dev-python/pybtex[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/urwid[${PYTHON_USEDEP}] + x11-misc/xclip + x11-misc/xdg-utils" + +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( ${RDEPEND} )" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + cd test || die + ./all || die +} diff --git a/app-text/xapers/xapers-0.9.3.ebuild b/app-text/xapers/xapers-0.9.3.ebuild new file mode 100644 index 000000000000..8aa138381611 --- /dev/null +++ b/app-text/xapers/xapers-0.9.3.ebuild @@ -0,0 +1,36 @@ +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Personal document indexing system" +HOMEPAGE="https://gitlab.com/wpettersson/xapers/" +SRC_URI="https://gitlab.com/wpettersson/${PN}/-/archive/${PV}/${P}.tar.bz2" +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="app-text/poppler[utils] + dev-libs/xapian-bindings[python,${PYTHON_USEDEP}] + dev-python/pybtex[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/urwid[${PYTHON_USEDEP}] + x11-misc/xclip + x11-misc/xdg-utils" + +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( ${RDEPEND} )" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +python_test() { + cd test || die + ./all || die +} diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest index 892fdc707206..9baffa3dacb6 100644 --- a/app-text/xapian-omega/Manifest +++ b/app-text/xapian-omega/Manifest @@ -1,2 +1,4 @@ -DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae -DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec +DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b SHA512 460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19 +DIST xapian-omega-1.4.23.tar.xz 571596 BLAKE2B fee64cf73a7bc8e6951c3555f1139bec8c94102b00ccf3a0a69c5037002f122f0d1688a798967f997f85d6c21bd69d72758168408d95159a7442bc46050fe915 SHA512 2137972cebb10315f35024c8a5e179ce082eab777e4fd795ba6700eeab0d77ec49b6e06d104222e77824898c25c1717d346564d59e5f349360fec89476e3ee4f +DIST xapian-omega-1.4.24.tar.xz 580736 BLAKE2B bdefb4a28185e5966c8f7ec7056562bdca39d02b5fb92d57b3b4ab051107fb80d198c5f2d460d067fa085ebad99276476b6ec0cb53636ae4dd3fb62f6a546f0e SHA512 d3a5c5c4de9a13ed2e55ab46915aaea1ba51120b5716a4e7cab9fb628ef2c979c83e17a44d3354045459d08a6d7041322182d9c81bdbb54eb6bd53431d147a9c +DIST xapian-omega-1.4.25.tar.xz 578904 BLAKE2B d0bb62741f7c58d1398a4dc8bca3de2b385094fb8126a4e36f424cb09964ac350709bf6dabc38d8d7ebf5f3fcd213d2a444d8e5e5cc52c6353f1c72fc7eebd72 SHA512 2b0d855baaaabbf6da1b86d61f0d3e85d5fb62d1b7d04738a7e15758d0042b9e22f80f0aa273b9a9a21b04dff579c561280e44f2a69a0c0d4f270cb0fbcef169 diff --git a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild index ec98debe4517..3dbebdbb01ed 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild @@ -1,29 +1,30 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" -SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz" HOMEPAGE="https://xapian.org/" -S="${WORKDIR}/xapian-omega-${PV}" +DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" -DEPEND="~dev-libs/xapian-${PV}:0/30 +DEPEND=" dev-lang/perl - dev-libs/libpcre - sys-libs/zlib" + dev-libs/libpcre2:= + ~dev-libs/xapian-${PV}:0/30 + sys-apps/file + sys-libs/zlib +" RDEPEND="${DEPEND}" src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}" install # Protect /etc/omega.conf - echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega + echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die doenvd "${T}"/20xapian-omega dodoc AUTHORS ChangeLog INSTALL NEWS README TODO diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild index 4ab0cfef4675..a9a75d694991 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" -SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz" HOMEPAGE="https://xapian.org/" -S="${WORKDIR}/xapian-omega-${PV}" +DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -DEPEND="~dev-libs/xapian-${PV}:0/30 +DEPEND=" dev-lang/perl - dev-libs/libpcre - sys-libs/zlib" + dev-libs/libpcre2:= + ~dev-libs/xapian-${PV}:0/30 + sys-apps/file + sys-libs/zlib +" RDEPEND="${DEPEND}" src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}" install # Protect /etc/omega.conf - echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega + echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die doenvd "${T}"/20xapian-omega dodoc AUTHORS ChangeLog INSTALL NEWS README TODO diff --git a/app-text/xapian-omega/xapian-omega-1.4.24.ebuild b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild new file mode 100644 index 000000000000..1e0983f89c26 --- /dev/null +++ b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" +HOMEPAGE="https://xapian.org/" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=" + dev-lang/perl + dev-libs/libpcre2:= + ~dev-libs/xapian-${PV}:0/30 + sys-apps/file + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}" install + + # Protect /etc/omega.conf + echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die + doenvd "${T}"/20xapian-omega + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO + + # Directory containing Xapian databases: + keepdir /var/lib/omega/data + + # Directory containing OmegaScript templates: + keepdir /var/lib/omega/templates + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die + + # Directory to write Omega logs to: + keepdir /var/log/omega + + # Directory containing any cdb files for the $lookup OmegaScript command: + keepdir /var/lib/omega/cdb +} diff --git a/app-text/xapian-omega/xapian-omega-1.4.25.ebuild b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild new file mode 100644 index 000000000000..1e0983f89c26 --- /dev/null +++ b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend" +HOMEPAGE="https://xapian.org/" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=" + dev-lang/perl + dev-libs/libpcre2:= + ~dev-libs/xapian-${PV}:0/30 + sys-apps/file + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}" install + + # Protect /etc/omega.conf + echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die + doenvd "${T}"/20xapian-omega + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO + + # Directory containing Xapian databases: + keepdir /var/lib/omega/data + + # Directory containing OmegaScript templates: + keepdir /var/lib/omega/templates + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die + + # Directory to write Omega logs to: + keepdir /var/log/omega + + # Directory containing any cdb files for the $lookup OmegaScript command: + keepdir /var/lib/omega/cdb +} diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest index 7154de8a2910..925b44be4da5 100644 --- a/app-text/xchm/Manifest +++ b/app-text/xchm/Manifest @@ -1,2 +1 @@ -DIST xchm-1.33.tar.gz 886169 BLAKE2B 26b6c664307de3ef1bef21d3fd240b5636f5abc8196c5aa1b7cd6b91f12addbbd5a8c54d133de2fd8ce9132ea2677f79f0ef722b1da6c87429cd3df54d208585 SHA512 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989 -DIST xchm-1.35.tar.gz 884353 BLAKE2B ce77f43e462e803e6ceed1cd91e56650cc054245daa5bb18c215eb649cb8ba6a39591265d6c753670a852ff7ac2fe84aa0b7c915b9ade8631de686884d808f1c SHA512 53a334b460c2de51b1f5a6afbca888e376430ab2fb48f2d60c71d34886b19ca5982cf3a4f23c3cb7456781c3b658affa5a64da3ade961accf258096b5fa6df3d +DIST xchm-1.36.tar.gz 882212 BLAKE2B 8f11457664748fa3effb23102b23ee59c3184a408f6defa3bc7d7bf90c97357a74d33f5da6b7098011a1c23a9f3dd9a523076e367aa9547c9d72f25296b6c787 SHA512 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65 diff --git a/app-text/xchm/xchm-1.33.ebuild b/app-text/xchm/xchm-1.33.ebuild deleted file mode 100644 index bf624116cb69..000000000000 --- a/app-text/xchm/xchm-1.33.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit desktop wxwidgets xdg-utils - -DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" -HOMEPAGE="https://github.com/rzvncj/xCHM/" -SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~riscv x86" -IUSE="nls" - -RDEPEND=">=dev-libs/chmlib-0.36 - x11-libs/wxGTK:${WX_GTK_VER}[X] - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -src_configure() { - setup-wxwidgets - econf $(use_enable nls) -} - -src_install() { - default - - domenu "${FILESDIR}"/xchm.desktop - insinto /usr/share/mime/packages - doins "${FILESDIR}"/xchm.xml -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/app-text/xchm/xchm-1.35.ebuild b/app-text/xchm/xchm-1.36.ebuild index ed93e6bfae5e..4abfca557e5d 100644 --- a/app-text/xchm/xchm-1.35.ebuild +++ b/app-text/xchm/xchm-1.36.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~riscv ~x86" +KEYWORDS="amd64 ppc ~riscv x86" IUSE="nls" RDEPEND=">=dev-libs/chmlib-0.36 diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest index 946aa23510de..b17947255f53 100644 --- a/app-text/xdvik/Manifest +++ b/app-text/xdvik/Manifest @@ -1,3 +1,2 @@ -DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88 DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d diff --git a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch deleted file mode 100644 index 6387b28c8ba2..000000000000 --- a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100 -+++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100 -@@ -21,17 +21,10 @@ - - # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM]) - # ------------------------------------- --AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])]) -+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])]) - - # KPSE_FREETYPE2_SYSTEM_FLAGS - # --------------------------- - AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl --AC_REQUIRE([AC_CANONICAL_HOST])[]dnl --AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl --if $FT2_CONFIG --ftversion >/dev/null 2>&1; then -- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` -- FREETYPE2_LIBS=`$FT2_CONFIG --libs` --elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then -- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library]) --fi --]) # KPSE_FREETYPE2_SYSTEM_FLAGS -+_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])]) -+ diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch new file mode 100644 index 000000000000..d22c473f42d3 --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch @@ -0,0 +1,40 @@ +From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001 +From: Christopher Fore <csfore@posteo.net> +Date: Thu, 15 Feb 2024 15:20:34 -0500 +Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14 + +Starting in GCC 14, what used to be warnings from incompatible pointer +types are now errors. + +https://www.gnu.org/software/gcc/gcc-14/porting_to.html + +Error message: +gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from +incompatible pointer type [-Wincompatible-pointer-types] + 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0, + | ~~~~~~~~~^~~~~~~~~~~~ + | | + | char ** + +This mismatch is simply from XawListChange taking in a const whilst the +argument given was not a const. + +Gentoo bug: https://bugs.gentoo.org/919069 +Signed-off-by: Christopher Fore <csfore@posteo.net> +--- + texk/xdvik/gui/pagesel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gui/pagesel.c b/gui/pagesel.c +index 945ae760fa..913db11264 100644 +--- a/gui/pagesel.c ++++ b/gui/pagesel.c +@@ -538,7 +538,7 @@ xaw_update_list(void) + button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width); + /* delete and re-create list */ + ASSERT(total_pages <= (int)page_info.index_size, ""); +- XawListChange(LIST_WIDGET, page_info.page_labels, 0, ++ XawListChange(LIST_WIDGET, (_Xconst char**) page_info.page_labels, 0, + MAX(button_width, pagelist_width), False); + /* restore selected item */ + if (idx != XAW_LIST_NONE) { diff --git a/app-text/xdvik/xdvik-22.87.03-r4.ebuild b/app-text/xdvik/xdvik-22.87.03-r4.ebuild deleted file mode 100644 index cb3b471d4d4c..000000000000 --- a/app-text/xdvik/xdvik-22.87.03-r4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg - -DESCRIPTION="DVI previewer for X Window System" -HOMEPAGE="http://xdvi.sourceforge.net/" -SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz" -S="${WORKDIR}"/${P}/texk/xdvik - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -LICENSE="GPL-2" -IUSE="motif neXt Xaw3d emacs" - -DEPEND=">=media-libs/freetype-2.9.1-r2:2 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - emacs? ( >=app-editors/emacs-23.1:* ) - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) - ) - ) - dev-libs/kpathsea:=" -RDEPEND="${DEPEND} - virtual/latex-base - !<app-text/texlive-2007" -BDEPEND="sys-devel/flex - app-alternatives/yacc - virtual/pkgconfig" - -src_prepare() { - default - - # Make sure system kpathsea headers are used - cd "${WORKDIR}/${P}/texk/kpathsea" || die - local i - for i in *.h ; do - echo "#include_next \"$i\"" > ${i} || die - done - - cd "${WORKDIR}/${P}" || die - eapply "${FILESDIR}"/${P}-freetype2-config.patch - cd "${S}" || die - eautoreconf -} - -src_configure() { - has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" - - local toolkit - if use motif ; then - toolkit="motif" - use neXt && ewarn "neXt USE flag ignored (superseded by motif)" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)" - elif use neXt ; then - toolkit="neXtaw" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)" - elif use Xaw3d ; then - toolkit="xaw3d" - else - toolkit="xaw" - fi - - econf \ - --with-system-freetype2 \ - --with-system-kpathsea \ - --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \ - --with-xdvi-x-toolkit="${toolkit}" \ - --x-includes="${ESYSROOT}"/usr/include \ - --x-libraries="${ESYSROOT}"/usr/$(get_libdir) -} - -src_compile() { - emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea - - use emacs && elisp-compile xdvi-search.el -} - -src_install() { - dodir /usr/share/texmf-dist/dvips/config - - emake DESTDIR="${D}" install - - dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi - - dodoc BUGS FAQ README.* - - use emacs && elisp-install tex-utils *.el *.elc - - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer" - echo "MimeType=application/x-dvi;" >> "${ED}"/usr/share/applications/xdvi-"${PN}".desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - if use emacs; then - elog "Add" - elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")" - elog " (require 'xdvi-search)" - elog "to your ~/.emacs file" - fi -} diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild index 4e0b3e1fbc70..3cfd9e28d9cd 100644 --- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,12 +6,12 @@ EAPI=8 inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg DESCRIPTION="DVI viewer for X Window System" -HOMEPAGE="http://xdvi.sourceforge.net/" -SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz +HOMEPAGE="https://xdvi.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/xdvi/${P}.tar.gz https://dev.gentoo.org/~pacho/${PN}/${PN}_192.png" S="${WORKDIR}"/${P}/texk/xdvik -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SLOT="0" LICENSE="GPL-2" IUSE="motif neXt Xaw3d emacs" @@ -34,11 +34,16 @@ DEPEND=">=media-libs/freetype-2.9.1-r2:2 dev-libs/kpathsea:=" RDEPEND="${DEPEND} virtual/latex-base - !<app-text/texlive-2007" -BDEPEND="sys-devel/flex +" +BDEPEND="app-alternatives/lex app-alternatives/yacc virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch + "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch +) + src_prepare() { default @@ -51,7 +56,6 @@ src_prepare() { cd "${WORKDIR}/${P}" || die cd "${S}" || die - eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch eautoreconf } diff --git a/app-text/xdvik/xdvik-22.87.06.ebuild b/app-text/xdvik/xdvik-22.87.06.ebuild deleted file mode 100644 index 203540097055..000000000000 --- a/app-text/xdvik/xdvik-22.87.06.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg - -DESCRIPTION="DVI previewer for X Window System" -HOMEPAGE="http://xdvi.sourceforge.net/" -SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz" -S="${WORKDIR}"/${P}/texk/xdvik - -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -LICENSE="GPL-2" -IUSE="motif neXt Xaw3d emacs" - -DEPEND=">=media-libs/freetype-2.9.1-r2:2 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - emacs? ( >=app-editors/emacs-23.1:* ) - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) - ) - ) - dev-libs/kpathsea:=" -RDEPEND="${DEPEND} - virtual/latex-base - !<app-text/texlive-2007" -BDEPEND="sys-devel/flex - app-alternatives/yacc - virtual/pkgconfig" - -src_prepare() { - default - - # Make sure system kpathsea headers are used - cd "${WORKDIR}/${P}/texk/kpathsea" || die - local i - for i in *.h ; do - echo "#include_next \"$i\"" > ${i} || die - done - - cd "${WORKDIR}/${P}" || die - cd "${S}" || die - eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch - eautoreconf -} - -src_configure() { - has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)" - - local toolkit - if use motif ; then - toolkit="motif" - use neXt && ewarn "neXt USE flag ignored (superseded by motif)" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)" - elif use neXt ; then - toolkit="neXtaw" - use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)" - elif use Xaw3d ; then - toolkit="xaw3d" - else - toolkit="xaw" - fi - - econf \ - --with-system-freetype2 \ - --with-system-kpathsea \ - --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \ - --with-xdvi-x-toolkit="${toolkit}" \ - --x-includes="${ESYSROOT}"/usr/include \ - --x-libraries="${ESYSROOT}"/usr/$(get_libdir) -} - -src_compile() { - emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea - - use emacs && elisp-compile xdvi-search.el -} - -src_install() { - dodir /usr/share/texmf-dist/dvips/config - - emake DESTDIR="${D}" install - - dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi - - dodoc BUGS FAQ README.* - - use emacs && elisp-install tex-utils *.el *.elc - - doicon "${FILESDIR}"/${PN}.xpm - make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer" - echo "MimeType=application/x-dvi;" >> "${ED}"/usr/share/applications/xdvi-"${PN}".desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - if use emacs; then - elog "Add" - elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")" - elog " (require 'xdvi-search)" - elog "to your ~/.emacs file" - fi -} diff --git a/app-text/xhtml11/xhtml11-20101123.ebuild b/app-text/xhtml11/xhtml11-20101123.ebuild index 02a0e3691373..7dd8687465b0 100644 --- a/app-text/xhtml11/xhtml11-20101123.ebuild +++ b/app-text/xhtml11/xhtml11-20101123.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit sgml-catalog-r1 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0" -HOMEPAGE="http://www.w3.org/TR/xhtml11/" -SRC_URI="http://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz" +HOMEPAGE="https://www.w3.org/TR/xhtml11/" +SRC_URI="https://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz" LICENSE="W3C" SLOT="0" diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild deleted file mode 100644 index dd9eb10be244..000000000000 --- a/app-text/xiphos/xiphos-4.2.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD" -HOMEPAGE="https://xiphos.org/" -SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz - https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz" - -LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" -SLOT="0" -KEYWORDS="amd64" -IUSE="dbus debug" - -COMMON="sys-apps/util-linux - dev-libs/libxml2 - dev-libs/libxslt - dbus? ( dev-libs/dbus-glib )" -RDEPEND="${COMMON} - >=app-text/sword-1.8.1 - dev-libs/glib:2 - dev-libs/icu - >=net-libs/biblesync-1.2.0 - net-libs/webkit-gtk:4 - sys-libs/zlib[minizip] - x11-libs/gtk+:3" -DEPEND="${RDEPEND}" -BDEPEND="${COMMON} - app-arch/zip - app-text/yelp-tools - dev-libs/appstream-glib - dev-util/desktop-file-utils - dev-util/glib-utils - dev-util/itstool - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch - "${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch - "${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch -) - -src_configure() { - local mycmakeargs=( - -DDBUS=$(usex dbus) - -DDEBUG=$(usex debug) - -DPOSTINST=off - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - - if [[ -n "${REPLACING_VERSIONS}" ]]; then - local rver - for rver in ${REPLACING_VERSIONS}; do - if ver_test "${rver}" -le "4.2.1"; then - ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries." - ewarn "Studypad and the personal commentary will no longer work." - break - fi - done - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild index 04e20aca65b1..b7ac40476986 100644 --- a/app-text/xiphos/xiphos-4.2.1-r2.ebuild +++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="dbus debug" COMMON="sys-apps/util-linux diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest index d4c75dbb6f6c..739966069752 100644 --- a/app-text/xlsx2csv/Manifest +++ b/app-text/xlsx2csv/Manifest @@ -1,2 +1 @@ -DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489 -DIST xlsx2csv-0.8.0.tar.gz 208842 BLAKE2B bfe69c39a8312feec35bb9a8079982f0765cbe975ce9d842ccd969d1399d03202ddf8d41c54f5129d122f535272add38c1489c0804340cc24bf1091779d76a2c SHA512 dd9ced043f347d420371aaf68f65b1ae827f231ceddbfb051174c8072dda27f989490120d0ee6bbe1fb25faf79944242144e196ccf58db5c537d5b0826cb91ee +DIST xlsx2csv-0.8.2.tar.gz 227107 BLAKE2B a140cf748d36a59e354620a8c44533acf6c9f4f0840f5e733c37a0ec4e83d4e9a8db1b0d776d4d3858038bc2871361db312d5137c52fcbe0587bf9ac921886c3 SHA512 73b034a12d96f956d3604b64de226b37d9b63e551d35d021e3cc50292fed5c84d1d5ab2bcb2fe92010d81aaa4631d9080a5f92209adae88cf6f2e072eaf0561e diff --git a/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch deleted file mode 100644 index f3e04b827bd0..000000000000 --- a/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- xlsx2csv-0.7.6/test/run -+++ xlsx2csv-0.7.6/test/run -@@ -5,8 +5,6 @@ - import subprocess - from io import open - --PYTHON_VERSIONS = ["2.7"] -- - """ - This test uses sys.stdout. - That means this test doesn't verify: -@@ -16,31 +14,24 @@ - - def compare(case, arguments=[]): - failed = False -- for pyver in PYTHON_VERSIONS: -- ext = "xlsx" -- if os.path.exists("test/%s.xlsm" % case): -- ext = "xlsm" -- -- if os.name == 'posix':# in case of Linux -- left = subprocess.check_output(["python%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','') -- elif os.name == 'nt':# in case of Windows -- # Use py.exe http://blog.python.org/2011/07/python-launcher-for-windows_11.html on Windows -- left = subprocess.check_output(["py", "-%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','') -- else: -- print("os.name is unexpected: "+os.name) -- sys.exit(1) -- -- f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="") -- right = f.read().replace('\r','') -- f.close() -- -- if left != right: -- print("FAILED: %s %s" %(case, pyver)) -- print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n")) -- print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n")) -- failed = True -- else: -- print("OK: %s %s" %(case, pyver)) -+ ext = "xlsx" -+ if os.path.exists("test/%s.xlsm" % case): -+ ext = "xlsm" -+ -+ left = subprocess.check_output(["./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','') -+ -+ f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="") -+ right = f.read().replace('\r','') -+ f.close() -+ -+ if left != right: -+ print("FAILED: %s" % (case,)) -+ print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n")) -+ print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n")) -+ failed = True -+ else: -+ print("OK: %s" % (case,)) -+ - if failed: - sys.exit(1) - diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild deleted file mode 100644 index b5b221a9924d..000000000000 --- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -DESCRIPTION="Convert MS Office xlsx files to CSV" -HOMEPAGE="https://github.com/dilshod/xlsx2csv/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="dev-lang/perl" - -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) - -python_compile_all() { - emake -C man -} - -python_test() { - "${EPYTHON}" test/run || die "tests failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - doman man/${PN}.1 -} diff --git a/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild index 7b0deef9b9c3..fdd7d94e35ef 100644 --- a/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild +++ b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_PEP517=setuptools diff --git a/app-text/xml2doc/xml2doc-20030510-r2.ebuild b/app-text/xml2doc/xml2doc-20030510-r2.ebuild index 471710170ee3..52f984d793dd 100644 --- a/app-text/xml2doc/xml2doc-20030510-r2.ebuild +++ b/app-text/xml2doc/xml2doc-20030510-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)" HOMEPAGE="http://xml2doc.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" S="${WORKDIR}/${PN}" LICENSE="GPL-2" diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest index cacc6d3da544..33223c01b4c9 100644 --- a/app-text/xml2rfc/Manifest +++ b/app-text/xml2rfc/Manifest @@ -1,3 +1,2 @@ -DIST xml2rfc-3.15.3.gh.tar.gz 2857354 BLAKE2B 936c1f0c37d8de85b7a9966b6239da55dca090c3cb3e712a1198683244e436ccf6827fc6d00325e8c13a7be829af6954d311f690e4aa0367f2399c4d5cf9321f SHA512 3022bfc071e9bbef2e8e6b73c9c6539690e18f0935e3d22f99d1fc3faa642b75f998d6dfbd8d8c019f7fc789c38957994e06667870638dff8e907c928578c904 -DIST xml2rfc-3.16.0.gh.tar.gz 2859379 BLAKE2B 537815a648b9f5ed59b37a82a29ee092b7e2ad3d10c191a08c752a43d3aed0b81270a855b3a3ee1df935a1d14192715e62f82fe15c2de98eddf329ac554a4ba5 SHA512 893a71bd33c6971103188e624b91d1370f8324bb2316a542fa9496c02368875582b57336e57abd8753e207d80a5aed508c15407ea734056f91002dde9aafdad2 -DIST xml2rfc-3.17.0.gh.tar.gz 2856289 BLAKE2B b48d83118c0bfc1044b703d22a5d1b132e3c9f07da91592ef416013fc3cd8a55ef9e9dc51c3e7725d560c0ccde76120e590fd19e1f36f5bbbe4c73f5d4683f4d SHA512 61dadf2d8308cfade6210af62a54b638a02f44ba586ecd73c8929813c7a7013da933d8ff72f4a1107665da9a952e7fa188cf5cc71c928207b056c4f36f46679d +DIST xml2rfc-3.17.4.gh.tar.gz 2858770 BLAKE2B b29b8a102668a5aa943a32b28a9d1669e2a6b0af03085a550c21a08e5bfb5ff3ee8979b03a3d7ae8e820ac8bf60455682914fd06a882e17183ca51aaf1dedf86 SHA512 3fc620eed12fc2a7f6015df8b6a5b1aa422cd8c26807e01d75498aee9257faad1bca68606f77598fb040a8dae074e35ffa0e2994a1ae8d59ee27d25fc6a755e5 +DIST xml2rfc-3.18.0.gh.tar.gz 2856552 BLAKE2B b2397d10c770694e8eb354220803f89525e64638fd1043c2672ce0849be72a397ab6f2bff03f689721f00e63ac034ec7b7aec20cf93b759f42a415ab66293908 SHA512 afd88bad84c6f5b734dd091e34ec41bff63fcf38f3bfab777818954dec31363300e13dd745b602e2c145fbe0df0be4e69918ddc71aac276bf0833ad4563c19f1 diff --git a/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch b/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch deleted file mode 100644 index d7d027962c24..000000000000 --- a/app-text/xml2rfc/files/xml2rfc-Remove-broken-test.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ed27e2983c27065bd88ac82cd26a5b9128544b45 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <flo@geekplace.eu> -Date: Fri, 28 Oct 2022 20:18:10 +0200 -Subject: [PATCH] Remove broken test - ---- a/test.py -+++ b/test.py -@@ -466,71 +466,6 @@ class WriterRfcTest(WriterRootTest): - return self.status_test() - - --class PdfWriterTests(unittest.TestCase): -- elements_root = None -- elements_pdfxml = None -- -- @classmethod -- def setUpClass(cls) -> None: -- # Putting this in setUpClass() allows this module to be imported even if this -- # procedure will fail. This improves some error messages and makes debugging -- # a little bit easier. The setUpClass() method is run by unittest during init. -- # This happens only once, avoiding repeated execution of slow operations. -- def _pdfwriter(path): -- """ Parse a minimal RFC tree and instantiate a writer """ -- parser = xml2rfc.XmlRfcParser(path, quiet=True, **options_for_xmlrfcparser) -- xmlrfc = parser.parse() -- writer = xml2rfc.writers.pdf.PdfWriter(xmlrfc, quiet=True, ) -- return writer -- -- elements_writer = _pdfwriter('tests/input/elements.xml') -- try: -- elements_pdfdoc = elements_writer.pdf() # has side effects on .root -- except Exception as e: -- print(e) -- raise -- cls.pdf_writer = elements_writer -- cls.elements_root = elements_writer.root -- cls.elements_pdfxml = xmldoc(None, bytes=elements_pdfdoc) -- -- def setUp(self): -- xml2rfc.log.quiet = True -- self.pdfxml = copy.deepcopy(self.elements_pdfxml) -- self.root = copy.deepcopy(self.elements_root) -- -- def test_text_content(self): -- def norm(t): -- return re.sub(r'\s+', ' ', t).strip() -- # -- text = norm('\n'.join( p.text for p in self.pdfxml.xpath('.//Page/text') )) -- for e in self.root.xpath('./middle//*'): -- if e.text and e.text.strip() and e.tag not in xml2rfc.util.unicode.unicode_content_tags and not xml2rfc.util.unicode.is_svg(e): -- t = norm(e.text.split(None, 1)[0]) -- self.assertIn(t, text) -- -- def test_included_fonts(self): -- if xml2rfc.HAVE_WEASYPRINT and xml2rfc.HAVE_PANGO: -- font_families = set([ f.text for f in self.pdfxml.xpath('.//FontFamily') ]) -- for script in self.root.get('scripts').split(','): -- family = xml2rfc.util.fonts.get_noto_serif_family_for_script(script) -- self.assertIn(family, font_families, 'Missing font match for %s' % script) -- -- def test_flatten_unicode_spans(self): -- input_html = '<body><p>f<span class="unicode">o</span>o<span class="unicode">ba</span>r</p></body>' -- output_html = self.pdf_writer.flatten_unicode_spans(input_html) -- self.assertEqual(output_html, '<body><p>foobar</p></body>') -- -- def test_get_serif_fonts(self): -- fonts = self.pdf_writer.get_serif_fonts() -- for font in ['Noto Serif', 'Noto Sans Cherokee', 'Noto Serif CJK SC', 'Noto Serif Hebrew']: -- self.assertIn(font, fonts) -- -- def test_get_mono_fonts(self): -- fonts = self.pdf_writer.get_mono_fonts() -- for font in ['Roboto Mono', 'Noto Sans Cherokee', 'Noto Serif CJK SC', 'Noto Serif Hebrew']: -- self.assertIn(font, fonts) -- -- - class HtmlWriterTest(unittest.TestCase): - '''HtmlWriter tests''' - diff --git a/app-text/xml2rfc/xml2rfc-3.15.3.ebuild b/app-text/xml2rfc/xml2rfc-3.15.3.ebuild deleted file mode 100644 index 55ad8cf2e16d..000000000000 --- a/app-text/xml2rfc/xml2rfc-3.15.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="Generates RFCs and IETF drafts from document source in XML" -HOMEPAGE="https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc" -SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -RESTRICT="!test? ( test )" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" - -BDEPEND=" - test? ( - dev-python/PyPDF2[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/dict2xml[${PYTHON_USEDEP}] - dev-python/weasyprint[${PYTHON_USEDEP}] - media-fonts/noto[cjk] - ) -" - -RDEPEND=" - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/ConfigArgParse[${PYTHON_USEDEP}] - dev-python/intervaltree[${PYTHON_USEDEP}] - dev-python/google-i18n-address[${PYTHON_USEDEP}] - >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}] - >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}/xml2rfc-Remove-broken-test.patch" -) - -distutils_enable_tests setup.py - -#src_test() { - # https://github.com/ietf-tools/xml2rfc/issues/561 -# emake tests-no-network -#} diff --git a/app-text/xml2rfc/xml2rfc-3.17.0.ebuild b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild index 495e49666d19..4e0aa2aed4e5 100644 --- a/app-text/xml2rfc/xml2rfc-3.17.0.ebuild +++ b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> RESTRICT="!test? ( test )" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" BDEPEND=" test? ( @@ -28,10 +28,10 @@ BDEPEND=" " RDEPEND=" - dev-python/appdirs[${PYTHON_USEDEP}] + >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}] dev-python/ConfigArgParse[${PYTHON_USEDEP}] dev-python/intervaltree[${PYTHON_USEDEP}] - dev-python/google-i18n-address[${PYTHON_USEDEP}] + >=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}] >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}] >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] diff --git a/app-text/xml2rfc/xml2rfc-3.16.0.ebuild b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild index 6136dbb33773..4e0aa2aed4e5 100644 --- a/app-text/xml2rfc/xml2rfc-3.16.0.ebuild +++ b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild @@ -28,10 +28,10 @@ BDEPEND=" " RDEPEND=" - dev-python/appdirs[${PYTHON_USEDEP}] + >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}] dev-python/ConfigArgParse[${PYTHON_USEDEP}] dev-python/intervaltree[${PYTHON_USEDEP}] - dev-python/google-i18n-address[${PYTHON_USEDEP}] + >=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}] >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}] >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] @@ -42,13 +42,10 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] " -PATCHES=( - "${FILESDIR}/xml2rfc-Remove-broken-test.patch" -) +distutils_enable_tests unittest -distutils_enable_tests setup.py - -#src_test() { - # https://github.com/ietf-tools/xml2rfc/issues/561 -# emake tests-no-network -#} +src_prepare() { + default + # Disable broken PdfWriterTests. + sed -i 's/ PdfWriterTests(unittest.TestCase):/ PdfWriterTests:/' test.py || die +} diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest index 233ce86eac09..8913a6b305b1 100644 --- a/app-text/xmldiff/Manifest +++ b/app-text/xmldiff/Manifest @@ -1 +1,2 @@ DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae +DIST xmldiff-2.6.3.tar.gz 86132 BLAKE2B 9e5777f498677bf12a603d6636833d4942fb1af2c461e9a60e2dccf89c3776f72018407928991c8a9f53abe8c704ca9a736a4f0f81ce3ca23e1657a896d43804 SHA512 ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33 diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml index ba7acd516129..ca7003827fef 100644 --- a/app-text/xmldiff/metadata.xml +++ b/app-text/xmldiff/metadata.xml @@ -10,6 +10,8 @@ with XML files or DOM trees. </longdescription> <upstream> + <doc>https://xmldiff.readthedocs.io</doc> <remote-id type="github">Shoobx/xmldiff</remote-id> + <remote-id type="pypi">xmldiff</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/xmldiff/xmldiff-2.6.3.ebuild b/app-text/xmldiff/xmldiff-2.6.3.ebuild new file mode 100644 index 000000000000..9814f09052d0 --- /dev/null +++ b/app-text/xmldiff/xmldiff-2.6.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="A tool that figures out the differences between two similar XML files" +HOMEPAGE=" + https://github.com/Shoobx/xmldiff + https://pypi.org/project/xmldiff/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux" + +RDEPEND=" + >=dev-python/lxml-3.1.0[${PYTHON_USEDEP}] +" + +DOCS=( CHANGES.rst README.rst ) + +distutils_enable_tests unittest diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild index 7dd8954575e8..6abdd5883fc8 100644 --- a/app-text/xmlformat/xmlformat-1.04.ebuild +++ b/app-text/xmlformat/xmlformat-1.04.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby27 ruby30" -inherit ruby-single +USE_RUBY="ruby27 ruby30 ruby31 ruby32" +inherit edo ruby-single DESCRIPTION="Reformat XML documents to your custom style" SRC_URI="http://www.kitebird.com/software/${PN}/${P}.tar.gz" @@ -16,11 +16,20 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc ruby" DEPEND=" + dev-lang/perl ruby? ( ${RUBY_DEPS} ) - !ruby? ( dev-lang/perl ) " RDEPEND="${DEPEND}" +src_test() { + # Perl is always installed, so we may as well always test both. + if use ruby; then + nonfatal edo ./runtest all || die "runtest for ruby failed" + fi + + nonfatal edo ./runtest -p all || die "runtest for perl failed" +} + src_install() { dobin xmlformat.pl @@ -38,11 +47,3 @@ src_install() { dodoc -r docs/* fi } - -src_test() { - if use ruby; then - ./runtest all || die "runtest for ruby failed." - else - ./runtest -p all || die "runtest for perl failed." - fi -} diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch new file mode 100644 index 000000000000..fda631611216 --- /dev/null +++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch @@ -0,0 +1,32 @@ +From d01c3e8a488282bc8bc2fae5bd21efc6c3931a32 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.40.1 + diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch new file mode 100644 index 000000000000..9269349726d5 --- /dev/null +++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch @@ -0,0 +1,59 @@ +From e1da090da24f5620784daf853eb1353aa164583f Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Wed, 27 Mar 2024 23:25:39 +0100 +Subject: [PATCH] Address -Wincompatible-function-pointer-types for Clang 17 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Also showed with -Werror=incompatible-pointer-types with GCC. + +Bug: https://bugs.gentoo.org/927838 + +Symptom with GCC was: +> src/xml.c: In function ‘main’: +> src/xml.c:300:43: error: passing argument 2 of ‘xmlSetStructuredErrorFunc’ from incompatible pointer type [-Werror=incompatible-pointer-types] +> 300 | xmlSetStructuredErrorFunc(&errorInfo, reportError); +> | ^~~~~~~~~~~ +> | | +> | void (*)(void *, xmlError *) {aka void (*)(void *, struct _xmlError *)} +> In file included from /usr/include/libxml2/libxml/valid.h:15, +> from /usr/include/libxml2/libxml/parser.h:19, +> from /usr/include/libxml2/libxml/tree.h:17, +> from /usr/include/libxslt/xslt.h:13, +> from src/xml.c:37: +> /usr/include/libxml2/libxml/xmlerror.h:898:57: note: expected ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void *, const struct _xmlError *)’} but argument is of type ‘void (*)(void *, xmlError *)’ {aka ‘void (*)(void *, struct _xmlError *)’} +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..e8d7177 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError *error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild new file mode 100644 index 000000000000..ab7cb4863189 --- /dev/null +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents" +HOMEPAGE="https://xmlstar.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/libgcrypt:0= + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-clang16.patch +) + +src_prepare() { + default + + # We need to patch use of /usr/lib because it is a problem with + # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600). + # The grep sandwich acts as a regression test so that a future + # version bump cannot break patching without noticing. + if [[ $(get_libdir) != lib ]]; then + grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die + sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die + grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die + fi + + eautoreconf +} + +src_configure() { + append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0) + + # NOTE: Fully built documentation is already shipped with the tarball: + # - doc/xmlstarlet-ug.{pdf,ps,html} + # - doc/xmlstarlet.txt + # - doc/xmlstarlet.1 + econf \ + --disable-build-docs \ + --disable-static-libs +} + +src_install() { + default + dosym xml /usr/bin/xmlstarlet +} diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild new file mode 100644 index 000000000000..22e26f57fff9 --- /dev/null +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents" +HOMEPAGE="https://xmlstar.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/libgcrypt:0= + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-clang16.patch + "${FILESDIR}"/${PN}-1.6.1-clang17.patch +) + +src_prepare() { + default + + # We need to patch use of /usr/lib because it is a problem with + # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600). + # The grep sandwich acts as a regression test so that a future + # version bump cannot break patching without noticing. + if [[ $(get_libdir) != lib ]]; then + grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die + sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die + grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die + fi + + eautoreconf +} + +src_configure() { + append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0) + + # NOTE: Fully built documentation is already shipped with the tarball: + # - doc/xmlstarlet-ug.{pdf,ps,html} + # - doc/xmlstarlet.txt + # - doc/xmlstarlet.1 + econf \ + --disable-build-docs \ + --disable-static-libs +} + +src_install() { + default + dosym xml /usr/bin/xmlstarlet +} diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild index a234631ef8b8..ecc697cfd008 100644 --- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents" -HOMEPAGE="http://xmlstar.sourceforge.net/" -SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz" +HOMEPAGE="https://xmlstar.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/xmlstar/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-libs/libxml2 diff --git a/app-text/xmlto/xmlto-0.0.28-r10.ebuild b/app-text/xmlto/xmlto-0.0.28-r11.ebuild index bb3959502ea9..bf44cdb5d846 100644 --- a/app-text/xmlto/xmlto-0.0.28-r10.ebuild +++ b/app-text/xmlto/xmlto-0.0.28-r11.ebuild @@ -9,12 +9,13 @@ DESCRIPTION="Script for converting XML and DocBook documents to a variety of out HOMEPAGE="https://pagure.io/xmlto" SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="latex text" RDEPEND=" + app-shells/bash:0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt @@ -48,9 +49,12 @@ src_prepare() { } src_configure() { - # We don't want the script to detect /bin/sh if it is bash. - export ac_cv_path_BASH="${BASH}" has_version sys-apps/util-linux || export GETOPT=getopt-long - econf + local args=( + # Ensure we always get a #!/bin/bash shebang in xmlto, bug 912286 + BASH="${EPREFIX}/bin/bash" + ) + + econf "${args[@]}" } diff --git a/app-text/xmlto/xmlto-0.0.28-r9.ebuild b/app-text/xmlto/xmlto-0.0.28-r9.ebuild deleted file mode 100644 index 953366daa3ee..000000000000 --- a/app-text/xmlto/xmlto-0.0.28-r9.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats" -HOMEPAGE="https://pagure.io/xmlto" -SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="latex text" - -RDEPEND=" - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - || ( sys-apps/util-linux app-misc/getopt ) - text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) - latex? ( dev-texlive/texlive-formatsextra ) -" -DEPEND="${RDEPEND}" -# We only depend on flex when we patch the input lexer. -# We touch it in fix-warnings.patch. -BDEPEND="sys-devel/flex" - -DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch - "${FILESDIR}"/${PN}-0.0.28-allow-links.patch - "${FILESDIR}"/${P}-dont-hardcode-paths.patch - "${FILESDIR}"/${P}-fix-warnings.patch -) - -src_prepare() { - default - - # fix symbol clash on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die - fi - - eautoreconf -} - -src_configure() { - # We don't want the script to detect /bin/sh if it is bash. - export ac_cv_path_BASH="${BASH}" - has_version sys-apps/util-linux || export GETOPT=getopt-long - - econf -} diff --git a/app-text/xmltoman/Manifest b/app-text/xmltoman/Manifest new file mode 100644 index 000000000000..cc8d650c97d7 --- /dev/null +++ b/app-text/xmltoman/Manifest @@ -0,0 +1,2 @@ +DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22 +DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d diff --git a/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch b/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch new file mode 100644 index 000000000000..a902ddd07b84 --- /dev/null +++ b/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch @@ -0,0 +1,55 @@ +From 39553c816cb8a18d798a6f947d2901f7a3228439 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 29 Oct 2022 18:02:25 +0100 +Subject: [PATCH] Generate man pages + +Generate the man pages so that the tool doesn't have to run itself +during installation. It's a hack to workaround Perl upgrade problems. +--- /dev/null ++++ b/xmlmantohtml.1 +@@ -0,0 +1,18 @@ ++.TH xmlmantohtml 1 User Manuals ++.SH NAME ++xmlmantohtml \- xml to html converter ++.SH SYNOPSIS ++\fBxmlmantohtml \fIfile.1.xml\fB > file.1.html ++\f1 ++.SH DESCRIPTION ++xmlmantohtml is a small script to convert XML/MAN(GROFF) to HTML. ++ ++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate HTML using \fBxsltproc(1)\f1. ++.SH AUTHOR ++xmltoman was written by Oliver Kurth <oku@masqmail.cx> ++.SH MAINTAINER ++xmltoman is currently maintained by Adam Bilbrough ++.SH SEE ALSO ++\fBxmlmantohtml(1)\f1 ++.SH COMMENTS ++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer. +--- /dev/null ++++ b/xmltoman.1 +@@ -0,0 +1,24 @@ ++.TH xmltoman 1 User Manuals ++.SH NAME ++xmltoman \- xml to man converter ++.SH SYNOPSIS ++\fBxmltoman \fIfile.1.xml\fB > file.1 ++\f1 ++.SH DESCRIPTION ++xmltoman is a small script to convert XML to a MAN page in GROFF format. It features the usual man page items such a description, options, see also etc. The XML format also supports converting to HTML pages. ++ ++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate html using \fBxsltproc(1)\f1. ++.SH FILES ++\fI/usr/share/xmltoman/xmltoman.dtd\f1 the DTD file. ++ ++\fI/usr/share/xmltoman/xmltoman.xsl\f1 XSLT stylesheet to generate HTML. ++ ++\fI/usr/share/xmltoman/xmltoman.css\f1 stylesheet to be used for HTML. ++.SH AUTHOR ++xmltoman was written by Oliver Kurth <oku@masqmail.cx> ++.SH MAINTAINER ++xmltoman is currently maintained by Adam Bilbrough ++.SH SEE ALSO ++\fBxmlmantohtml(1)\f1 ++.SH COMMENTS ++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer. diff --git a/app-text/gocr/metadata.xml b/app-text/xmltoman/metadata.xml index 20f8c25eb8ae..cdc9d054966e 100644 --- a/app-text/gocr/metadata.xml +++ b/app-text/xmltoman/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">jocr</remote-id> + <remote-id type="sourceforge">xmltoman</remote-id> + <remote-id type="github">atsb/xmltoman</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/xmltoman/xmltoman-0.4-r2.ebuild b/app-text/xmltoman/xmltoman-0.4-r2.ebuild new file mode 100644 index 000000000000..925a47ce4c20 --- /dev/null +++ b/app-text/xmltoman/xmltoman-0.4-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Simple scripts for converting xml to groff or html" +HOMEPAGE="https://sourceforge.net/projects/xmltoman/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=" + dev-lang/perl + dev-perl/XML-Parser" +BDEPEND="${RDEPEND}" + +src_install() { + # 'make install' requires GNU install, upstream is dead and carrying + # a patch is more space than redoing it here + dobin xmltoman xmlmantohtml + + insinto /usr/share/xmltoman + doins xmltoman.{css,dtd,xsl} + + dodoc README + doman xmltoman.1 xmlmantohtml.1 +} diff --git a/app-text/xmltoman/xmltoman-0.6.ebuild b/app-text/xmltoman/xmltoman-0.6.ebuild new file mode 100644 index 000000000000..2ae15fdeec2d --- /dev/null +++ b/app-text/xmltoman/xmltoman-0.6.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Simple scripts for converting xml to groff or html" +HOMEPAGE="https://sourceforge.net/projects/xmltoman/" +SRC_URI="https://github.com/atsb/xmltoman/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND=" + dev-lang/perl + dev-perl/XML-Parser +" + +PATCHES=( + "${FILESDIR}"/${P}-generate-man-pages.patch +) + +src_install() { + # 'make install' requires GNU install, upstream is dead and carrying + # a patch is more space than redoing it here + dobin xmltoman xmlmantohtml + + insinto /usr/share/xmltoman + doins xmltoman.{css,dtd,xsl} + + dodoc README + doman xmltoman.1 xmlmantohtml.1 +} diff --git a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild index 74e8cde97c95..e2a69eb6c2f4 100644 --- a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild +++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then unset SRC_URI else KEYWORDS="amd64 ~ppc64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" fi DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild index d7fc7a1b87ab..8440bd9546ae 100644 --- a/app-text/xournal/xournal-9999.ebuild +++ b/app-text/xournal/xournal-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then unset SRC_URI else KEYWORDS="~amd64 ~ppc64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" fi DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index 393fd37c018f..5a40251ff5b3 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1 +1,2 @@ -DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d +DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d +DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch new file mode 100644 index 000000000000..97f7fbc0d7f2 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/894720 +https://bugs.gentoo.org/895536 +--- a/src/view/background/BackgroundConfig.h ++++ b/src/view/background/BackgroundConfig.h +@@ -11,6 +11,7 @@ + + #pragma once + ++#include <cstdint> + #include <map> + #include <string> + diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch new file mode 100644 index 000000000000..c53b63588c43 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,9 +148,9 @@ if (ENABLE_CPPUNIT) + endif (ENABLE_CPPUNIT) + + # Plugins / scripting +-find_package (Lua 5.3 EXACT) ++find_package (Lua ${LUA_VERSION} EXACT) + if (NOT Lua_FOUND) +- find_package (Lua 5.3) # Lua 5.4 is only supported with cmake >=3.18 ++ find_package (Lua ${LUA_VERSION}) # Lua 5.4 is only supported with cmake >=3.18 + endif() + + if (Lua_FOUND) diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch new file mode 100644 index 000000000000..89784b96354f --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 453695c0..900c6cc3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ find_package(ZLIB REQUIRED) + find_package(Threads REQUIRED) + + option(ENABLE_PLUGINS "Compile with plugin support" ON) +-find_package(Lua) # Lua 5.4 is only supported with cmake >=3.18 ++find_package(Lua ${LUA_VERSION} EXACT) # Lua 5.4 is only supported with cmake >=3.18 + message(STATUS "Found Lua: ${Lua_FOUND}") + if (Lua_FOUND AND ENABLE_PLUGINS) + # currently not fully supported by cmake diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch new file mode 100644 index 000000000000..df77cc00f745 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch @@ -0,0 +1,36 @@ +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index 1cb6bb5b..af069dca 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -12,27 +12,23 @@ mark_as_advanced(HELP2MAN) + if (HELP2MAN) + set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff") + set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1") +- set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz") + + add_custom_command( +- OUTPUT ${MAN_FILE} ++ OUTPUT ${MAN_PAGE} + COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/xournalpp +- COMMAND gzip -n -f -9 ${MAN_PAGE} + DEPENDS ${CMAKE_BINARY_DIR}/xournalpp + ) + + set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1") +- set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz") + + add_custom_command( +- OUTPUT ${MAN_FILE_THUMBNAILER} ++ OUTPUT ${MAN_PAGE_THUMBNAILER} + COMMAND ${HELP2MAN} --no-info --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer +- COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER} + DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer + ) + +- add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER}) +- install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1") ++ add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER}) ++ install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1") + else(HELP2MAN) + message("help2man is missing; no man pages will be generated") + endif(HELP2MAN) diff --git a/app-text/xournalpp/metadata.xml b/app-text/xournalpp/metadata.xml index 96729a07e765..cece50a82eb0 100644 --- a/app-text/xournalpp/metadata.xml +++ b/app-text/xournalpp/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="person"> <email>dilfridge@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">xournalpp/xournalpp</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild index a1105db47c04..77d1e2514686 100644 --- a/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild +++ b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615 -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-3 lua5-4 ) inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then @@ -12,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" else SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" - KEYWORDS="~amd64 ~ppc64" + KEYWORDS="amd64 ~ppc64" fi DESCRIPTION="Handwriting notetaking software with PDF annotation support" @@ -40,10 +39,19 @@ DEPEND="${COMMON_DEPEND}" BDEPEND=" virtual/pkgconfig sys-apps/lsb-release - elibc_musl? ( sys-libs/libbacktrace ) " PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" "${FILESDIR}/${PN}-1.1.1-nocompress.patch" + "${FILESDIR}/${PN}-1.1.3-lua-5-4.patch" + "${FILESDIR}/${PN}-1.1.3-gcc13.patch" ) + +src_configure() { + local mycmakeargs=( + -DLUA_VERSION="$(lua_get_version)" + ) + + cmake_src_configure +} diff --git a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild index fdf5361b9d3c..df7aa6c945ea 100644 --- a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild +++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake xdg +LUA_COMPAT=( lua5-3 lua5-4 ) +inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" - unset SRC_URI else - KEYWORDS="amd64 ~ppc64" SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz" + KEYWORDS="~amd64 ~ppc64" fi DESCRIPTION="Handwriting notetaking software with PDF annotation support" @@ -19,34 +19,38 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp" LICENSE="GPL-2" SLOT="0" -IUSE="" -COMMONDEPEND=" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} app-text/poppler[cairo] - dev-libs/glib + >=dev-libs/glib-2.32.0 dev-libs/libxml2 - dev-libs/libzip:= - gnome-base/librsvg - media-libs/portaudio[cxx] - media-libs/libsndfile + >=dev-libs/libzip-1.0.1:= + >=gnome-base/librsvg-2.40 + >=media-libs/portaudio-12[cxx] + >=media-libs/libsndfile-1.0.25 sys-libs/zlib:= - x11-libs/gtk+:3 -" -RDEPEND="${COMMONDEPEND} -" -DEPEND="${COMMONDEPEND} + >=x11-libs/gtk+-3.18.9:3 " +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" BDEPEND=" virtual/pkgconfig sys-apps/lsb-release - elibc_musl? ( sys-libs/libbacktrace ) " PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" - "${FILESDIR}/${PN}-1.1.1-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch" ) -src_prepare() { - cmake_src_prepare +src_configure() { + local mycmakeargs=( + -DLUA_VERSION="$(lua_get_version)" + ) + + cmake_src_configure } diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index a1105db47c04..df7aa6c945ea 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615 -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-3 lua5-4 ) inherit cmake lua-single xdg if [[ ${PV} == *9999 ]]; then @@ -26,24 +25,32 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" COMMON_DEPEND=" ${LUA_DEPS} app-text/poppler[cairo] - dev-libs/glib + >=dev-libs/glib-2.32.0 dev-libs/libxml2 - dev-libs/libzip:= - gnome-base/librsvg - media-libs/portaudio[cxx] - media-libs/libsndfile + >=dev-libs/libzip-1.0.1:= + >=gnome-base/librsvg-2.40 + >=media-libs/portaudio-12[cxx] + >=media-libs/libsndfile-1.0.25 sys-libs/zlib:= - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.18.9:3 " RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND}" BDEPEND=" virtual/pkgconfig sys-apps/lsb-release - elibc_musl? ( sys-libs/libbacktrace ) " PATCHES=( "${FILESDIR}/${PN}-1.1.1-nostrip.patch" - "${FILESDIR}/${PN}-1.1.1-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-nocompress.patch" + "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch" ) + +src_configure() { + local mycmakeargs=( + -DLUA_VERSION="$(lua_get_version)" + ) + + cmake_src_configure +} diff --git a/app-text/xpdf/files/xpdf-4.04-font-paths.patch b/app-text/xpdf/files/xpdf-4.04-font-paths.patch new file mode 100644 index 000000000000..04c4994f4667 --- /dev/null +++ b/app-text/xpdf/files/xpdf-4.04-font-paths.patch @@ -0,0 +1,48 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=1509862 +https://bugs.gentoo.org/916446 +--- a/xpdf/GlobalParams.cc ++++ b/xpdf/GlobalParams.cc +@@ -84,20 +84,20 @@ + const char *obliqueFont; // name of font to oblique + double obliqueFactor; // oblique sheer factor + } displayFontTab[] = { +- {"Courier", "n022003l.pfb", "cour.ttf", "Courier", "Courier", NULL, 0}, +- {"Courier-Bold", "n022004l.pfb", "courbd.ttf", "Courier", "Courier Bold", NULL, 0}, +- {"Courier-BoldOblique", "n022024l.pfb", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557}, +- {"Courier-Oblique", "n022023l.pfb", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557}, +- {"Helvetica", "n019003l.pfb", "arial.ttf", "Helvetica", "Helvetica", NULL, 0}, +- {"Helvetica-Bold", "n019004l.pfb", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0}, +- {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557}, +- {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557}, +- {"Symbol", "s050000l.pfb", NULL, "Symbol", "Symbol", NULL, 0}, +- {"Times-Bold", "n021004l.pfb", "timesbd.ttf", "Times", "Times Bold", NULL, 0}, +- {"Times-BoldItalic", "n021024l.pfb", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0}, +- {"Times-Italic", "n021023l.pfb", "timesi.ttf", "Times", "Times Italic", NULL, 0}, +- {"Times-Roman", "n021003l.pfb", "times.ttf", "Times", "Times Roman", NULL, 0}, +- {"ZapfDingbats", "d050000l.pfb", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0}, ++ {"Courier", "NimbusMonoPS-Regular.t1", "cour.ttf", "Courier", "Courier", NULL, 0}, ++ {"Courier-Bold", "NimbusMonoPS-Bold.t1", "courbd.ttf", "Courier", "Courier Bold", NULL, 0}, ++ {"Courier-BoldOblique", "NimbusMonoPS-BoldItalic.t1", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557}, ++ {"Courier-Oblique", "NimbusMonoPS-Italic.t1", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557}, ++ {"Helvetica", "NimbusSans-Regular.t1", "arial.ttf", "Helvetica", "Helvetica", NULL, 0}, ++ {"Helvetica-Bold", "NimbusSans-Bold.t1", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0}, ++ {"Helvetica-BoldOblique", "NimbusSans-BoldItalic.t1", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557}, ++ {"Helvetica-Oblique", "NimbusSans-Italic.t1", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557}, ++ {"Symbol", "StandardSymbolsPS.t1", NULL, "Symbol", "Symbol", NULL, 0}, ++ {"Times-Bold", "NimbusRoman-Bold.t1", "timesbd.ttf", "Times", "Times Bold", NULL, 0}, ++ {"Times-BoldItalic", "NimbusRoman-BoldItalic.t1", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0}, ++ {"Times-Italic", "NimbusRoman-Italic.t1", "timesi.ttf", "Times", "Times Italic", NULL, 0}, ++ {"Times-Roman", "NimbusRoman-Regular.t1", "times.ttf", "Times", "Times Roman", NULL, 0}, ++ {"ZapfDingbats", "D050000L.t1", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0}, + {NULL} + }; + +@@ -109,6 +109,7 @@ + }; + #else + static const char *displayFontDirs[] = { ++ "/usr/share/fonts/urw-fonts", + "/usr/share/ghostscript/fonts", + "/usr/local/share/ghostscript/fonts", + "/usr/share/fonts/default/Type1", + diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml index 77412381d44b..bd29776a71c3 100644 --- a/app-text/xpdf/metadata.xml +++ b/app-text/xpdf/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="cmyk">Include support for CMYK rasterization</flag> <flag name="i18n">Enable support non-UTF8 national charsets</flag> diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild index 41d271c193ad..cf95468f9077 100644 --- a/app-text/xpdf/xpdf-4.04-r1.ebuild +++ b/app-text/xpdf/xpdf-4.04-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/xpdf.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc inherit cmake desktop verify-sig xdg DESCRIPTION="The PDF viewer and tools" @@ -92,6 +92,11 @@ src_configure() { -DWITH_LIBPNG=$(usex png) -DXPDFWIDGET_PRINTING=$(usex cups) -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc" + # Bug 910166 + # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052 + # Likely fixed in 4.05 + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON ) cmake_src_configure } diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild b/app-text/xpdf/xpdf-4.04-r2.ebuild new file mode 100644 index 000000000000..11c66d17c05a --- /dev/null +++ b/app-text/xpdf/xpdf-4.04-r2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc +inherit cmake desktop verify-sig xdg + +DESCRIPTION="The PDF viewer and tools" +HOMEPAGE="https://www.xpdfreader.com" +SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz + i18n? ( + https://dl.xpdfreader.com/xpdf-arabic.tar.gz + https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz + https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz + https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz + https://dl.xpdfreader.com/xpdf-greek.tar.gz + https://dl.xpdfreader.com/xpdf-hebrew.tar.gz + https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz + https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz + https://dl.xpdfreader.com/xpdf-latin2.tar.gz + https://dl.xpdfreader.com/xpdf-thai.tar.gz + https://dl.xpdfreader.com/xpdf-turkish.tar.gz + ) + verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )" + +LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils" + +BDEPEND=" + icons? ( gnome-base/librsvg ) + verify-sig? ( sec-keys/openpgp-keys-xpdf ) +" +DEPEND=" + cups? ( + dev-qt/qtprintsupport:5[cups] + net-print/cups + ) + fontconfig? ( media-libs/fontconfig ) + libpaper? ( app-text/libpaper:= ) + utils? ( png? ( media-libs/libpng:0 ) ) + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-libs/freetype + sys-libs/zlib +" +RDEPEND="${DEPEND} + dev-qt/qtsvg:5 + media-fonts/urw-fonts +" + +PATCHES=( + "${FILESDIR}"/${PN}-automagic.patch + "${FILESDIR}"/${PN}-visibility.patch + "${FILESDIR}"/${PN}-shared-libs.patch + "${FILESDIR}"/${PN}-4.04-libpaper-2.patch + "${FILESDIR}"/${PN}-4.04-font-paths.patch +) + +DOCS=( ANNOUNCE CHANGES README ) + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig} + fi + default +} + +src_prepare() { + sed -i \ + "s|/usr/local/etc|${EPREFIX}/etc|; + s|/usr/local|${EPREFIX}/usr|" \ + doc/sample-xpdfrc || die + + if use i18n; then + sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die + fi + + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DA4_PAPER=$(usex metric) + -DNO_FONTCONFIG=$(usex fontconfig off on) + -DNO_TEXT_SELECT=$(usex textselect off on) + -DOPI_SUPPORT=$(usex opi) + -DSPLASH_CMYK=$(usex cmyk) + -DWITH_LIBPAPER=$(usex libpaper) + -DWITH_LIBPNG=$(usex png) + -DXPDFWIDGET_PRINTING=$(usex cups) + -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc" + # Bug 910166 + # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052 + # Likely fixed in 4.05 + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use icons; then + sizes="16 22 24 32 36 48 64 72 96 128 192 256 512" + cd xpdf-qt + mkdir $sizes + local i + for i in $sizes; do + rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png + done + fi +} + +src_install() { + cmake_src_install + + domenu "${FILESDIR}/xpdf.desktop" + newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg + if use icons; then + local i + for i in $sizes; do + doicon -s $i xpdf-qt/$i/xpdf.png + done + unset sizes + fi + + insinto /etc + newins doc/sample-xpdfrc xpdfrc + + local d i + if use utils; then + for d in "bin" "share/man/man1"; do + pushd "${ED}/usr/${d}" || die + for i in pdf*; do + mv "${i}" "x${i}" || die + done + popd || die + done + + einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions" + einfo "with other packages" + else + rm -rf "${ED}"/usr/bin/pdf* \ + "${ED}"/usr/share/man/man1/pdf* \ + "${ED}"/usr/$(get_libdir) || die + fi + + if use i18n; then + for i in arabic chinese-simplified chinese-traditional cyrillic greek \ + hebrew japanese korean latin2 thai turkish; do + insinto "/usr/share/xpdf/${i}" + doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \ + ! -name README ! -name add-to-xpdfrc || die) + + cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die + done + fi +} diff --git a/app-text/yamlfmt/Manifest b/app-text/yamlfmt/Manifest new file mode 100644 index 000000000000..da258b9b1422 --- /dev/null +++ b/app-text/yamlfmt/Manifest @@ -0,0 +1,2 @@ +DIST yamlfmt-0.12.1-deps.tar.xz 128404 BLAKE2B aa976bf73fb0a8094afc0ae480881aaff58c6263a57587ea6ceb22ce67776c424a7ed5d5fae6c38293f1ec5f3821de99e4bfd74f7951b826b2bb211914944c94 SHA512 11c9c45535ace449c3784a55707699923dcc2809db4f86a8fdb72b8b99443a92498b1c329cca40771d63414a6571bd4c590df4a304d798bb4c3709fd0edf0ef4 +DIST yamlfmt-0.12.1.tar.gz 40958 BLAKE2B 3a1187c2a21716a16e6c86ab145eed424bb3eb65ab8b0525c1ad221c27d8be3221f668f0393dcdc117bd4d34c9283bcc30e72ccddf99f61e44050c61e88b3026 SHA512 ac39234977d11751802a3a8c2e2140c16e408f987d29aa4ac8e7dd329067c1cef686b0950fa4e4478aeeb214506e7d3fe498734e584abcbc4f3aa48f9f1c7504 diff --git a/app-text/yamlfmt/metadata.xml b/app-text/yamlfmt/metadata.xml new file mode 100644 index 000000000000..d69deed03841 --- /dev/null +++ b/app-text/yamlfmt/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <upstream> + <remote-id type="github">google/yamlfmt</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/yamlfmt/yamlfmt-0.12.1.ebuild b/app-text/yamlfmt/yamlfmt-0.12.1.ebuild new file mode 100644 index 000000000000..5f85ed96ccb4 --- /dev/null +++ b/app-text/yamlfmt/yamlfmt-0.12.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +DESCRIPTION="An extensible command line tool or library to format yaml files" +HOMEPAGE="https://github.com/google/yamlfmt" +SRC_URI="https://github.com/google/yamlfmt/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0" +LICENSE+=" BSD MIT" +SLOT="0" +KEYWORDS="~amd64" + +src_compile() { + CGO_ENABLED=0 ego build -ldflags "-X main.version=${PV} -s -w" \ + -o yamlfmt ./cmd/yamlfmt +} + +src_install() { + dodoc -r README.md docs + dobin yamlfmt +} + +src_test() { + emake test +} diff --git a/app-text/yodl/yodl-4.03.00.ebuild b/app-text/yodl/yodl-4.03.00.ebuild index e82b0e00f1f2..2ff151fc083a 100644 --- a/app-text/yodl/yodl-4.03.00.ebuild +++ b/app-text/yodl/yodl-4.03.00.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="doc" BDEPEND=" - >=dev-util/icmake-8.00.00 + >=dev-build/icmake-8.00.00 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild index fa6f6f40d74b..c38af1169e7e 100644 --- a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild +++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git" EGIT_BRANCH="develop" else - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 arm ~riscv x86" SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz" fi diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest index e2061a022609..5de3781f22b8 100644 --- a/app-text/zathura-pdf-mupdf/Manifest +++ b/app-text/zathura-pdf-mupdf/Manifest @@ -1,3 +1,2 @@ -DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374 -DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1 DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060 +DIST zathura-pdf-mupdf-0.4.1.tar.gz 9346 BLAKE2B f1998acf00696fd40577f6e53b597258e519d3862c5b6b29bec292aaa732acf0b7a80ddf1b2f62d95d9462fe811a73cd912009106394bf1aadfa76be9c6d1adc SHA512 bf3360cdf6195af3cace4c769536a49f1cf2167c70a65b560410db1a0098119d726e73baeea98ca7100653c17248056c484fc436558e52a8dc12e7b83ce789b1 diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch deleted file mode 100644 index 9c4de3d0fe9a..000000000000 --- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/835592 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3') - glib = dependency('glib-2.0') - cairo = dependency('cairo') - mupdf = dependency('mupdf', required: false) --mupdfthird = cc.find_library('mupdf-third') - - build_dependencies = [ - zathura, -@@ -32,10 +31,10 @@ build_dependencies = [ - if not mupdf.found() - # normal build of mupdf - mupdf = cc.find_library('mupdf') -- build_dependencies += [mupdf, mupdfthird] -+ build_dependencies += [mupdf] - else - # build from Debian's libmupdf-dev -- build_dependencies += [mupdf, mupdfthird] -+ build_dependencies += [mupdf] - - libjpeg = dependency('libjpeg') - libjbig2dec = cc.find_library('jbig2dec') diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild deleted file mode 100644 index 22828fa1fcc3..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git" - EGIT_BRANCH="develop" -else - KEYWORDS="amd64 arm x86" - SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz" -fi - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" - -LICENSE="ZLIB" -SLOT="0" - -DEPEND=">=app-text/mupdf-1.20.0:= - >=app-text/zathura-0.3.9 - dev-libs/girara - dev-libs/glib:2 - x11-libs/cairo" - -RDEPEND="${DEPEND}" - -BDEPEND="app-text/tesseract - dev-lang/mujs - media-libs/leptonica - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch" -) diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild index e7aecbc89e4e..94db4774090d 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,20 +19,28 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" LICENSE="ZLIB" SLOT="0" +IUSE="+javascript" -DEPEND="~app-text/mupdf-1.19.1:= - >=app-text/zathura-0.3.9 +DEPEND=" + >=app-text/mupdf-1.20.0:=[javascript?] + >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2 - x11-libs/cairo" + x11-libs/cairo +" RDEPEND="${DEPEND}" -BDEPEND="app-text/tesseract - dev-lang/mujs - media-libs/leptonica - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch" + "${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch" +) + +src_prepare() ( + default + + if ! use javascript ; then + sed -i -e '/mujs/d' meson.build || die + fi ) diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest index 69f7f3868f5a..0436d6b968a0 100644 --- a/app-text/zathura-pdf-poppler/Manifest +++ b/app-text/zathura-pdf-poppler/Manifest @@ -1,2 +1,2 @@ -DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85 DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34 +DIST zathura-pdf-poppler-0.3.2.tar.gz 10623 BLAKE2B 985ce9664b74d798c6a5c858a79e9e3a6e82d837818f52e4115e622395ee39e765c356740c099a7f376517c3af81fb9335188950719930b9a902542fccd475e7 SHA512 5e6d748f9dfcc9e318ee7947d3a4d9acbbb30d6b45810a7c2fd2d0572d98872f5d594add8683b6579791fb82846a3d7854e84239ac5167c0541e700518a31043 diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml index 61d86c13239b..35a79df28eb8 100644 --- a/app-text/zathura-pdf-poppler/metadata.xml +++ b/app-text/zathura-pdf-poppler/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer status="active"> <email>mlq@pwmt.org</email> @@ -14,9 +11,9 @@ <email>sebastian+dev@ramacher.at</email> <name>Sebastian Ramacher</name> </maintainer> - <changelog>http://pwmt.org/projects/zathura/download/</changelog> - <doc lang="en">http://pwmt.org/projects/zathura/</doc> - <bugs-to>http://bugs.pwmt.org/</bugs-to> + <changelog>https://pwmt.org/projects/zathura/download/</changelog> + <bugs-to>https://git.pwmt.org/groups/pwmt/-/issues</bugs-to> + <doc lang="en">https://pwmt.org/projects/zathura/</doc> <remote-id type="github">pwmt/zathura-pdf-poppler</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild index 226fc00f03c9..285a4b6a6533 100644 --- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild +++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild @@ -21,7 +21,7 @@ LICENSE="ZLIB" SLOT="0" DEPEND="app-text/poppler[cairo] - >=app-text/zathura-0.3.9:= + >=app-text/zathura-0.5.2:= dev-libs/girara dev-libs/glib:2" diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild index 6bcc5341d270..4c9b1c46bdfe 100644 --- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild +++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg-utils @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git" EGIT_BRANCH="develop" else - KEYWORDS="amd64 arm ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz" fi @@ -20,8 +20,8 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler" LICENSE="ZLIB" SLOT="0" -DEPEND="app-text/poppler[cairo] - >=app-text/zathura-0.3.9 +DEPEND=">=app-text/poppler-21.12.0:=[cairo] + >=app-text/zathura-0.5.3:= dev-libs/girara dev-libs/glib:2" diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild index cda9cd6aa073..cb0233ebcd83 100644 --- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild +++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg-utils @@ -20,8 +20,8 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler" LICENSE="ZLIB" SLOT="0" -DEPEND="app-text/poppler[cairo] - >=app-text/zathura-0.3.9:= +DEPEND=">=app-text/poppler-21.12.0:=[cairo] + >=app-text/zathura-0.5.3:= dev-libs/girara dev-libs/glib:2" diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index 0ae0b91f44e5..97caafbb2f92 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1,3 +1,4 @@ -DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10 DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f +DIST zathura-0.5.4-manpages.tar.xz 10060 BLAKE2B 103d2b5ed4ab71bc096305e70addbf94f11539cc989fc867766a1366ec18ca30379ce8f5b9f2b4a4a67507f79bbf6c6136c46f47161d1b74457c04488aa3dcea SHA512 a8251740a8e24e1c37093bec58b0169f04bd318878d743c72f07505a722c58da4f84a2dad5d46ded7789e1b4c5f2a7bab9cc6d023cd0935e49fe4388c9c28bd9 +DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5c2d86b7e2b9e67c2d1cde92e9972aa18583930d3af3bc7d9c2afe367221ed3c2141fee682cc7ea54aae603ec4 SHA512 16f7291c3742cffe9ba5c6a3137781b2dd0b0bfcd61747e45a3c4b14df97781b49d526a298d2be9f564c84e616f1adef2ff4f5442d539fd42ab5e862baa00922 diff --git a/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch new file mode 100644 index 000000000000..7658f3f6f417 --- /dev/null +++ b/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch @@ -0,0 +1,22 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 1b2e81a..b2b7565 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -45,17 +45,5 @@ if check.found() + args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', session], + timeout: 60*60 + ) +- +- if seccomp.found() +- sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'], +- dependencies: build_dependencies + test_dependencies, +- include_directories: include_directories, +- c_args: defines + flags +- ) +- test('sandbox', xvfb, +- args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', sandbox], +- timeout: 60*60 +- ) +- endif + endif + endif diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml index 63a71a9577e8..2619e14a2244 100644 --- a/app-text/zathura/metadata.xml +++ b/app-text/zathura/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <maintainer type="person" proxied="yes"> + <email>turret@turret.cyou</email> + <name>Mason Rocha</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="synctex">Use libsynctex to get latex codeline from pdf</flag> @@ -17,9 +21,8 @@ <email>sebastian+dev@ramacher.at</email> <name>Sebastian Ramacher</name> </maintainer> - <changelog>http://pwmt.org/projects/zathura/download/</changelog> - <doc lang="en">http://pwmt.org/projects/zathura/</doc> - <bugs-to>http://bugs.pwmt.org/</bugs-to> + <changelog>https://pwmt.org/projects/zathura/download/</changelog> + <doc lang="en">https://pwmt.org/projects/zathura/</doc> <remote-id type="github">pwmt/zathura</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild index 249ff0cbb654..bf8c8261af3f 100644 --- a/app-text/zathura/zathura-0.5.2-r4.ebuild +++ b/app-text/zathura/zathura-0.5.2-r4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI=" https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-manpages.tar.xz + https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz " KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux" fi diff --git a/app-text/zathura/zathura-0.4.9.ebuild b/app-text/zathura/zathura-0.5.2-r5.ebuild index 907d082c8c17..1ad4fe4776d4 100644 --- a/app-text/zathura/zathura-0.4.9.ebuild +++ b/app-text/zathura/zathura-0.5.2-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson virtualx xdg @@ -13,38 +13,48 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" EGIT_BRANCH="develop" else - SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux" + SRC_URI=" + https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz + " + KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="ZLIB" -SLOT="0" -IUSE="doc +magic seccomp sqlite synctex test" +SLOT="0/$(ver_cut 1-2)" +IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=">=dev-libs/girara-0.3.7 +DEPEND=" + >=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 + sys-apps/file >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 - magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - + synctex? ( app-text/texlive-core ) +" RDEPEND="${DEPEND}" +BDEPEND=" + test? ( + dev-libs/appstream-glib + dev-libs/check + x11-base/xorg-server[xvfb] + ) + virtual/pkgconfig +" -BDEPEND="doc? ( dev-python/sphinx ) - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/zathura-disable-seccomp-tests.patch +) src_configure() { local emesonargs=( -Dconvert-icon=disabled - -Dmagic=$(usex magic enabled disabled) - -Dmanpages=$(usex doc enabled disabled) + -Dmanpages=disabled -Dseccomp=$(usex seccomp enabled disabled) -Dsqlite=$(usex sqlite enabled disabled) -Dsynctex=$(usex synctex enabled disabled) @@ -55,3 +65,8 @@ src_configure() { src_test() { virtx meson_src_test } + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +} diff --git a/app-text/zathura/zathura-0.5.4.ebuild b/app-text/zathura/zathura-0.5.4.ebuild new file mode 100644 index 000000000000..9e1fb2b8e42f --- /dev/null +++ b/app-text/zathura/zathura-0.5.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson virtualx xdg + +DESCRIPTION="A highly customizable and functional document viewer" +HOMEPAGE="https://pwmt.org/projects/zathura/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI=" + https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz + " + KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="ZLIB" +SLOT="0/5.6" +IUSE="seccomp sqlite synctex test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/girara-0.4.1 + >=dev-libs/glib-2.50:2 + dev-libs/json-glib + sys-apps/file + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + seccomp? ( sys-libs/libseccomp ) + sqlite? ( >=dev-db/sqlite-3.6.23:3 ) + synctex? ( app-text/texlive-core ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/check + >=x11-libs/gtk+-3.22:3[X] + ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-disable-seccomp-tests.patch +) + +src_configure() { + local emesonargs=( + -Dconvert-icon=disabled + -Dmanpages=disabled + -Dseccomp=$(usex seccomp enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsynctex=$(usex synctex enabled disabled) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +} diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index 871f9948e8f7..3cf03fc8f6e7 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson virtualx xdg @@ -13,41 +13,50 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" EGIT_BRANCH="develop" else - SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz + " KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="ZLIB" -SLOT="0/$(ver_cut 1-2)" +SLOT="0/5.6" IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=">=dev-libs/girara-0.3.7 +RDEPEND=" + >=dev-libs/girara-0.4.1 >=dev-libs/glib-2.50:2 - >=sys-devel/gettext-0.19.8 + dev-libs/json-glib + sys-apps/file x11-libs/cairo >=x11-libs/gtk+-3.22:3 - sys-apps/file seccomp? ( sys-libs/libseccomp ) - sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - -RDEPEND="${DEPEND}" - -BDEPEND="dev-python/sphinx - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" + sqlite? ( >=dev-db/sqlite-3.6.23:3 ) + synctex? ( app-text/texlive-core ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/check + >=x11-libs/gtk+-3.22:3[X] + ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" PATCHES=( - "${FILESDIR}"/zathura-disable-seccomp-tests.patch + "${FILESDIR}/zathura-0.5.4-disable-seccomp-tests.patch" ) src_configure() { local emesonargs=( -Dconvert-icon=disabled - -Dmanpages=enabled + -Dmanpages=disabled -Dseccomp=$(usex seccomp enabled disabled) -Dsqlite=$(usex sqlite enabled disabled) -Dsynctex=$(usex synctex enabled disabled) @@ -58,3 +67,8 @@ src_configure() { src_test() { virtx meson_src_test } + +src_install() { + meson_src_install + [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura* +} diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest new file mode 100644 index 000000000000..ff4a3054c4af --- /dev/null +++ b/app-text/zeal/Manifest @@ -0,0 +1 @@ +DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d diff --git a/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch b/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch new file mode 100644 index 000000000000..977412c47339 --- /dev/null +++ b/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch @@ -0,0 +1,26 @@ +From 3d499c8391e36b7fb1780815d04e533f26333145 Mon Sep 17 00:00:00 2001 +From: Henning Schild <henning@hennsch.de> +Date: Sat, 9 Mar 2019 10:29:54 +0100 +Subject: [PATCH 2/2] settings: disable checking for updates by default + +Signed-off-by: Henning Schild <henning@hennsch.de> +--- + src/libs/core/settings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp +index 8922bc4..549ddff 100644 +--- a/src/libs/core/settings.cpp ++++ b/src/libs/core/settings.cpp +@@ -72,7 +72,7 @@ void Settings::load() + + // TODO: Put everything in groups + startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool(); +- checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool(); ++ checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool(); + + showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool(); + minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool(); +-- +2.19.2 + diff --git a/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch b/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch new file mode 100644 index 000000000000..0a5a8f69be2d --- /dev/null +++ b/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch @@ -0,0 +1,25 @@ +From b48ee895ce7fc1db1dce20dac5115ec4c60f75fa Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 18 Aug 2020 15:03:59 +0200 +Subject: [PATCH] sidebar: Add missing STATIC keyword (similar to #1085) + +Fixes unresolved soname dependency after install. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/libs/sidebar/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libs/sidebar/CMakeLists.txt b/src/libs/sidebar/CMakeLists.txt +index 4332b8f..dc6be0e 100644 +--- a/src/libs/sidebar/CMakeLists.txt ++++ b/src/libs/sidebar/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(Sidebar ++add_library(Sidebar STATIC + container.cpp + proxyview.cpp + view.cpp +-- +2.28.0 + diff --git a/app-text/zeal/metadata.xml b/app-text/zeal/metadata.xml new file mode 100644 index 000000000000..af3ff4b585c0 --- /dev/null +++ b/app-text/zeal/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!--maintainer-needed--> + <upstream> + <remote-id type="github">zealdocs/zeal</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild b/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild new file mode 100644 index 000000000000..674a37e1858e --- /dev/null +++ b/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COMMIT=994cc5f6b6bfffddd5faaaafdb4fed483c38188f +inherit cmake xdg-utils + +DESCRIPTION="Offline documentation browser inspired by Dash" +HOMEPAGE="https://zealdocs.org/" +SRC_URI="https://github.com/zealdocs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + app-arch/libarchive:= + dev-db/sqlite:3 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libxcb:= + >=x11-libs/xcb-util-keysyms-0.3.9 +" +RDEPEND="${DEPEND} + x11-themes/hicolor-icon-theme +" +BDEPEND="kde-frameworks/extra-cmake-modules:0" + +PATCHES=( + "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch" + "${FILESDIR}/${P}-fix-sidebar-static-lib.patch" +) + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest index d8a9adb37557..c0fb797ec0bf 100644 --- a/app-text/zotero-bin/Manifest +++ b/app-text/zotero-bin/Manifest @@ -1,4 +1,6 @@ -DIST zotero-bin-6.0.22-amd64.tar.bz2 69278351 BLAKE2B 9f401ad27751fdb1cf8a156abae467c9a4e98214d816431103bf722d8c509e19593eb041af3d4cb516a26c6f6c7d9428609494a0daac302262ed0f32d10a515a SHA512 0de268da38b2b597a19a0bfceeca2e712b9b909f5210bac4fced76a3d84f7ede5028d441c3b4f48fc9eeb53bea003005e25056cabfa57b47449c6db74a04291c -DIST zotero-bin-6.0.22-x86.tar.bz2 70934510 BLAKE2B b361b8a99616a7306e6de754871cc03141944fcdf30e76ce8ce5020d3e19efe066d2c093d96a190081f27728110d44168b2f87e80a3eb5c9bdac941d1708b391 SHA512 c0925a5163eb6aef6173a465598580c5c25a784a7bfcc288623ff35d3202255f4af40750e675c5c526929ecb3cfa4886707390d978580c2ed36aa2f02d195162 -DIST zotero-bin-6.0.23-amd64.tar.bz2 69289934 BLAKE2B a002cda6337c0e1145628abb277461bbb7efdb1d13f82ef24c60a44a6fb0b5231b6ef6b990b7a745ed018c8adefe38f62a9ccc3cbb8d03d28670a07e0a60e02e SHA512 4120ce16f00a81c6eb3037863f144fba8093bf5b261b6b5ec94f2e874eb4fdf3d08dc0df5607f8933f2e2257cd217364332f8a4366ea21ecce744dc4cace7a45 -DIST zotero-bin-6.0.23-x86.tar.bz2 70947747 BLAKE2B 47c5ff05ae41fbc1e75649a84af718dcac1cab65b1131529c903be29be9415e799d9465569901730bd55008d1e12502527fbb2c424ff9d386f5edb07c99bcbd7 SHA512 6e7d339f7ea56862fe0ba9501a4c3f671991d8e93e88c1e41d41141ad7e35ddf785ec4c4000267925f9276cab8c9e6dcfb92dcff19eec56a69e44ef1964d2c28 +DIST zotero-bin-6.0.27-amd64.tar.bz2 69342785 BLAKE2B 0c324253d0f6b4385c54979f6806ee964fe4e349cbd18d5b67d93a68e6b4b0214ac52e29a2a30a3a301f300023fb980dc2386d827cec6d0aca2de08f0fd50d37 SHA512 558154c0458a6d820af62dbedd70dba99150a7e4a612685579c03efffe41338fe9606099ddffcc33ce29141754621b6ef547de470fdbfc8ebcffc179c7f11a40 +DIST zotero-bin-6.0.27-x86.tar.bz2 71001470 BLAKE2B b79488085f4ec646a94b8083c7556a7b8086d7e0f8a76349640f857b1df0ef6ad8856b5b614fdadfef04f3f66eedbe93095e2b49545abd8f62cb32139a7dc9b1 SHA512 7ee3d746d08980638402391f275094be545e7aaf6e5713d9dee4dddd921aace177cd29ee4e2965d39805d5ddcfbb3d68c025fae4a612fa23337104429dec467d +DIST zotero-bin-6.0.30-amd64.tar.bz2 69463179 BLAKE2B e853e51ca11ef1a0f026819010773753030198f15b67ea1247ea5d8329442118e53d4ab4a213f32fd1fc9f6c4c94ea0f9aaff4fcaec1005c493b64b890b5ca38 SHA512 3ad9757a038b433221c26d3a27b4a5f3ece7e481c021ca936187ea491426b3e7e4a57b17b5ea712d3e453c244e62fa1eecc6de70ac9e1d54847637642f695ddf +DIST zotero-bin-6.0.30-x86.tar.bz2 71098560 BLAKE2B bc0914c3bddc171207d27b94c35dcc031b85dcd2d177fe63c4415f372366674f1cbc9136721402db3fd4a74954c63ee41b4a77009b2260b8ecbf0bd145a80706 SHA512 2148ef94e1bb64c83b05212f19e3ee230a57c9298f4d05bc09dd34979c4b607fb49831e391aea247a32aae7673278204ef5eefbef9fe26d8a6beed7c98532a72 +DIST zotero-bin-6.0.35-amd64.tar.bz2 69475661 BLAKE2B d66ab95e8cfc954da76e74acf8936785460f8de0a4e204c761b0c32ca42fe1d71051f509f68fe0609751c670c598f74f4567c097b2ce89f0a3ebf3663833bc02 SHA512 f74574ecddba45c15f4cb61015969af0bdbc594e8f7f7707d6e5d6f6f74dca839b1f71cada2f5c66b530da28719a832ed0cc93c0684e948e17591a46fde50297 +DIST zotero-bin-6.0.35-x86.tar.bz2 71115051 BLAKE2B fb756681f6eca8dc45fb9eb44b5a1f0ca69138984cc4c8900d5b03ab4d637bea4d6e63bd6804d83e2aeef0209c4304202c1a0f2cc08c6f94dfcc62ca7152fa53 SHA512 93b11b8357dbb969e859938c604d109ae14b2a10d2bbe5d8096c0bd0cd3a89c65a64cc00d2b9fbff0339e8d2e0d4920701884965baae5bf29e9742049fb4703d diff --git a/app-text/zotero-bin/zotero-bin-6.0.22.ebuild b/app-text/zotero-bin/zotero-bin-6.0.27.ebuild index 07c557e6c051..07c557e6c051 100644 --- a/app-text/zotero-bin/zotero-bin-6.0.22.ebuild +++ b/app-text/zotero-bin/zotero-bin-6.0.27.ebuild diff --git a/app-text/zotero-bin/zotero-bin-6.0.23.ebuild b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild index 07c557e6c051..07c557e6c051 100644 --- a/app-text/zotero-bin/zotero-bin-6.0.23.ebuild +++ b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild diff --git a/app-text/zotero-bin/zotero-bin-6.0.35.ebuild b/app-text/zotero-bin/zotero-bin-6.0.35.ebuild new file mode 100644 index 000000000000..85c6ac8300be --- /dev/null +++ b/app-text/zotero-bin/zotero-bin-6.0.35.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="Helps you collect, organize, cite, and share your research sources" +HOMEPAGE="https://www.zotero.org" +SRC_URI=" + amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 ) + x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 ) +" +S="${WORKDIR}" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +RDEPEND=" + app-accessibility/at-spi2-core + dev-libs/dbus-glib + dev-libs/glib + dev-libs/nspr + dev-libs/nss + media-libs/fontconfig + media-libs/freetype + sys-apps/dbus + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXt + x11-libs/pango +" + +QA_PREBUILT="opt/zotero/*" + +src_prepare() { + if use amd64; then + cd Zotero_linux-x86_64 || die + elif use x86; then + cd Zotero_linux-i686 || die + fi + + # disable auto-update + sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die + + # disable default oo installation questions - manual installation is still possible + sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \ + extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die + + # fix desktop-file + sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die + sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die + + default +} + +src_install() { + if use amd64; then + cd Zotero_linux-x86_64 || die + elif use x86; then + cd Zotero_linux-i686 || die + fi + + dodir opt/zotero + cp -a * "${ED}/opt/zotero" || die + + dosym ../../opt/zotero/zotero usr/bin/zotero + + domenu zotero.desktop + + for size in 16 32 48 256; do + newicon -s ${size} chrome/icons/default/default${size}.png zotero.png + done +} |