diff options
Diffstat (limited to 'app-text')
1135 files changed, 25762 insertions, 14563 deletions
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild new file mode 100644 index 000000000000..3b98813d5a1e --- /dev/null +++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_AUTHOR="SHLOMIF" +DIST_VERSION="0.1003" +inherit perl-module + +DESCRIPTION="A Perl-based tool to Render DocBook/XML" +HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86" + +RDEPEND="dev-perl/Class-XSAccessor + virtual/perl-Getopt-Long + virtual/perl-File-Path + dev-perl/Path-Tiny + dev-perl/Test-Trap" +BDEPEND="dev-perl/Module-Build + test? ( + virtual/perl-File-Spec + )" diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest new file mode 100644 index 000000000000..849539845897 --- /dev/null +++ b/app-text/App-XML-DocBook-Builder/Manifest @@ -0,0 +1 @@ +DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb diff --git a/app-text/App-XML-DocBook-Builder/metadata.xml b/app-text/App-XML-DocBook-Builder/metadata.xml new file mode 100644 index 000000000000..0fb423f06844 --- /dev/null +++ b/app-text/App-XML-DocBook-Builder/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="project"> + <email>games@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>perl@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">shlomif/docmake</remote-id> + </upstream> +</pkgmetadata> 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/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest deleted file mode 100644 index 509e1b8e5563..000000000000 --- a/app-text/XML-Schema-learner/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild deleted file mode 100644 index c876bebfd7d5..000000000000 --- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs" -HOMEPAGE="https://github.com/kore/XML-Schema-learner" -SRC_URI="https://github.com/kore/XML-Schema-learner/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -# This test suite used to work but needs an update for modern versions -# of PHPUnit. See https://github.com/kore/XML-Schema-learner/issues/6 -RESTRICT="test" - -# PHP dependency can be inferred from .travis.yml in the repository. -# The necessary USE flags on the other hand were found the hard way. -# -# The dependencies here aren't as expressive as they should be. What we -# really want is for php[...] to apply to everything in PHP_TARGETS, and -# for those interpreters (the ones in PHP_TARGETS) to be used to run the -# test suite. -# -# See bug #497606. -# -RDEPEND="dev-lang/php:*[cli,xml,xmlreader]" -DEPEND="test? ( ${RDEPEND} - dev-php/phpunit )" - -src_compile() { - # Don't run make, the default target is 'check'. - : -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - dodoc README.rst -} diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml deleted file mode 100644 index 4dcf546c3a51..000000000000 --- a/app-text/XML-Schema-learner/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mjo@gentoo.org</email> - </maintainer> - <longdescription> - This software implements various state-of-the-art algorithms for - algorithmic learning of XML Schema definitions and Document Type - Definitions. - - Given a set or a single XML instance it can algorithmically infer - a schema which describes the XML instances. The resulting schemas - are of high-quality and human readable. - - The theory behind the project is described in Kore Nordmann's - thesis, "Algorithmic learning of XML Schema definitions from XML - data," available at - http://kore-nordmann.de/talks/11_03_learning_xml_schema_definitions_from_xml_data.pdf. - </longdescription> - <upstream> - <remote-id type="github">kore/XML-Schema-learner</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest index a77cfa5fe179..1038254cb39a 100644 --- a/app-text/a2ps/Manifest +++ b/app-text/a2ps/Manifest @@ -1,2 +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.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-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild deleted file mode 100644 index ffcce4cd01eb..000000000000 --- a/app-text/a2ps/a2ps-4.14-r6.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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 )" - -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 userland_BSD userland_GNU vanilla" - -RESTRICT=test - -RDEPEND="app-text/ghostscript-gpl - app-text/libpaper - >=app-text/psutils-1.17 - app-text/wdiff - emacs? ( >=app-editors/emacs-23.1:* ) - latex? ( virtual/latex-base ) - nls? ( virtual/libintl ) - userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )" -DEPEND="${RDEPEND} - >=dev-util/gperf-2.7.2 - virtual/yacc - nls? ( sys-devel/gettext )" - -SITEFILE=50${PN}-gentoo.el - -S=${WORKDIR}/${PN}-${PV:0:4} - -src_prepare() { - default - - eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff - use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff - 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 fnmatch replacement, bug #134546 - eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch - - # bug #122026 - eapply "${FILESDIR}"/${P}-psset.patch - - # fix emacs printing, bug #114627 - eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch - - # fix chmod error, #167670 - eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch - - # add configure check for mempcpy, bug 216588 - eapply "${FILESDIR}"/${P}-check-mempcpy.patch - - # fix compilation error due to invalid stpcpy() prototype, bug 216588 - eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch - - # fix compilation error due to obstack.h issue, bug 269638 - eapply "${FILESDIR}"/${P}-ptrdiff_t.patch - - # fix compilation error due to texinfo 5.x, bug 482748 - eapply "${FILESDIR}"/${P}-texinfo-5.x.patch - - # fix CVE-2014-0466, bug 506352 - eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch - - # fix CVE-2001-1593, bug 507024 - eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch - - # specify encoding explicitly, bug #695918 - eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch - - # 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 - - local myconf="COM_netscape=no COM_acroread=no" - - use emacs || myconf="${myconf} EMACS=no" - use latex || myconf="${myconf} COM_latex=no" - - export LANG=C LC_ALL=C - - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - --sysconfdir="${EPREFIX}"/etc/a2ps \ - $(use_enable nls) \ - ${myconf} -} - -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 - - if use emacs; then - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - 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.6.ebuild b/app-text/a2ps/a2ps-4.15.6.ebuild new file mode 100644 index 000000000000..f9ae315b9f23 --- /dev/null +++ b/app-text/a2ps/a2ps-4.15.6.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 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" + +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 + + 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 + + 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} +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} 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 e0c61124e9df..000000000000 --- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint ---- 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.13-stdout.diff b/app-text/a2ps/files/a2ps-4.13-stdout.diff deleted file mode 100644 index 1e40e618fcbd..000000000000 --- a/app-text/a2ps/files/a2ps-4.13-stdout.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/printers.c.orig Tue Oct 12 00:01:59 1999 -+++ lib/printers.c Wed May 2 11:23:25 2001 -@@ -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.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch deleted file mode 100644 index f1cd5d9ebdfc..000000000000 --- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 c49ab78c93c0..000000000000 --- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c ---- 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 7b820cead05f..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch deleted file mode 100644 index 7c3c69076ae9..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch +++ /dev/null @@ -1,17 +0,0 @@ -=== modified file 'lib/xstrrpl.c' ---- lib/xstrrpl.c 2008-04-14 18:04:50 +0000 -+++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000 -@@ -20,12 +20,10 @@ - - #include "system.h" - #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", ""}} - */ - char * - 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 291c3aac4fa4..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-psset.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in ---- 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 00d955a819a9..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h ---- 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-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch deleted file mode 100644 index 44cd4bfd099d..000000000000 --- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch +++ /dev/null @@ -1,147 +0,0 @@ ---- 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/a2ps/files/a2ps-4.15-stdout.patch b/app-text/a2ps/files/a2ps-4.15-stdout.patch new file mode 100644 index 000000000000..00002ffb9524 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.15-stdout.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/47691 +https://bugs.gentoo.org/47764 +https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html +--- a/liba2ps/printers.c ++++ b/liba2ps/printers.c +@@ -287,8 +287,8 @@ a2ps_printers_new (struct a2ps_common_s * common) + 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/metadata.xml b/app-text/a2ps/metadata.xml index 834aba280f85..d22cb76bd2a2 100644 --- a/app-text/a2ps/metadata.xml +++ b/app-text/a2ps/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>printing@gentoo.org</email> - <name>Gentoo Printing Project</name> -</maintainer> -<maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> + <maintainer type="project"> + <email>printing@gentoo.org</email> + <name>Gentoo Printing Project</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="savannah">a2ps</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest deleted file mode 100644 index a20420053169..000000000000 --- a/app-text/agrep/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST agrep-2.04.tar.Z 62351 BLAKE2B 7856c172aff84d188cc38e83fc8eece63f66cb30a8a1753ec5f54d98fbc47a33d9caad69520c531c66f2958c762f26312032ee7a9e4e4040709f4d366fdbf4a9 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild deleted file mode 100644 index 522dc26f746a..000000000000 --- a/app-text/agrep/agrep-2.04-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A tool for the fast searching of text allowing for errors in the search pattern" -HOMEPAGE="ftp://ftp.cs.arizona.edu/agrep/README" -SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z" - -LICENSE="AGREP" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris" - -RDEPEND=" - !dev-libs/tre - !dev-ruby/amatch - !app-misc/glimpse" - -DOCS=( README agrep.algorithms agrep.chronicle COPYRIGHT contribution.list ) - -src_compile() { - sed -i \ - -e 's/^CFLAGS.*//' \ - -e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile || die - tc-export CC - emake -} - -src_install() { - dobin "${PN}" - doman "${PN}.1" - einstalldocs -} diff --git a/app-text/aha/Manifest b/app-text/aha/Manifest new file mode 100644 index 000000000000..35f1276e19ca --- /dev/null +++ b/app-text/aha/Manifest @@ -0,0 +1 @@ +DIST aha-0.5.1.tar.gz 394410 BLAKE2B 7276219068a8e496b41a953f4cdfc130b85778b44d194fedb63b0f0d921db0efcf0f62fae52ec580ac1462e3b03edd6ad97dab7d7ff2c138ef300824efbad111 SHA512 0eb88e681208c0956e344d6574f9d7ba155d38bfb386d0a9f17022c5e925fb16d0efb6aa04804191b4cac1697a87a0f16ba51bcd97b6135cc7606046eaf89288 diff --git a/app-text/aha/aha-0.5.1.ebuild b/app-text/aha/aha-0.5.1.ebuild new file mode 100644 index 000000000000..eb4dbc60933e --- /dev/null +++ b/app-text/aha/aha-0.5.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Converts ANSI escape sequences of a unix terminal to HTML code" +HOMEPAGE="https://github.com/theZiz/aha" +SRC_URI="https://github.com/theZiz/aha/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2+ MPL-1.1" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}/${P}-null-ptr-dereference-fix.patch" +) + +src_install() { + emake PREFIX="${D}/usr" install +} diff --git a/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch b/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch new file mode 100644 index 000000000000..6ec2ca9cae1d --- /dev/null +++ b/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch @@ -0,0 +1,105 @@ +diff --git a/aha.c b/aha.c +index 46e43c0..2bfebb7 100644 +--- a/aha.c ++++ b/aha.c +@@ -138,6 +138,15 @@ pelem parseInsert(char* s) + return firstelem; + } + ++int parseDepthAtLeast(pelem elem, unsigned int wanted) { ++ while (elem != NULL) { ++ if (wanted == 0) return 1; ++ elem = elem->next; ++ --wanted; ++ } ++ return 0; ++} ++ + void deleteParse(pelem elem) + { + while (elem!=NULL) +@@ -831,27 +840,20 @@ int main(int argc,char* args[]) + } + else + if (momelem->value == 38 && +- momelem->next && +- momelem->next->value == 2 && +- momelem->next->next)// 38;2;<n> -> 24 Bit ++ parseDepthAtLeast(momelem, 4) && ++ momelem->next->value == 2)// 38;2;<r>;<g>;<b> -> 24 Bit + { +- momelem = momelem->next->next; +- pelem r,g,b; +- r = momelem; +- momelem = momelem->next; +- g = momelem; +- if ( momelem ) +- momelem = momelem->next; +- b = momelem; +- if ( r && g && b ) +- { +- state.highlighted = 0; +- state.fc_colormode = MODE_24BIT; +- *dest = +- (r->value & 255) * 65536 + +- (g->value & 255) * 256 + +- (b->value & 255); +- } ++ pelem r = momelem->next->next; ++ pelem g = r->next; ++ pelem b = g->next; ++ momelem = b; ++ ++ state.highlighted = 0; ++ state.fc_colormode = MODE_24BIT; ++ *dest = ++ (r->value & 255) * 65536 + ++ (g->value & 255) * 256 + ++ (b->value & 255); + } + else + { +@@ -899,27 +901,20 @@ int main(int argc,char* args[]) + } + else + if (momelem->value == 48 && +- momelem->next && +- momelem->next->value == 2 && +- momelem->next->next)// 48;2;<n> -> 24 Bit ++ parseDepthAtLeast(momelem, 4) && ++ momelem->next->value == 2)// 48;2;<r>;<g>;<b> -> 24 Bit + { +- momelem = momelem->next->next; +- pelem r,g,b; +- r = momelem; +- momelem = momelem->next; +- g = momelem; +- if ( momelem ) +- momelem = momelem->next; +- b = momelem; +- if ( r && g && b ) +- { +- state.bc_colormode = MODE_24BIT; +- state.highlighted = 0; +- *dest = +- (r->value & 255) * 65536 + +- (g->value & 255) * 256 + +- (b->value & 255); +- } ++ pelem r = momelem->next->next; ++ pelem g = r->next; ++ pelem b = g->next; ++ momelem = b; ++ ++ state.bc_colormode = MODE_24BIT; ++ state.highlighted = 0; ++ *dest = ++ (r->value & 255) * 65536 + ++ (g->value & 255) * 256 + ++ (b->value & 255); + } + else + { +-- +2.35.1 + diff --git a/app-text/aha/metadata.xml b/app-text/aha/metadata.xml new file mode 100644 index 000000000000..16118a3d4fa8 --- /dev/null +++ b/app-text/aha/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + aha (ANSI HTML Adapter) converts ANSI colors to HTML, e.g. if you want + to publish the output of ls --color=yes, git diff, ccal or htop as + static HTML somewhere. + </longdescription> + <upstream> + <remote-id type="github">theZiz/aha</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild index 0062ee0b9a9e..d6e4f426d698 100644 --- a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild +++ b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild @@ -1,19 +1,19 @@ -# 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 flag-o-matic libtool +inherit autotools flag-o-matic -DESCRIPTION="A thesaurus lib, tool and database" +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" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="gtk" RDEPEND="gtk? ( x11-libs/gtk+:2 )" @@ -24,13 +24,17 @@ PATCHES=( "${WORKDIR}"/patches/${P}-gcc43.patch "${WORKDIR}"/patches/${P}-format-security.patch "${WORKDIR}"/patches/${P}-c++17.patch + "${FILESDIR}"/aiksaurus-1.2.1-autoconf.patch ) src_prepare() { default + # Needed to make relink work on FreeBSD, without it won't install. # Also needed for a sane .so versionning there. - elibtoolize + #elibtoolize + # Clang 16 + eautoreconf } src_configure() { diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild deleted file mode 100644 index b0454f1c5135..000000000000 --- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic libtool - -DESCRIPTION="A thesaurus lib, tool and database" -HOMEPAGE="https://sourceforge.net/projects/aiksaurus" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="gtk" - -RDEPEND="gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - gtk? ( virtual/pkgconfig )" - -PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) - -src_prepare() { - default - # Needed to make relink work on FreeBSD, without it won't install. - # Also needed for a sane .so versionning there. - elibtoolize -} - -src_configure() { - filter-flags -fno-exceptions - econf $(use_with gtk) -} diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch new file mode 100644 index 000000000000..2821709e7784 --- /dev/null +++ b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch @@ -0,0 +1,13 @@ +https://sources.debian.org/patches/aiksaurus/1.2.1%2Bdev-0.12-7/01-changes-from-pristine-tarball.patch/ +--- a/configure.ac ++++ b/configure.ac +@@ -50,6 +50,9 @@ AC_SUBST(LT_RELEASE) + LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE` + LT_REVISION=$AIK_INTERFACE_AGE + LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE` ++m4_pattern_allow([LT_CURRENT]) ++m4_pattern_allow([LT_REVISION]) ++m4_pattern_allow([LT_AGE]) + + LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" + diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch deleted file mode 100644 index ba90a4519502..000000000000 --- a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- aiksaurus-1.2.1/base/caiksaurus.cpp.orig 2014-06-07 21:14:03.869649696 +0100 -+++ aiksaurus-1.2.1/base/caiksaurus.cpp 2014-06-07 21:33:06.241471066 +0100 -@@ -254,7 +254,7 @@ - /* see if we got --version. */ - if ( !strcmp(arg, "--version") || !strcmp(arg, "-v") ) - { -- printf(version); -+ printf("%s", version); - exit(0); - } - -@@ -262,7 +262,7 @@ - else if ( !strcmp(arg, "--help") || !strcmp(arg, "-h") ) - { - printf("Usage: %s [word]\n\n", argv[0]); -- printf(help); -+ printf("%s", help); - exit(0); - } - } -@@ -271,7 +271,7 @@ - if (argc != 2) - { - printf("Usage: %s [word]\n", argv[0]); -- printf(help); -+ printf("%s", help); - exit(1); - } - } diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch deleted file mode 100644 index a6d570af569d..000000000000 --- a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- aiksaurus-1.2.1/base/aiksaurus.t.cpp -+++ aiksaurus-1.2.1/base/aiksaurus.t.cpp -@@ -24,6 +24,7 @@ - #include "config.h" - #include <iostream> - #include <string> -+#include <cstdlib> - using namespace std; - using AiksaurusImpl::AsciiCompare; - ---- aiksaurus-1.2.1/gtk/src/Display.cpp -+++ aiksaurus-1.2.1/gtk/src/Display.cpp -@@ -22,6 +22,7 @@ - #include "Meaning.h" - #include "DialogMediator.h" - #include "Exception.h" -+#include <cstring> - using namespace std; - - namespace AiksaurusGTK_impl ---- aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp -+++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp -@@ -23,6 +23,7 @@ - #include <gtk/gtk.h> - #include <iostream> - #include <string> -+#include <cstdlib> - using namespace std; - - int main(int argc, char** argv) diff --git a/app-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml index 4f9abf2b8400..167e1d83d852 100644 --- a/app-text/aiksaurus/metadata.xml +++ b/app-text/aiksaurus/metadata.xml @@ -1,7 +1,7 @@ <?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="sourceforge">aiksaurus</remote-id> </upstream> 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 f016eddcddc3..000000000000 --- a/app-text/ansifilter/ansifilter-2.18.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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 ppc ppc64 ~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 - insinto /usr/share/applications - doins ${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 0563834f5561..ba284898934f 100644 --- a/app-text/ansifilter/metadata.xml +++ b/app-text/ansifilter/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> </maintainer> + <upstream> + <remote-id type="gitlab">saalen/ansifilter</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild index b9ae5e10151d..2fb72837676f 100644 --- a/app-text/antiword/antiword-0.37-r1.ebuild +++ b/app-text/antiword/antiword-0.37-r2.ebuild @@ -1,35 +1,41 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 -inherit epatch toolchain-funcs +inherit toolchain-funcs -IUSE="kde" PATCHVER="r2" DESCRIPTION="free MS Word reader" HOMEPAGE="http://www.winfield.demon.nl" SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +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} + "${FILESDIR}"/${P}-CVE-2014-8123.patch +) + +DOCS=( Docs/{ChangeLog,Exmh,Emacs,FAQ,History,Netscape,QandA,ReadMe,Mozilla,Mutt} ) src_prepare() { # Makefile is a symlink to Makefile.Linux, avoid that we patch it by # accident using patch <2.7, see bug #435492 rm Makefile || die - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}" + default # Re-add convenience symlink, see above ln -s Makefile.Linux Makefile - - epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch } -src_configure() { :; } +src_configure() { + true +} src_compile() { emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \ @@ -39,12 +45,11 @@ src_compile() { src_install() { emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install - use kde || rm -f "${ED}"/usr/bin/kantiword + einstalldocs - insinto /usr/share/${PN}/examples - doins Docs/testdoc.doc Docs/antiword.php + docompress -x /usr/share/doc/${PF}/examples + docinto examples + dodoc Docs/testdoc.doc Docs/antiword.php - cd Docs - doman antiword.1 - dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt + doman Docs/antiword.1 } 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/Manifest b/app-text/apvlv/Manifest index e2e8e977e53f..cefafd26f774 100644 --- a/app-text/apvlv/Manifest +++ b/app-text/apvlv/Manifest @@ -1 +1 @@ -DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd +DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild deleted file mode 100644 index 8bd32e2cccc9..000000000000 --- a/app-text/apvlv/apvlv-0.1.5-r2.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 - -inherit xdg cmake desktop - -DESCRIPTION="Alf's PDF Viewer Like Vim" -HOMEPAGE="https://github.com/naihe2010/apvlv/" -SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug djvu" - -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - >=app-text/poppler-0.18[cairo,xpdf-headers(+)] - dev-libs/glib:2 - x11-libs/gtk+:3 - djvu? ( app-text/djvu:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # preserve cflags - "${FILESDIR}/${P}-cflags.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-gcc7.patch" - "${FILESDIR}/${P}-poppler-0.73.patch" -) - -src_configure() { - local mycmakeargs=( - -DSYSCONFDIR=/etc/${PN} - -DDOCDIR=/usr/share/${PN} - -DMANDIR=/usr/share/man - -DAPVLV_WITH_HTML=OFF - -DAPVLV_WITH_UMD=OFF - -DAPVLV_WITH_TXT=ON - -DAPVLV_WITH_DJVU=$(usex djvu) - -DAPVLV_ENABLE_DEBUG=$(usex debug) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - newicon -s 32 icons/pdf.png ${PN}.png -} diff --git a/app-text/apvlv/apvlv-0.4.0-r1.ebuild b/app-text/apvlv/apvlv-0.4.0-r1.ebuild new file mode 100644 index 000000000000..24ab3cda2530 --- /dev/null +++ b/app-text/apvlv/apvlv-0.4.0-r1.ebuild @@ -0,0 +1,57 @@ +# 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= + 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.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 + newicon -s 32 icons/pdf.png ${PN}.png +} 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.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch deleted file mode 100644 index d1859fa25701..000000000000 --- a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ae9ae09..5831e7a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,13 +1,11 @@ - IF (WIN32) - ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS) - ELSE (WIN32) -- SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing") -+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing") - - OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF) - IF (APVLV_ENABLE_DEBUG) -- SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}") -- ELSE (APVLV_ENABLE_DEBUG) -- SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}") -+ SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}") - ENDIF (APVLV_ENABLE_DEBUG) - ENDIF (WIN32) - diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch deleted file mode 100644 index 0ffe3659d6d7..000000000000 --- a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc ---- apvlv-0.1.5.orig/src/ApvlvParams.cc 2015-01-10 15:04:24.000000000 +0100 -+++ apvlv-0.1.5/src/ApvlvParams.cc 2017-02-09 20:03:08.655402750 +0100 -@@ -90,7 +90,7 @@ - return false; - } - -- while ((getline (os, str)) != NULL) -+ while (getline (os, str)) - { - string argu, data, crap; - stringstream is (str); diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch deleted file mode 100644 index e55f2771395a..000000000000 --- a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc -+++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc -@@ -200,7 +200,7 @@ namespace apvlv - - if (len >= 4 - && *s == '<' -- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-') -+ && (e = strchr ((char *) s, '>')) && *(s + 2) != '-') - { - e++; - StringKeyMap::iterator it; ---- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc -+++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc -@@ -90,7 +90,7 @@ namespace apvlv - { - mInuse = use; - -- if (mInuse == false && gView->hasloaded (filename (), type ()) == false) -+ if (mInuse == false && !gView->hasloaded (filename (), type ())) - { - debug ("core :%p is not needed, delete it\n", this); - delete this; diff --git a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch deleted file mode 100644 index c3001d4b6196..000000000000 --- a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/ApvlvPdf.cc 2015-01-10 15:04:24.000000000 +0100 -+++ b/src/ApvlvPdf.cc 2019-01-17 01:29:54.479256848 +0100 -@@ -29,7 +29,6 @@ - #include "ApvlvPdf.h" - - #ifndef POPPLER_WITH_GDK --#include <goo/gtypes.h> - - static void - copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, diff --git a/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch new file mode 100644 index 000000000000..101877bbff63 --- /dev/null +++ b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,7 +3,7 @@ + IF (WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) + ELSE (WIN32) +- SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing") + + OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF) + IF (APVLV_ENABLE_DEBUG) 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-icon.patch b/app-text/apvlv/files/apvlv-0.4.0-icon.patch new file mode 100644 index 000000000000..f5e8ad370877 --- /dev/null +++ b/app-text/apvlv/files/apvlv-0.4.0-icon.patch @@ -0,0 +1,10 @@ +--- a/apvlv.desktop ++++ b/apvlv.desktop +@@ -2,6 +2,7 @@ + Version=1.0 + Type=Application + Name=apvlv ++Icon=apvlv + 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/apvlv/metadata.xml b/app-text/apvlv/metadata.xml index 43022be5fe1e..6a3c3096b614 100644 --- a/app-text/apvlv/metadata.xml +++ b/app-text/apvlv/metadata.xml @@ -1,7 +1,14 @@ <?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>c@cgps.ch</email> + <name>Chaquen Beliakov Amaya</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="google-code">apvlv</remote-id> <remote-id type="github">naihe2010/apvlv</remote-id> diff --git a/app-text/asa/asa-1.1-r1.ebuild b/app-text/asa/asa-1.1-r1.ebuild index 64afb7597cb3..bb675306d00c 100644 --- a/app-text/asa/asa-1.1-r1.ebuild +++ b/app-text/asa/asa-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,6 +14,10 @@ SLOT="0" KEYWORDS="amd64" src_prepare() { + local PATCHES=( + "${FILESDIR}/asa-1.1-implicit-int.patch" + ) + default sed \ diff --git a/app-text/asa/files/asa-1.1-implicit-int.patch b/app-text/asa/files/asa-1.1-implicit-int.patch new file mode 100644 index 000000000000..2f130912abaa --- /dev/null +++ b/app-text/asa/files/asa-1.1-implicit-int.patch @@ -0,0 +1,15 @@ +Fix build with -Werror=implicit-int + +https://bugs.gentoo.org/880999 + +--- a/asa.c ++++ b/asa.c +@@ -201,7 +201,7 @@ + copy_file(FILE *fp) + { + str line; +- static first_line = 1; ++ static int first_line = 1; + + while ((line.len=readline(fp, &(line.chr)))) + { diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest index 064d9296ad3a..ba6c37529be0 100644 --- a/app-text/asciidoc/Manifest +++ b/app-text/asciidoc/Manifest @@ -1,4 +1,2 @@ -DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c35edb0e7f3a222743ce1476b405483b01144faf768ab1492fd3f378960f6cc8e17d92ef61671d84c318fbe7c1ca8cd7c SHA512 c20629001704f1c3acfef0407b82f35f6077f5b32ef754fcbeee03a5a86d4e01e374e89b79cbdb236fc2c7fc76bf47ba81efd691f2f9e1c87dc85a7111f5e030 -DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089 -DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895 +DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6 diff --git a/app-text/asciidoc/asciidoc-10.2.0.ebuild b/app-text/asciidoc/asciidoc-10.2.0.ebuild new file mode 100644 index 000000000000..e9bcfe8888cd --- /dev/null +++ b/app-text/asciidoc/asciidoc-10.2.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +inherit distutils-r1 optfeature readme.gentoo-r1 pypi + +DESCRIPTION="A plain text human readable/writable document format" +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 ~x64-solaris" + +RDEPEND=" + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + dev-libs/libxml2:2 +" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +src_install() { + distutils-r1_src_install + + # TODO: Consider using Debian patch to allow /usr/share? + insinto /usr/share/asciidoc + doins -r asciidoc/resources/. + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools" + optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight" + optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" + optfeature "graphviz filter support" "media-gfx/graphviz" +} diff --git a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild deleted file mode 100644 index 7772c2bc97ef..000000000000 --- a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit autotools optfeature python-single-r1 readme.gentoo-r1 - -DESCRIPTION="A plain text human readable/writable document format" -HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" -SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.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="doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - dev-libs/libxml2:2 - " -DEPEND=" - test? ( - ${PYTHON_DEPS} - app-text/dvipng - app-text/dvisvgm - dev-texlive/texlive-latex - dev-util/source-highlight - media-gfx/graphviz - media-gfx/imagemagick - media-sound/lilypond - )" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc - docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt - filters/code/code-filter-readme.txt ) - -src_prepare() { - default - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - asciidoc.py || die - - # enforce usage of the configured version of Python - sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die - - eautoreconf -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - default - - if use doc; then - emake DESTDIR="${D}" docs - fi - - python_fix_shebang "${ED}"/usr/bin/*.py - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" - optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight - optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" - optfeature "\"graphviz\" filter support" media-gfx/graphviz -} diff --git a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild deleted file mode 100644 index 7772c2bc97ef..000000000000 --- a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit autotools optfeature python-single-r1 readme.gentoo-r1 - -DESCRIPTION="A plain text human readable/writable document format" -HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" -SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.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="doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - dev-libs/libxml2:2 - " -DEPEND=" - test? ( - ${PYTHON_DEPS} - app-text/dvipng - app-text/dvisvgm - dev-texlive/texlive-latex - dev-util/source-highlight - media-gfx/graphviz - media-gfx/imagemagick - media-sound/lilypond - )" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc - docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt - filters/code/code-filter-readme.txt ) - -src_prepare() { - default - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - asciidoc.py || die - - # enforce usage of the configured version of Python - sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die - - eautoreconf -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - default - - if use doc; then - emake DESTDIR="${D}" docs - fi - - python_fix_shebang "${ED}"/usr/bin/*.py - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" - optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight - optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" - optfeature "\"graphviz\" filter support" media-gfx/graphviz -} diff --git a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild deleted file mode 100644 index 7772c2bc97ef..000000000000 --- a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) - -inherit autotools optfeature python-single-r1 readme.gentoo-r1 - -DESCRIPTION="A plain text human readable/writable document format" -HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" -SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.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="doc test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75 - dev-libs/libxslt - dev-libs/libxml2:2 - " -DEPEND=" - test? ( - ${PYTHON_DEPS} - app-text/dvipng - app-text/dvisvgm - dev-texlive/texlive-latex - dev-util/source-highlight - media-gfx/graphviz - media-gfx/imagemagick - media-sound/lilypond - )" - -DOC_CONTENTS=" -If you are going to use a2x, please also look at a2x(1) under -REQUISITES for a list of runtime dependencies. -" - -DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc - docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt - filters/code/code-filter-readme.txt ) - -src_prepare() { - default - # Only needed for prefix - harmless (does nothing) otherwise - sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ - asciidoc.py || die - - # enforce usage of the configured version of Python - sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die - - eautoreconf -} - -src_configure() { - econf --sysconfdir="${EPREFIX}"/usr/share -} - -src_install() { - default - - if use doc; then - emake DESTDIR="${D}" docs - fi - - python_fix_shebang "${ED}"/usr/bin/*.py - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick" - optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight - optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm" - optfeature "\"graphviz\" filter support" media-gfx/graphviz -} diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild index f3c86d982e94..075821590784 100644 --- a/app-text/asciidoc/asciidoc-9.1.0.ebuild +++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_COMPAT=( python3_{9..10} pypy3 ) inherit autotools optfeature python-single-r1 readme.gentoo-r1 @@ -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 bf7692827cad..5e3bb3ff9c88 100644 --- a/app-text/asciidoc/metadata.xml +++ b/app-text/asciidoc/metadata.xml @@ -1,17 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>marcec@gmx.de</email> - <name>Marc Joliet</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">asciidoc</remote-id> - <remote-id type="github">asciidoc-py/asciidoc-py</remote-id> - <bugs-to>https://github.com/asciidoc-py/asciidoc-py/issues</bugs-to> - </upstream> + <!-- maintainer-needed --> + <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-r3.ebuild b/app-text/aspell/aspell-0.60.8.1.ebuild index 499e003d437d..c9600f0ed693 100644 --- a/app-text/aspell/aspell-0.60.8-r3.ebuild +++ b/app-text/aspell/aspell-0.60.8.1.ebuild @@ -1,9 +1,9 @@ -# 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 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 ~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/aspell/metadata.xml b/app-text/aspell/metadata.xml index c07e13d4a6bd..7a5d43ec3623 100644 --- a/app-text/aspell/metadata.xml +++ b/app-text/aspell/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>conikost@gentoo.org</email> - <name>Conrad Kostecki</name> - </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <upstream> + <remote-id type="savannah">aspell</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest index c435e33d2177..a0d739668c61 100644 --- a/app-text/atril/Manifest +++ b/app-text/atril/Manifest @@ -1,2 +1,4 @@ -DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293 -DIST atril-1.24.1.tar.xz 2043552 BLAKE2B 01e41e53a38684c237fadef200614cf8d70cb84410a00bb9d28b200fcac43a2bf45cd81c4c7f19ab1351891f179ee64cd880bca1aa38cf68727bcf1da3e06c8d SHA512 94a55e7699bdfc9368e20986664bd411c12f50f466874ebf20210df3de6ddb499866b505e157c56b58a8065aad2c24284b96afa8c547a6cd259eef413096a91a +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.24.0-r2.ebuild b/app-text/atril/atril-1.26.0-r5.ebuild index 55de51ce62bd..e0cd2ec4ae2d 100644 --- a/app-text/atril/atril-1.24.0-r2.ebuild +++ b/app-text/atril/atril-1.26.0-r5.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MATE_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit mate python-any-r1 virtualx if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" + 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 gnome-keyring +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 )" COMMON_DEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/atk + ) >=app-text/poppler-0.22[cairo] - dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib @@ -41,14 +44,14 @@ 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 ) - tiff? ( >=media-libs/tiff-3.6:0 ) + tiff? ( >=media-libs/tiff-3.6:= ) xps? ( >=app-text/libgxps-0.2.1 ) " @@ -57,15 +60,13 @@ RDEPEND="${COMMON_DEPEND} !!app-text/mate-document-viewer " -DEPEND="${COMMON_DEPEND} +BDEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 - app-text/rarian app-text/yelp-tools - >=app-text/scrollkeeper-dtd-1:1.0 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}]') ) @@ -76,10 +77,8 @@ DEPEND="${COMMON_DEPEND} # Until we figure out how to run successfully, don't run tests RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" ) - python_check_deps() { - use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" + use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]" } pkg_setup() { @@ -95,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) \ @@ -103,6 +102,7 @@ src_configure() { $(use_enable dvi) \ $(use_enable epub) \ $(use_enable introspection) \ + $(use_enable nls) \ $(use_enable postscript ps) \ $(use_enable synctex) \ $(use_enable t1lib) \ 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.24.1.ebuild b/app-text/atril/atril-1.26.2.ebuild index 1cf25b1ae899..2bbb97a2dea2 100644 --- a/app-text/atril/atril-1.24.1.ebuild +++ b/app-text/atril/atril-1.26.2.ebuild @@ -1,29 +1,30 @@ -# 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 MATE_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit mate python-any-r1 virtualx if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + 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 gnome-keyring +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 )" COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-arch/libarchive:= >=app-text/poppler-0.22[cairo] - dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib @@ -41,14 +42,14 @@ COMMON_DEPEND=" t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( - dev-libs/mathjax - >=net-libs/webkit-gtk-2.6.0:4 + <dev-libs/mathjax-3 + >=net-libs/webkit-gtk-2.6.0:4.1 ) - 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 ) - tiff? ( >=media-libs/tiff-3.6:0 ) + tiff? ( >=media-libs/tiff-3.6:= ) xps? ( >=app-text/libgxps-0.2.1 ) " @@ -57,15 +58,13 @@ RDEPEND="${COMMON_DEPEND} !!app-text/mate-document-viewer " -DEPEND="${COMMON_DEPEND} +BDEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 - app-text/rarian app-text/yelp-tools - >=app-text/scrollkeeper-dtd-1:1.0 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}]') ) @@ -76,10 +75,8 @@ DEPEND="${COMMON_DEPEND} # Until we figure out how to run successfully, don't run tests RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" ) - python_check_deps() { - use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]" + use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]" } pkg_setup() { @@ -95,7 +92,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) \ @@ -103,6 +100,7 @@ src_configure() { $(use_enable dvi) \ $(use_enable epub) \ $(use_enable introspection) \ + $(use_enable nls) \ $(use_enable postscript ps) \ $(use_enable synctex) \ $(use_enable t1lib) \ 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.24.0-make-synctex-optional.patch b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch deleted file mode 100644 index 7b2d3a9c372e..000000000000 --- a/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch +++ /dev/null @@ -1,526 +0,0 @@ -From ed650322792514d69ae54eef4cb105cac1dcb4b8 Mon Sep 17 00:00:00 2001 -From: Oz Tiram <oz.tiram@gmail.com> -Date: Fri, 7 Feb 2020 21:57:10 +0100 -Subject: [PATCH 1/5] Make synctex optional - -Not everyone who reads PDF's is necessarily a LaTeX user. -These changes allow users to install atril without the huge bagage -of tex-live on systems where synctex isn't provided as a stand alone -library. ---- - configure.ac | 25 +++++++++++++++++-------- - libdocument/ev-document.c | 16 ++++++++++++---- - libview/ev-view.c | 9 ++++++++- - shell/ev-window.c | 5 +++++ - 4 files changed, 42 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6fee0ff6e..e7a63feed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -361,15 +361,25 @@ AC_SUBST([GIRTYPELIBDIR]) - AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) - - dnl ================== libsynctex =========================================== -+AC_ARG_ENABLE([synctex], -+ [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])], -+ [], -+ [enable_synctex=yes]) - --PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no) - --dnl not found? use internal code copy. --if test "x$has_synctex" = "xno"; then -- AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found") -+if test "$enable_synctex" = "yes"; then -+ AC_DEFINE([ENABLE_SYNCTEX],[1],[Define if synctex support is enabled]) -+ PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no) -+ dnl not found? use internal code copy. -+ if test "x$has_synctex" = "xno"; then -+ AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found") -+ fi -+ AC_SUBST(SYNCTEX_LIBS) -+ AC_SUBST(SYNCTEX_CFLAGS) - fi --AC_SUBST(SYNCTEX_LIBS) --AC_SUBST(SYNCTEX_CFLAGS) -+ -+AM_CONDITIONAL([ENABLE_SYNCTEX], [test "$enable_synctex" = "yes"]) -+ - - dnl ================== portability checks =========================================== - -@@ -776,6 +786,7 @@ Configure summary: - Tests...............: $enable_tests - - PDF Backend.........: $enable_pdf -+ Synctex enabled.....: $enable_synctex - PostScript Backend..: $enable_ps - TIFF Backend........: $enable_tiff - DJVU Backend........: $enable_djvu -@@ -784,6 +795,4 @@ Configure summary: - Comics Backend......: $enable_comics - XPS Backend.........: $enable_xps - ePub Backend........: $have_webkit -- -- SyncTeX.............: $has_synctex - " -diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c -index b713a6717..be082aebb 100644 ---- a/libdocument/ev-document.c -+++ b/libdocument/ev-document.c -@@ -25,7 +25,9 @@ - #include <string.h> - - #include "ev-document.h" -+#ifdef ENABLE_SYNCTEX - #include "synctex_parser.h" -+#endif - #include "ev-file-helpers.h" - - typedef struct _EvPageSize -@@ -53,8 +55,9 @@ struct _EvDocumentPrivate - gchar **page_labels; - EvPageSize *page_sizes; - EvDocumentInfo *info; -- -+#ifdef ENABLE_SYNCTEX - synctex_scanner_p synctex_scanner; -+#endif - }; - - static gint _ev_document_get_n_pages (EvDocument *document); -@@ -124,12 +127,12 @@ ev_document_finalize (GObject *object) - ev_document_info_free (document->priv->info); - document->priv->info = NULL; - } -- -+#ifdef ENABLE_SYNCTEX - if (document->priv->synctex_scanner) { - synctex_scanner_free (document->priv->synctex_scanner); - document->priv->synctex_scanner = NULL; - } -- -+#endif - G_OBJECT_CLASS (ev_document_parent_class)->finalize (object); - } - -@@ -137,8 +140,9 @@ static void - ev_document_init (EvDocument *document) - { - document->priv = ev_document_get_instance_private (document); -+#ifdef ENABLE_SYNCTEX - document->synctex_version = SYNCTEX_VERSION_STRING; -- -+#endif - /* Assume all pages are the same size until proven otherwise */ - document->priv->uniform = TRUE; - /* Assume that the document is not a web document*/ -@@ -336,6 +340,7 @@ ev_document_load (EvDocument *document, - } - - priv->info = _ev_document_get_info (document); -+#ifdef ENABLE_SYNCTEX - if (_ev_document_support_synctex (document)) { - gchar *filename; - -@@ -346,6 +351,7 @@ ev_document_load (EvDocument *document, - g_free (filename); - } - } -+#endif - } - - return retval; -@@ -388,6 +394,7 @@ _ev_document_support_synctex (EvDocument *document) - return klass->support_synctex ? klass->support_synctex (document) : FALSE; - } - -+#ifdef ENABLE_SYNCTEX - gboolean - ev_document_has_synctex (EvDocument *document) - { -@@ -492,6 +499,7 @@ ev_document_synctex_forward_search (EvDocument *document, - - return result; - } -+#endif /* ENABLE_SYNCTEX */ - - static gint - _ev_document_get_n_pages (EvDocument *document) -diff --git a/libview/ev-view.c b/libview/ev-view.c -index a195ba21f..e98582d34 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -3210,6 +3210,7 @@ ev_view_remove_annotation (EvView *view, - g_object_unref (annot); - } - -+#ifdef ENABLE_SYNCTEX - static gboolean - ev_view_synctex_backward_search (EvView *view, - gdouble x, -@@ -3235,6 +3236,7 @@ ev_view_synctex_backward_search (EvView *view, - - return FALSE; - } -+#endif - - /* Caret navigation */ - #define CURSOR_ON_MULTIPLIER 2 -@@ -4078,8 +4080,10 @@ ev_view_draw (GtkWidget *widget, - show_annotation_windows (view, i); - if (page_ready && view->focused_element) - draw_focus (view, cr, i, &clip_rect); -+#ifdef ENABLE_SYNCTEX - if (page_ready && view->synctex_result) - highlight_forward_search_results (view, cr, i); -+#endif - } - - if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw) -@@ -4472,9 +4476,10 @@ ev_view_button_press_event (GtkWidget *widget, - EvFormField *field; - EvMapping *link; - gint page; -- -+#ifdef ENABLE_SYNCTEX - if (event->state & GDK_CONTROL_MASK) - return ev_view_synctex_backward_search (view, event->x , event->y); -+#endif - - if (EV_IS_SELECTION (view->document) && view->selection_info.selections) { - if (event->type == GDK_3BUTTON_PRESS) { -@@ -7522,6 +7527,7 @@ ev_view_find_cancel (EvView *view) - view->find_pages = NULL; - } - -+#ifdef ENABLE_SYNCTEX - /*** Synctex ***/ - void - ev_view_highlight_forward_search (EvView *view, -@@ -7549,6 +7555,7 @@ ev_view_highlight_forward_search (EvView *view, - ensure_rectangle_is_visible (view, &view_rect); - gtk_widget_queue_draw (GTK_WIDGET (view)); - } -+#endif /* ENABLE_SYNCTEX */ - - /*** Selections ***/ - static gboolean -diff --git a/shell/ev-window.c b/shell/ev-window.c -index e2dfbf727..bffc9a7f9 100644 ---- a/shell/ev-window.c -+++ b/shell/ev-window.c -@@ -7736,6 +7736,8 @@ ev_window_emit_doc_loaded (EvWindow *window) - ev_atril_window_emit_document_loaded (window->priv->skeleton, window->priv->uri); - } - -+ -+#ifdef ENABLE_SYNCTEX - static gboolean - handle_sync_view_cb (EvAtrilWindow *object, - GDBusMethodInvocation *invocation, -@@ -7756,6 +7758,7 @@ handle_sync_view_cb (EvAtrilWindow *object, - - return TRUE; - } -+#endif - #endif /* ENABLE_DBUS */ - - static gboolean -@@ -7816,9 +7819,11 @@ ev_window_init (EvWindow *ev_window) - ev_window->priv->dbus_object_path, - &error)) { - ev_window->priv->skeleton = skeleton; -+#ifdef ENABLE_SYNCTEX - g_signal_connect (skeleton, "handle-sync-view", - G_CALLBACK (handle_sync_view_cb), - ev_window); -+#endif - } else { - g_printerr ("Failed to register bus object %s: %s\n", - ev_window->priv->dbus_object_path, error->message); - -From c141d2c6ae0b4ce5824817f9aa2f98d5edbf7756 Mon Sep 17 00:00:00 2001 -From: Oz N Tiram <oz.tiram@gmail.com> -Date: Thu, 11 Jun 2020 09:15:28 +0200 -Subject: [PATCH 2/5] Fix -Wunused-function warnings caused by - --enable-synctex=no - ---- - libdocument/ev-document.c | 5 ++++- - libview/ev-view-private.h | 3 ++- - libview/ev-view.c | 10 ++++++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c -index be082aebb..f7c878956 100644 ---- a/libdocument/ev-document.c -+++ b/libdocument/ev-document.c -@@ -68,7 +68,9 @@ static void _ev_document_get_page_size (EvDocument *document, - static gchar *_ev_document_get_page_label (EvDocument *document, - EvPage *page); - static EvDocumentInfo *_ev_document_get_info (EvDocument *document); -+#ifdef ENABLE_SYNCTEX - static gboolean _ev_document_support_synctex (EvDocument *document); -+#endif - - static GMutex ev_doc_mutex; - static GMutex ev_fc_mutex; -@@ -386,6 +388,8 @@ ev_document_get_page (EvDocument *document, - return klass->get_page (document, index); - } - -+ -+#ifdef ENABLE_SYNCTEX - static gboolean - _ev_document_support_synctex (EvDocument *document) - { -@@ -394,7 +398,6 @@ _ev_document_support_synctex (EvDocument *document) - return klass->support_synctex ? klass->support_synctex (document) : FALSE; - } - --#ifdef ENABLE_SYNCTEX - gboolean - ev_document_has_synctex (EvDocument *document) - { -diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h -index f10593953..4f6179e4a 100644 ---- a/libview/ev-view-private.h -+++ b/libview/ev-view-private.h -@@ -125,8 +125,9 @@ struct _EvView { - GList **find_pages; - gint find_result; - gboolean jump_to_find_result; -+#ifdef ENABLE_SYNCTEX - gboolean highlight_find_results; -- -+#endif - EvDocumentModel *model; - EvPixbufCache *pixbuf_cache; - gsize pixbuf_cache_size; -diff --git a/libview/ev-view.c b/libview/ev-view.c -index e98582d34..7c9281cef 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -177,12 +177,14 @@ static void ev_view_remove_all (EvView - static AtkObject *ev_view_get_accessible (GtkWidget *widget); - - /*** Drawing ***/ -+#if ENABLE_SYNCTEX - static void highlight_find_results (EvView *view, - cairo_t *cr, - int page); - static void highlight_forward_search_results (EvView *view, - cairo_t *cr, - int page); -+#endif - static void draw_one_page (EvView *view, - gint page, - cairo_t *cr, -@@ -4074,8 +4076,10 @@ ev_view_draw (GtkWidget *widget, - - if (page_ready && should_draw_caret_cursor (view, i)) - draw_caret_cursor (view, cr); -+#ifdef ENABLE_SYNCTEX - if (page_ready && view->find_pages && view->highlight_find_results) - highlight_find_results (view, cr, i); -+#endif - if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document)) - show_annotation_windows (view, i); - if (page_ready && view->focused_element) -@@ -5654,6 +5658,7 @@ draw_rubberband (EvView *view, - } - - -+#ifdef ENABLE_SYNCTEX - static void - highlight_find_results (EvView *view, cairo_t *cr, int page) - { -@@ -5698,6 +5703,7 @@ highlight_forward_search_results (EvView *view, cairo_t *cr, int page) - cairo_stroke (cr); - cairo_restore (cr); - } -+#endif - - static void - draw_surface (cairo_t *cr, -@@ -6497,7 +6503,9 @@ ev_view_init (EvView *view) - view->page_layout = EV_PAGE_LAYOUT_SINGLE; - view->pending_scroll = SCROLL_TO_KEEP_POSITION; - view->jump_to_find_result = TRUE; -+#ifdef ENABLE_SYNCTEX - view->highlight_find_results = FALSE; -+#endif - view->caret_enabled = FALSE; - view->cursor_page = 0; - view->zoom_center_x = -1; -@@ -7517,7 +7525,9 @@ ev_view_find_search_changed (EvView *view) - void - ev_view_find_set_highlight_search (EvView *view, gboolean value) - { -+#ifdef ENABLE_SYNCTEX - view->highlight_find_results = value; -+#endif - gtk_widget_queue_draw (GTK_WIDGET (view)); - } - - -From f0054e7011c5cf6ac814ce1c6b42ce1713b25dba Mon Sep 17 00:00:00 2001 -From: Oz N Tiram <oz.tiram@gmail.com> -Date: Thu, 11 Jun 2020 10:21:00 +0200 -Subject: [PATCH 3/5] Improved detection of --enable/disable synctex option - ---- - configure.ac | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e7a63feed..ee33f27d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -362,9 +362,12 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) - - dnl ================== libsynctex =========================================== - AC_ARG_ENABLE([synctex], -- [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])], -- [], -- [enable_synctex=yes]) -+ [--enable-synctex enable support for synctex)], -+ [case "${enableval}" in -+ yes) synctex=true ;; -+ no) synctex=false;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-synctex]) ;; -+ esac],[enable_synctex=yes]) - - - if test "$enable_synctex" = "yes"; then - -From 37d80d4c862cbd03525fe4393f09b92d1dff8f56 Mon Sep 17 00:00:00 2001 -From: Oz N Tiram <oz.tiram@gmail.com> -Date: Thu, 11 Jun 2020 10:23:15 +0200 -Subject: [PATCH 4/5] Use ENABLE_SYNCTEX in libdocument/Makefile.am - ---- - libdocument/Makefile.am | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am -index f527f0a4a..d1db419c0 100644 ---- a/libdocument/Makefile.am -+++ b/libdocument/Makefile.am -@@ -102,11 +102,14 @@ libatrildocument_la_CPPFLAGS = \ - - libatrildocument_la_CFLAGS = \ - $(LIBDOCUMENT_CFLAGS) \ -- $(SYNCTEX_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) \ - $(AM_CFLAGS) - -+if ENABLE_SYNCTEX -+libatrildocument_la_CFLAGS += $(SYNCTEX_CFLAGS) -+endif -+ - libatrildocument_la_LDFLAGS = \ - -version-info $(EV_DOCUMENT_LT_VERSION_INFO) \ - -no-undefined \ -@@ -116,9 +119,11 @@ libatrildocument_la_LDFLAGS = \ - libatrildocument_la_LIBADD = \ - $(LIBDOCUMENT_LIBS) \ - $(GMODULE_LIBS) \ -- $(SYNCTEX_LIBS) \ - $(ZLIB_LIBS) - -+if ENABLE_SYNCTEX -+libatrildocument_la_LIBADD += $(SYNCTEX_LIBS) -+endif - - BUILT_SOURCES = \ - ev-document-type-builtins.c \ - -From 87c8ee575d3ec50a278c5e428d066341ffd3295d Mon Sep 17 00:00:00 2001 -From: Oz N Tiram <oz.tiram@gmail.com> -Date: Sun, 14 Jun 2020 17:09:56 +0200 -Subject: [PATCH 5/5] Re-enable highlight_find_results - ---- - libview/ev-view-private.h | 2 -- - libview/ev-view.c | 9 +++------ - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h -index 4f6179e4a..e95157234 100644 ---- a/libview/ev-view-private.h -+++ b/libview/ev-view-private.h -@@ -125,9 +125,7 @@ struct _EvView { - GList **find_pages; - gint find_result; - gboolean jump_to_find_result; --#ifdef ENABLE_SYNCTEX - gboolean highlight_find_results; --#endif - EvDocumentModel *model; - EvPixbufCache *pixbuf_cache; - gsize pixbuf_cache_size; -diff --git a/libview/ev-view.c b/libview/ev-view.c -index 7c9281cef..29b06fbef 100644 ---- a/libview/ev-view.c -+++ b/libview/ev-view.c -@@ -177,10 +177,10 @@ static void ev_view_remove_all (EvView - static AtkObject *ev_view_get_accessible (GtkWidget *widget); - - /*** Drawing ***/ --#if ENABLE_SYNCTEX - static void highlight_find_results (EvView *view, - cairo_t *cr, - int page); -+#if ENABLE_SYNCTEX - static void highlight_forward_search_results (EvView *view, - cairo_t *cr, - int page); -@@ -4076,10 +4076,8 @@ ev_view_draw (GtkWidget *widget, - - if (page_ready && should_draw_caret_cursor (view, i)) - draw_caret_cursor (view, cr); --#ifdef ENABLE_SYNCTEX - if (page_ready && view->find_pages && view->highlight_find_results) - highlight_find_results (view, cr, i); --#endif - if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document)) - show_annotation_windows (view, i); - if (page_ready && view->focused_element) -@@ -5627,6 +5625,7 @@ ev_view_style_updated (GtkWidget *widget) - - /*** Drawing ***/ - -+ - static void - draw_rubberband (EvView *view, - cairo_t *cr, -@@ -5658,7 +5657,6 @@ draw_rubberband (EvView *view, - } - - --#ifdef ENABLE_SYNCTEX - static void - highlight_find_results (EvView *view, cairo_t *cr, int page) - { -@@ -5683,6 +5681,7 @@ highlight_find_results (EvView *view, cairo_t *cr, int page) - } - } - -+#ifdef ENABLE_SYNCTEX - static void - highlight_forward_search_results (EvView *view, cairo_t *cr, int page) - { -@@ -7525,9 +7524,7 @@ ev_view_find_search_changed (EvView *view) - void - ev_view_find_set_highlight_search (EvView *view, gboolean value) - { --#ifdef ENABLE_SYNCTEX - view->highlight_find_results = value; --#endif - gtk_widget_queue_draw (GTK_WIDGET (view)); - } - 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/bact/bact-0.13-r1.ebuild b/app-text/bact/bact-0.13-r2.ebuild index aaf872d9bd2b..8c6381a627b2 100644 --- a/app-text/bact/bact-0.13-r1.ebuild +++ b/app-text/bact/bact-0.13-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,23 +12,19 @@ SRC_URI="http://chasen.org/~taku/software/bact/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="" -DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-cpp14.patch +) -HTML_DOCS=( index.html bact.css ) -PATCHES=( "${FILESDIR}/${P}-cpp14.patch" ) - -src_compile() { - emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_test() { - emake test +src_configure() { + tc-export CXX } src_install() { dobin bact_learn bact_mkmodel bact_classify + + HTML_DOCS=( index.html bact.css ) einstalldocs } diff --git a/app-text/bact/files/bact-0.13-cpp14.patch b/app-text/bact/files/bact-0.13-cpp14.patch index fa083c223b12..a0f6edda1eed 100644 --- a/app-text/bact/files/bact-0.13-cpp14.patch +++ b/app-text/bact/files/bact-0.13-cpp14.patch @@ -1,6 +1,7 @@ Fix C++14 compilation errors -- since C++11 make_pair<T1,T2> is resolved to make_pair(T1&&, T2&&). Types should be deduced. -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312 + +Bug: https://bugs.gentoo.org/594312 --- a/bact_classify.cpp +++ b/bact_classify.cpp @@ -42,3 +43,48 @@ Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312 ary.push_back ((Darts::DoubleArray::key_type *)it->first.c_str()); alpha.push_back (a); } +--- a/darts.h ++++ b/darts.h +@@ -394,10 +394,10 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ ArrayUType p; + +- for (register size_t i = 0; i < len; ++i) { ++ for (size_t i = 0; i < len; ++i) { + p = b + (NodeUType)(key[i]) + 1; + if ((ArrayUType)b == array[p].check) b = array[p].base; + else return -2; +@@ -414,8 +414,8 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ ArrayUType p; + + for (; pos2 < len; ++pos2) { + p = b + (NodeUType)(key[pos2]) + 1; +@@ -437,12 +437,12 @@ + { + if (! len) len = LengthFunc() (key); + +- register ArrayType b = array[pos].base; +- register size_t num = 0; +- register ArrayType n; +- register ArrayUType p; ++ ArrayType b = array[pos].base; ++ size_t num = 0; ++ ArrayType n; ++ ArrayUType 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 ((ArrayUType) b == array[p].check && n < 0) result[num++] = -n-1; diff --git a/app-text/bact/files/bact-0.13-makefile.patch b/app-text/bact/files/bact-0.13-makefile.patch new file mode 100644 index 000000000000..d27879559d1d --- /dev/null +++ b/app-text/bact/files/bact-0.13-makefile.patch @@ -0,0 +1,38 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,6 @@ +-CXX = c++ + VERSION = 0.13 +-CXXFLAGS = -O3 -Wall -Wno-deprecated ++CXXFLAGS += -Wall -Wno-deprecated + EXECPREFIX = +-LDFLAGS = + TARGETS1 = bact_learn${EXEC_PREFIX} + TARGETS2 = bact_classify${EXEC_PREFIX} + TARGETS3 = bact_mkmodel${EXEC_PREFIX} +@@ -10,14 +8,11 @@ + + all: bact_learn bact_mkmodel bact_classify + +-bact_learn: bact_learn.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS1} ${OBJ} bact_learn.o ${LDFLAGS} ++bact_learn: ${OBJ} + +-bact_classify: bact_classify.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS2} ${OBJ} bact_classify.o ${LDFLAGS} ++bact_classify: ${OBJ} + +-bact_mkmodel: bact_mkmodel.o ${OBJ} +- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS3} ${OBJ} bact_mkmodel.o ${LDFLAGS} ++bact_mkmodel: ${OBJ} + + clean: + rm -f *.o ${TARGETS1} ${TARGETS2} ${TARGETS3} core *~ *.tar.gz *.exe core* med.model* jp.model* +@@ -33,7 +28,6 @@ + scp bact-${VERSION}.tar.gz index.html bact.css chasen.org:public_html/software/bact/ + + check: +-test: + ./bact_learn -T1000 med.train med.model + ./bact_mkmodel -i med.model -o med.model.bin -O med.model.O + ./bact_classify med.test med.model.bin diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest index 524bab8c61a6..dae2ad2935b3 100644 --- a/app-text/barcode/Manifest +++ b/app-text/barcode/Manifest @@ -1 +1 @@ -DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1 +DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e diff --git a/app-text/barcode/barcode-0.99-r1.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild index 9defd1531f06..477a4dff5786 100644 --- a/app-text/barcode/barcode-0.99-r1.ebuild +++ b/app-text/barcode/barcode-0.99-r1.ebuild @@ -1,15 +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 +inherit autotools + DESCRIPTION="barcode generator" HOMEPAGE="https://www.gnu.org/software/barcode/" -SRC_URI="mirror://gnu/barcode/${P}.tar.gz" +SRC_URI="mirror://gnu/barcode/${P}.tar.xz" -LICENSE="GPL-2" +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}" @@ -17,16 +19,19 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-install-static-lib.patch + "${FILESDIR}"/${P}-not-a-literal-string.patch ) src_prepare() { + default + sed -i -e '/^LDFLAGS =/s:=:+=:' \ -e "/^aLIBDIR/s:lib:$(get_libdir):" \ -e '/^INFODIR/s:info:share/info:' \ -e '/^MAN/s:man:share/man:' \ Makefile.in || die - default + eautoreconf } src_configure() { diff --git a/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch new file mode 100644 index 000000000000..63b49d25c058 --- /dev/null +++ b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch @@ -0,0 +1,19 @@ +Taken from: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html +Author: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html +--- + plessey.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plessey.c b/plessey.c +index 2f59e39..3089a3c 100644 +--- a/plessey.c ++++ b/plessey.c +@@ -149,7 +149,7 @@ int Barcode_pls_encode(struct Barcode_Item *bc) + checkptr[i+j] ^= check[j]; + } + for (i = 0; i < 8; i++) { +- sprintf(ptr, patterns[checkptr[strlen(text) * 4 + i]]); ++ sprintf(ptr, "%s", patterns[checkptr[strlen(text) * 4 + i]]); + ptr += 2; + } + fprintf(stderr, _("CRC: ")); diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml index 3dcb3e34c200..b4e14c04b700 100644 --- a/app-text/barcode/metadata.xml +++ b/app-text/barcode/metadata.xml @@ -1,8 +1,11 @@ <?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> + <maintainer type="person"> + <email>tamiko@gentoo.org</email> + <name>Matthias Maier</name> + </maintainer> + <upstream> + <remote-id type="savannah">barcode</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild index e3c04746c942..2f726453904e 100644 --- a/app-text/bdf2psf/bdf2psf-1.155.ebuild +++ b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Converter to generate console fonts from BDF source fonts" HOMEPAGE="http://packages.debian.org/sid/bdf2psf" SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz" +S="${WORKDIR}/console-setup-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -DEPEND="" RDEPEND="dev-lang/perl" -S="${WORKDIR}/console-setup-${PV}" - src_compile() { : } @@ -24,7 +21,7 @@ src_compile() { src_install() { dobin Fonts/bdf2psf - insinto usr/share/bdf2psf + insinto /usr/share/bdf2psf doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets doman man/bdf2psf.1 diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest index 03fc45bbd3fd..02c7c5dc9e01 100644 --- a/app-text/bibclean/Manifest +++ b/app-text/bibclean/Manifest @@ -1,2 +1 @@ -DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f -DIST bibclean-3.04.tar.gz 2712015 BLAKE2B 80d2fccb3b453dfda935bedd73ea2173b6ba1416c425a094c6ca915e86a886fe269b2f0e392274775228b03578ccf19da03291ed644f589edec1692120456a99 SHA512 7cdd22d07f627944d90e04ca73c3c82529e2fa9a011469f8d5b418f7651332b4e8c29aceda32b966bb1778151505d7f135ead6a12db8975ff46f650c4c43b4f3 +DIST bibclean-3.06.tar.xz 1697732 BLAKE2B c1d9623588e892360eb98e753b44cb54e0eb65d3e3d46a04463c0c3183beacb58fd07542ba06d00eb754061b45ed195a82b90b2843b6ba456c7ba09856090474 SHA512 b167243415f010d7597ffdf52c5bb71de3585f70443c3a04f762a633b2bc276c7aef50e16159c32d8765924be2781b1e60a111305a17c2f42b68ed5216b2e31b diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild deleted file mode 100644 index fc8d456dd364..000000000000 --- a/app-text/bibclean/bibclean-2.17.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker" -SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2" -HOMEPAGE="http://www.math.utah.edu/pub/bibclean/" - -# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -SLOT="0" - -src_compile() { - emake -j1 LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin bibclean - newman bibclean.man bibclean.1 -} diff --git a/app-text/bibclean/bibclean-3.04.ebuild b/app-text/bibclean/bibclean-3.04.ebuild deleted file mode 100644 index d7f1a69fa5e6..000000000000 --- a/app-text/bibclean/bibclean-3.04.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker" -SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.gz" -HOMEPAGE="http://www.math.utah.edu/pub/bibclean/" - -# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -SLOT="0" - -src_compile() { - emake LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin bibclean - newman bibclean.man bibclean.1 -} diff --git a/app-text/bibclean/bibclean-3.06.ebuild b/app-text/bibclean/bibclean-3.06.ebuild new file mode 100644 index 000000000000..25ac2ac350fc --- /dev/null +++ b/app-text/bibclean/bibclean-3.06.ebuild @@ -0,0 +1,21 @@ +# 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="https://ftp.math.utah.edu/pub/bibclean/" +SRC_URI="https://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_compile() { + emake LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin bibclean + newman bibclean.man bibclean.1 +} diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest index 2ff7a048d6f7..0f53ac88566b 100644 --- a/app-text/bibletime/Manifest +++ b/app-text/bibletime/Manifest @@ -1,2 +1 @@ -DIST bibletime-3.0.1.tar.xz 1630180 BLAKE2B fe03cc8396f44ba0d68e27d50f60435c9d9501b620278c5d7565bea50c18f711675ac1020c6738790eb8452380ed974cba1a41bfb6f87778224d814c63e10aa3 SHA512 217e45c034d8fd8de4b7ef936f340a613fd7046b4700f828edd6d6f32f4bad4ecda2ec2c4425461af39c6926170fe080406238780e3c63bdbe0273679e0aef94 -DIST bibletime-3.0.2.tar.xz 1631828 BLAKE2B 7ff319e6810717391d7b4a8b96a63ac315bf1663dd4caaa742f9ec92a3a6490d238cdf4e13ea6aef45b7c6772d4c41ea498c181daa7a8d0abacc58ca59c39b4e SHA512 d374bf88844e63dead0da5dc3f951a7e6eca133e18067acf28432d1e9d12ac9f481fb7421d9b5ae4c76b5aff7eb05c083fa6828a58332d02a3975f1921d8914c +DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090 diff --git a/app-text/bibletime/bibletime-3.0.1.ebuild b/app-text/bibletime/bibletime-3.0.1.ebuild deleted file mode 100644 index 9aa26c20e7e8..000000000000 --- a/app-text/bibletime/bibletime-3.0.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt Bible-study application using the SWORD library" -HOMEPAGE="https://bibletime.info/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=">=app-text/sword-1.8.1 - dev-cpp/clucene - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5" -DEPEND="${RDEPEND} - dev-libs/boost - dev-libs/icu:= - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - net-misc/curl - sys-libs/zlib" - -DOCS=( ChangeLog README.md ) - -src_prepare() { - cmake_src_prepare - - sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \ - -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed" -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HANDBOOK_HTML=no - -DBUILD_HANDBOOK_PDF=no - -DBUILD_HOWTO_HTML=no - -DBUILD_HOWTO_PDF=no - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-text/bibletime/bibletime-3.0.2.ebuild b/app-text/bibletime/bibletime-3.0.3-r4.ebuild index 1e4d38ca16f3..70071451bccf 100644 --- a/app-text/bibletime/bibletime-3.0.2.ebuild +++ b/app-text/bibletime/bibletime-3.0.3-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -11,9 +11,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" +IUSE="doc" -RDEPEND=">=app-text/sword-1.8.1 +RDEPEND=">=app-text/sword-1.8.1[curl,icu] dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -25,11 +26,18 @@ RDEPEND=">=app-text/sword-1.8.1 dev-qt/qtxml:5" DEPEND="${RDEPEND} dev-libs/boost - dev-libs/icu:= - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - net-misc/curl - sys-libs/zlib" + dev-qt/qttest:5" +BDEPEND="dev-qt/linguist-tools:5 + doc? ( + app-text/docbook-xml-dtd + app-text/docbook-xsl-stylesheets + app-text/po4a + dev-libs/libxslt + )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.3-no_indirect_deps.patch +) DOCS=( ChangeLog README.md ) @@ -40,11 +48,14 @@ src_prepare() { -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed" } +# TODO: FOO_HTML_LANGUAGES. Current lists for "all languages": +# handbook: ar br cs de en es fi fr hu it ko lt nl pt_BR ru th uk +# howto: ar bg br cs da de en es fi fr hu it ja ko lt nl pt_BR ru th uk src_configure() { local mycmakeargs=( - -DBUILD_HANDBOOK_HTML=no + -DBUILD_HANDBOOK_HTML=$(usex doc) -DBUILD_HANDBOOK_PDF=no - -DBUILD_HOWTO_HTML=no + -DBUILD_HOWTO_HTML=$(usex doc) -DBUILD_HOWTO_PDF=no ) cmake_src_configure diff --git a/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch b/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch new file mode 100644 index 000000000000..87a129c9d80b --- /dev/null +++ b/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch @@ -0,0 +1,20 @@ +According to documentation upstream build scripts only look for these +packages to try and guess whether support for them has been enabled +in app-text/sword. + +--- a/platforms/common/core/core.pro ++++ b/platforms/common/core/core.pro +@@ -173,13 +173,5 @@ + # Clucene + include(../../common/clucene/clucene.pro) + +-# CURL +-# optional +-curl:include(../../common/curl/curl.pro) +- +-# ICU +-# optional +-icu:include(../../common/icu/icu.pro) +- + # Sword + include(../../common/sword/sword.pro) diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest index c72c9c3707b5..0bde49383a5d 100644 --- a/app-text/bibutils/Manifest +++ b/app-text/bibutils/Manifest @@ -1 +1 @@ -DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911 +DIST bibutils_7.1_src.tgz 620141 BLAKE2B f020ea7c8164a870ef4c72defae1adc11558661a7ae9f3b037115cfc4a9e71b4f37c64f3b74641182300c3e921b8a0c309257a468b6b32f4fc2915e4a36f04d1 SHA512 2a155ca60c97d37941c860635d8e6920bd78de84452e1fee93a2f7331392f6a43f2c10055e84349bcac89314025d1524fd5cc73c47ad1613baa7baf2667c3f33 diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-7.1.ebuild index 9b7f812f98cf..ba4d79b4ef6d 100644 --- a/app-text/bibutils/bibutils-6.10.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,14 +8,13 @@ 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" SLOT="0" KEYWORDS="amd64 ~ppc ~x86" -S="${WORKDIR}/${MY_P}" - src_prepare() { default sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die @@ -42,7 +41,3 @@ src_test() { DISTRO_CFLAGS="${CFLAGS}" \ LDFLAGSIN="${LDFLAGS}" test } - -src_install() { - emake DESTDIR="${ED}" install -} diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild index 0285f93dbe53..fce82cc6b67d 100644 --- a/app-text/binfind/binfind-0.0.3.ebuild +++ b/app-text/binfind/binfind-0.0.3.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Search files for a byte sequence specified on the command line" HOMEPAGE="https://www.lith.at/binfind/" @@ -9,5 +11,14 @@ SRC_URI="https://www.lith.at/binfind/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + eautoreconf #870832 +} diff --git a/app-text/binfind/files/binfind-0.0.3-clang16.patch b/app-text/binfind/files/binfind-0.0.3-clang16.patch new file mode 100644 index 000000000000..12a7174ec0e9 --- /dev/null +++ b/app-text/binfind/files/binfind-0.0.3-clang16.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/870832 +--- a/configure.in ++++ b/configure.in +@@ -26,4 +26,5 @@ + [#include <stdio.h> + #include <stdlib.h> ++ #include <string.h> + + int main(void) 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-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild index 9e5e3851e780..e8daaacf166e 100644 --- a/app-text/blahtexml/blahtexml-0.9.ebuild +++ b/app-text/blahtexml/blahtexml-0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz" LICENSE="BSD CC-BY-3.0 ZLIB" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86" IUSE="doc" RDEPEND="dev-libs/xerces-c" 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 75b899156927..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-2021 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" + 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 75b899156927..d67ef789f4f1 100644 --- a/app-text/blogc/blogc-9999.ebuild +++ b/app-text/blogc/blogc-9999.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,7 +13,7 @@ else fi if [[ ${PV} = *9999* ]]; then - BDEPEND="app-text/ronn" + BDEPEND="app-text/ronn-ng" else KEYWORDS="~amd64 ~x86" fi diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild index a8a12ad1ae77..36d1547efe1d 100644 --- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild +++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild @@ -37,6 +37,7 @@ src_configure() { } src_install() { - make DESTDIR="${D}" install || die + default + dodoc README NEWS ChangeLog AUTHORS } diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest index 66484e06090d..7be41d51f5d6 100644 --- a/app-text/build-docbook-catalog/Manifest +++ b/app-text/build-docbook-catalog/Manifest @@ -1 +1,2 @@ -DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc +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-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild index faaa5b36fd23..38a0dee4c042 100644 --- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild +++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" DESCRIPTION="DocBook XML catalog auto-updater" HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~haubi/distfiles/${P}.tar.xz" +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 ~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 || ( sys-apps/util-linux app-misc/getopt ) - !<app-text/docbook-xsl-stylesheets-1.73.1 " 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 } @@ -34,5 +33,6 @@ src_configure() { pkg_postinst() { # New version -> regen files - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog." } 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/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml index 85e4ed814fa2..26bb3d595e67 100644 --- a/app-text/build-docbook-catalog/metadata.xml +++ b/app-text/build-docbook-catalog/metadata.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index d6a70bbcecb2..9ed8144773c2 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,3 +1,12 @@ -DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec -DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae -DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e +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.6.0.tar.xz 43929700 BLAKE2B a529bf32511f8927683d6b89962a2e0e1ca6fb6bf798d9906ae6cf56c4611be21d89c49812c3b3cef02e333b20b4fd00a0b19c5e867c735022a45bafd9991203 SHA512 7bc43fff44d9ec7c5955f2176f0923af08cd7ba9930a49b76ba64808c18a468b005c231bc21c0a9e3758977c1ff9a1a6f7724333b87ae81e32461807976f5488 +DIST calibre-7.6.0.tar.xz.sig 566 BLAKE2B c7fac255eb3ea49aead5780cc8089be253e551d729bb80c3f59bdb269e05e603557dbe8967175a6bb49e88d30673c89b2217c18757b718dba8e5b7d3eb21330c SHA512 a9af6200b27263333e2d3c54e4aea7f7664b6c4d3ba8cdd5958c9eeaf0c7ee4ba7465df57fd526064c44a9d093b246a64ab94819c6235030162f30f7f570b403 +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.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild deleted file mode 100644 index 023d6a32a358..000000000000 --- a/app-text/calibre/calibre-5.16.1-r1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="ipv6(+),sqlite,ssl" - -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils - -DESCRIPTION="Ebook management application" -HOMEPAGE="https://calibre-ebook.com/" -SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz - https://dev.gentoo.org/~zmedico/dist/calibre-5.16.0-SIP-v4.patch.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 - >=sys-apps/dbus-1.10.8 - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${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/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[${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/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] - >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] - ') - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5=[jpeg] - >=dev-qt/qtwebengine-5.12 - 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} - $(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" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then - eerror "Calibre cannot be built with this version of gcc." - eerror "You need at least gcc-6.0" - die "Your C compiler is too old for this package." - fi -} - -src_prepare() { - # no_updates: do not annoy user with "new version is availible all the time - # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface - eapply \ - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" \ - "${FILESDIR}/${P}-zeroconf.patch" - - if ! has_version ">=dev-python/sip-5"; then - einfo "Applying SIP v4 patch because SIP v5 was not detected" - eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch" - fi - - eapply_user - - # 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 "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ -'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ -'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ -'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', '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_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="${EPREFIX}/usr/$(get_libdir)/qt5/bin/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.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild deleted file mode 100644 index 475b78a4790c..000000000000 --- a/app-text/calibre/calibre-5.25.0-r2.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="ipv6(+),sqlite,ssl" - -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 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/snowball-stemmer:= - >=sys-apps/dbus-1.10.8 - $(python_gen_cond_dep ' - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${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[${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/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.12[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] - ') - dev-qt/qtcore:5= - dev-qt/qtdbus:5= - dev-qt/qtgui:5=[jpeg] - >=dev-qt/qtwebengine-5.12 - 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} - $(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" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then - eerror "Calibre cannot be built with this version of gcc." - eerror "You need at least gcc-6.0" - die "Your C compiler is too old for this package." - fi -} - -src_prepare() { - # no_updates: do not annoy user with "new version is availible all the time - # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface - eapply \ - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" - - eapply_user - - # 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 "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ -'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ -'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ -'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', '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_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="${EPREFIX}/usr/$(get_libdir)/qt5/bin/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.44.0-r3.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild new file mode 100644 index 000000000000..fefe407084e6 --- /dev/null +++ b/app-text/calibre/calibre-5.44.0-r3.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="ipv6(+),sqlite,ssl" + +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 + 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="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/podofo-0.10:= + 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/cchardet[${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/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/zeroconf[${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,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-gfx/optipng-0.7.6 + virtual/libusb:1= + 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} + 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/podofo-build-0.9.6_pre20171027 + <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 + # 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" + + # 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() { + 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" + 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" + + # 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="$(qt5_get_bindir)/qmake" + + ${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: + 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() { + # 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 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 + + "${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" || die + + cp -r man-pages/ "${ED}"/usr/share/man || die + + find "${ED}"/usr/share -type d -empty -delete || die + + einfo "Converting python shebangs" + python_fix_shebang "${ED}/usr/bin" + + 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_postinst() { + 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-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.6.0.ebuild b/app-text/calibre/calibre-7.6.0.ebuild new file mode 100644 index 000000000000..d0df8273c381 --- /dev/null +++ b/app-text/calibre/calibre-7.6.0.ebuild @@ -0,0 +1,242 @@ +# 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 ~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/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.7.0.ebuild b/app-text/calibre/calibre-7.7.0.ebuild new file mode 100644 index 000000000000..fc786f35d76c --- /dev/null +++ b/app-text/calibre/calibre-7.7.0.ebuild @@ -0,0 +1,242 @@ +# 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 ~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/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.8.0.ebuild b/app-text/calibre/calibre-7.8.0.ebuild new file mode 100644 index 000000000000..fc786f35d76c --- /dev/null +++ b/app-text/calibre/calibre-7.8.0.ebuild @@ -0,0 +1,242 @@ +# 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 ~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/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.16.1-zeroconf.patch b/app-text/calibre/files/calibre-5.16.1-zeroconf.patch deleted file mode 100644 index 68c09d219c60..000000000000 --- a/app-text/calibre/files/calibre-5.16.1-zeroconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --color -Naru a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py ---- a/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:32:03.104016444 +0200 -+++ b/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:33:30.699018403 +0200 -@@ -2040,13 +2040,6 @@ - # Function to monkeypatch zeroconf to remove the 15 character name length restriction. - # Copied from https://github.com/jstasiak/python-zeroconf version 0.28.1 - -- --from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -- _HAS_ASCII_CONTROL_CHARS, -- _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -- -- - def service_type_name(type_: str, *, allow_underscores: bool = False) -> str: - """ - Validate a fully qualified service name, instance or subtype. [rfc6763] -@@ -2087,6 +2080,12 @@ - :param type_: Type, SubType or service name to validate - :return: fully qualified service name (eg: _http._tcp.local.) - """ -+ -+ from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE, -+ _HAS_ASCII_CONTROL_CHARS, -+ _HAS_ONLY_A_TO_Z_NUM_HYPHEN) -+ - if not (type_.endswith('._tcp.local.') or type_.endswith('._udp.local.')): - raise BadTypeInNameException("Type '%s' must end with '._tcp.local.' or '._udp.local.'" % type_) - diff --git a/app-text/calibre/files/calibre-5.35.0-jxr-test.patch b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch new file mode 100644 index 000000000000..bec72c15cb8b --- /dev/null +++ b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch @@ -0,0 +1,24 @@ +Avoid calling libjxr's JxrDecApp as we currently don't package it. +--- a/src/calibre/utils/img.py ++++ b/src/calibre/utils/img.py +@@ -118,8 +118,6 @@ + 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 + +@@ -645,11 +643,6 @@ + despeckle_image(img) + remove_borders_from_image(img) + image_to_data(img, fmt='GIF') +- raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'], +- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0, +- stdout=subprocess.PIPE).stdout.read() +- if b'JPEG XR Decoder Utility' not in raw: +- raise SystemExit('Failed to run JxrDecApp') + # }}} + + 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/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch deleted file mode 100644 index 9ef1dd04251d..000000000000 --- a/app-text/calibre/files/calibre-disable_plugins.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code. -Author: Martin Pitt <mpitt@debian.org> -Bug-Debian: http://bugs.debian.org/640026 - -Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py -=================================================================== ---- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100 -+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100 -@@ -28,8 +28,6 @@ - pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config) - cm('welcome wizard', _('Run welcome wizard'), - icon='wizard.png', triggered=self.gui.run_wizard) -- cm('plugin updater', _('Get plugins to enhance calibre'), -- icon='plugins/plugin_updater.png', triggered=self.get_plugins) - if not DEBUG: - pm.addSeparator() - cm('restart', _('Restart in debug mode'), icon='debug.png', diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml index 8165729d6a4a..7d12d7b1b414 100644 --- a/app-text/calibre/metadata.xml +++ b/app-text/calibre/metadata.xml @@ -4,7 +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 0e5d70ae2ad9..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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -13,12 +13,13 @@ MY_PV=$(ver_rs 2 '-') DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service" HOMEPAGE="https://github.com/lbatalha/capyt https://pypi.org/project/capyt/" -SRC_URI="https://github.com/lbatalha/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/lbatalha/capyt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" 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/cb2bib-2.0.0-r1.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild index 746edabdcd52..3d9e11dc7cea 100644 --- a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild +++ b/app-text/cb2bib/cb2bib-2.0.0-r1.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="https://www.molspaces.com/dl/progs/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="+lzo" DEPEND=" @@ -51,6 +51,8 @@ src_install() { } pkg_postinst() { + xdg_desktop_database_update + elog "For best functionality, emerge the following packages:" elog " app-text/poppler[utils] - for data import from PDF files" elog " app-text/dvipdfm - for data import from DVI files" @@ -62,10 +64,6 @@ pkg_postinst() { elog " nice printing through the shell script bib2pdf" } -pkg_postinst() { - xdg_desktop_database_update -} - pkg_postrm() { xdg_desktop_database_update } 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-r1.ebuild b/app-text/cedilla/cedilla-0.7-r1.ebuild new file mode 100644 index 000000000000..29e28dfbb633 --- /dev/null +++ b/app-text/cedilla/cedilla-0.7-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="UTF-8 to postscript converter" +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" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 x86" + +DEPEND="dev-lisp/clisp" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch ) + +src_compile() { + ./compile-cedilla || die "Compile failed." +} + +src_install() { + sed "s#${ED}##g" -i cedilla || die "sed failed" + dodir /usr/share/man/man1/ + + ./install-cedilla || die "Install failed." + + einstalldocs +} 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/Manifest b/app-text/chasen/Manifest index de495ce1cb55..0a4c5e4b144c 100644 --- a/app-text/chasen/Manifest +++ b/app-text/chasen/Manifest @@ -1 +1 @@ -DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075 +DIST chasen-2.4.5.tar.xz 671064 BLAKE2B 3b9867f794a54c4b0552807c54694e9f52082d9712c9e64aa55840b70f3a3800a514d1cd36260ee7397d1e98f28909e9b3e1f5c14d64f28f666b876e130aeb3e SHA512 7a17fe9d534cdc07c147fd7d9350aba381390943f4cfd899393076efe8e6a80aae029a8d4833e91ffa945b3e52d6598c16db257c9cc8d7792b7a1f90b7a1948e diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.5.ebuild index e8557113ca4b..f6067a33f971 100644 --- a/app-text/chasen/chasen-2.4.4-r3.ebuild +++ b/app-text/chasen/chasen-2.4.5.ebuild @@ -1,39 +1,38 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="8" -inherit epatch perl-module +inherit perl-module DESCRIPTION="Japanese Morphological Analysis System, ChaSen" -HOMEPAGE="http://chasen-legacy.sourceforge.jp/" -SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz" +HOMEPAGE="https://chasen-legacy.osdn.jp/" +SRC_URI="mirror://sourceforge.jp/${PN}-legacy/56305/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~sparc-solaris" +KEYWORDS="amd64 ppc ~ppc64 ~riscv x86" IUSE="perl static-libs" +RDEPEND="virtual/libiconv" DEPEND=">=dev-libs/darts-0.32" -RDEPEND="${DEPEND} - perl? ( !dev-perl/Text-ChaSen )" PDEPEND=">=app-dicts/ipadic-2.7.0" -src_prepare() { - epatch "${FILESDIR}"/${P}-cve-2011-4000.patch -} +PATCHES=( "${FILESDIR}"/${PN}-uar.patch ) src_configure() { econf $(use_enable static-libs static) - if use perl ; then - cd "${S}"/perl + + if use perl; then + cd "${S}"/perl || die perl-module_src_configure fi } src_compile() { default - if use perl ; then + + if use perl; then cd "${S}"/perl || die perl-module_src_compile fi @@ -41,7 +40,8 @@ src_compile() { src_test() { default - if use perl ; then + + if use perl; then cd "${S}"/perl || die perl-module_src_test fi @@ -49,12 +49,11 @@ src_test() { src_install() { default + find "${ED}" -name '*.la' -delete || die - if use perl ; then + if use perl; then cd "${S}"/perl || die perl-module_src_install newdoc README README.perl fi - - find "${ED}" -name '*.la' -delete || die } diff --git a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch deleted file mode 100644 index 61480622e40a..000000000000 --- a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/chalib.c b/lib/chalib.c -index 5d79e13..cddf51b 100644 ---- a/lib/chalib.c -+++ b/lib/chalib.c -@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output) - */ - while (*input) { - int c = 0, len, cursor; -- if ((crlf = strpbrk(input, "\r\n")) == NULL) -+ if ((crlf = strpbrk(input, "\r\n")) == NULL) { - len = strlen(input); -- else { -+ if (len >= CHA_INPUT_SIZE) { -+ len = CHA_INPUT_SIZE - 1; -+ crlf = input + CHA_INPUT_SIZE - 2; -+ c = 0; -+ } -+ } else { - len = crlf - input; - c = *crlf; - *crlf = '\0'; diff --git a/app-text/chasen/files/chasen-uar.patch b/app-text/chasen/files/chasen-uar.patch new file mode 100644 index 000000000000..631e0890f751 --- /dev/null +++ b/app-text/chasen/files/chasen-uar.patch @@ -0,0 +1,44 @@ +--- a/lib/print.c ++++ b/lib/print.c +@@ -997,20 +997,20 @@ + static int + get_compound(mrph_data_t *data, char *headword, darts_t *da, long index) + { +- mrph_t mrph; ++ mrph_t *mrph = data->mrph; + int has_next, hw_len; + char *base = da_get_lex_base(da) + index; + + hw_len = ((short *)base)[0]; + has_next = ((short *)base)[1]; + base += sizeof(short) * 2; +- memcpy(&mrph, base, sizeof(da_lex_t)); +- mrph.headword = headword; +- mrph.headword_len = hw_len; +- mrph.is_undef = 0; +- mrph.darts = da; ++ memcpy(mrph, base, sizeof(da_lex_t)); ++ mrph->headword = headword; ++ mrph->headword_len = hw_len; ++ mrph->is_undef = 0; ++ mrph->darts = da; + +- get_mrph_data(&mrph, data); ++ get_mrph_data(mrph, data); + + return has_next; + } +@@ -1028,10 +1028,13 @@ + cha_printf_mrph(lat, path_num, mdata, format); + } else { + mrph_data_t data; ++ mrph_t m; + long index = mdata->compound; + int has_next = 1; + char *headword = mrph->headword; + ++ data.mrph = &m; ++ + while (has_next) { + has_next = get_compound(&data, headword, mrph->darts, index); + if (!has_next) { diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml index 7f50ab9cb7b4..dfee0f2f129f 100644 --- a/app-text/chasen/metadata.xml +++ b/app-text/chasen/metadata.xml @@ -6,6 +6,6 @@ <name>Cjk</name> </maintainer> <upstream> - <remote-id type="sourceforge-jp">chasen-legacy</remote-id> + <remote-id type="osdn">chasen-legacy</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index 8b27173b2f61..761642d944ca 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1,2 +1,4 @@ -DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54 -DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800 +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.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild deleted file mode 100644 index 8ea8d40b3a31..000000000000 --- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit cmake python-any-r1 xdg-utils - -DESCRIPTION="A hierarchical note taking application (C++ version)" -HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/giuspen/cherrytree" - S="${WORKDIR}/${P}/future" -else - COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523 - SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${COMMIT}/future" -fi - -# 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" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-text/gspell:= - dev-libs/glib:2 - >=dev-cpp/glibmm-2.64.2:2 - dev-cpp/gtkmm:3.0 - dev-cpp/gtksourceviewmm:3.0 - dev-libs/libxml2:2 - dev-cpp/libxmlpp:2.6 - dev-cpp/pangomm:1.4 - dev-db/sqlite:3" -DEPEND="${RDEPEND} - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) - test? ( dev-util/cpputest )" - -pkg_setup() { - python-any-r1_pkg_setup -} - -python_check_deps() { - has_version "dev-python/lxml[${PYTHON_USEDEP}]" -} - -src_prepare() { - # disable compress man pages - sed -i -e \ - '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \ - CMakeLists.txt || die - - if [[ ${PV} != *9999 ]]; then - sed -i \ - -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \ - CMakeLists.txt || die - fi - - python_fix_shebang . - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DPYTHON_EXEC="${PYTHON}" - -DUSE_NLS=$(usex nls) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild b/app-text/cherrytree/cherrytree-1.0.0.ebuild index 2534d1a2e1ca..a757d8026dc5 100644 --- a/app-text/cherrytree/cherrytree-0.99.37.ebuild +++ b/app-text/cherrytree/cherrytree-1.0.0.ebuild @@ -1,24 +1,19 @@ -# 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 -PYTHON_COMPAT=( python3_{7..10} ) +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 https://github.com/giuspen/cherrytree" +HOMEPAGE="https://www.giuspen.com/cherrytree/" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/giuspen/cherrytree" - S="${WORKDIR}/${P}/future" -else - SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -# S="${WORKDIR}/${PN}-${COMMIT}/future" -fi +SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz" +S="${WORKDIR}"/${P/-/_} + +KEYWORDS="~amd64 ~x86" # GPL-3 — future/src/ct (CherryTree) # LGPL-2.1 — future/src/7za (7zip) @@ -30,8 +25,7 @@ IUSE="nls test" # Has deps that aren't available in ::gentoo repo RESTRICT="test" -RDEPEND=" - app-i18n/uchardet +RDEPEND="app-i18n/uchardet app-text/gspell:= >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 @@ -39,29 +33,24 @@ RDEPEND=" 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/libfmt:= dev-libs/libxml2:2 - dev-libs/spdlog + dev-libs/spdlog:= + >=x11-libs/vte-0.70.2:2.91 net-misc/curl - " -DEPEND="${RDEPEND} - $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')" -BDEPEND="${PYTHON_DEPS} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) - test? ( dev-util/cpputest )" + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/pango" -pkg_setup() { - python-any-r1_pkg_setup -} +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" -python_check_deps() { - has_version "dev-python/lxml[${PYTHON_USEDEP}]" -} +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-util/cpputest )" src_prepare() { # disable compress man pages @@ -69,13 +58,7 @@ src_prepare() { '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \ CMakeLists.txt || die - if [[ ${PV} != *9999 ]]; then - sed -i \ - -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \ - CMakeLists.txt || die - fi - -# python_fix_shebang . + # python_fix_shebang . cmake_src_prepare } @@ -84,6 +67,7 @@ src_configure() { -DPYTHON_EXEC="${PYTHON}" -DUSE_NLS=$(usex nls) -DBUILD_TESTING=$(usex test) + -DUSE_SHARED_FMT_SPDLOG=ON ) cmake_src_configure diff --git a/app-text/cherrytree/cherrytree-1.0.1.ebuild b/app-text/cherrytree/cherrytree-1.0.1.ebuild new file mode 100644 index 000000000000..837ea599e0fc --- /dev/null +++ b/app-text/cherrytree/cherrytree-1.0.1.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/cherrytree/releases/download/${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/cherrytree/cherrytree-1.0.2.ebuild b/app-text/cherrytree/cherrytree-1.0.2.ebuild new file mode 100644 index 000000000000..dd062ad78a2f --- /dev/null +++ b/app-text/cherrytree/cherrytree-1.0.2.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/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/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml index 850e860f9c4d..99968430f90d 100644 --- a/app-text/cherrytree/metadata.xml +++ b/app-text/cherrytree/metadata.xml @@ -1,7 +1,14 @@ <?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>gjoandet@gmail.com</email> + <name>Guillermo Joandet</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">giuspen/cherrytree</remote-id> </upstream> diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest index c54ea3ac458e..9405f0d6d887 100644 --- a/app-text/cmark/Manifest +++ b/app-text/cmark/Manifest @@ -1,2 +1,2 @@ -DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112 -DIST cmark-0.30.1.tar.gz 245126 BLAKE2B 4b6b7bcd87f931a50849d70afdd8593131fec6d937a804432444045b90eb6813a56c50e08dbb94bd424e0d5d53f9323f596d1bd2d1ab363bef742fe8d24971a6 SHA512 883bf559874f05af501de9dbce7e08c7297c09ebb26b3e08f55a8a5c43109e47ac14d129a2db31d7f105803e7259e3e104fe4241fd5c1248820a96e5228008f4 +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.1.ebuild b/app-text/cmark/cmark-0.30.3.ebuild index 6dff7a3f62ca..57ce9dc2992a 100644 --- a/app-text/cmark/cmark-0.30.1.ebuild +++ b/app-text/cmark/cmark-0.30.3.ebuild @@ -1,9 +1,9 @@ -# 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 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-any-r1 @@ -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 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.31.0.ebuild index a1db9210003d..9d990ce41277 100644 --- a/app-text/cmark/cmark-0.29.0.ebuild +++ b/app-text/cmark/cmark-0.31.0.ebuild @@ -1,9 +1,9 @@ -# 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 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-any-r1 @@ -12,15 +12,15 @@ HOMEPAGE="https://github.com/commonmark/cmark" SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" -SLOT="0/0.29.0" -KEYWORDS="amd64 ppc ppc64 x86" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="test? ( ${PYTHON_DEPS} )" +BDEPEND="test? ( ${PYTHON_DEPS} )" PATCHES=( - "${FILESDIR}/${P}-python38_tests.patch" + "${FILESDIR}/cmark-0.31.0_fix_api_test.patch" ) pkg_setup() { @@ -30,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.29.0-python38_tests.patch b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch deleted file mode 100644 index 13cd71815941..000000000000 --- a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 92697d564042d5b914048e087e4274c3c71e0055 Mon Sep 17 00:00:00 2001 -From: Christopher Fujino <christopherfujino@gmail.com> -Date: Sun, 12 Jul 2020 16:11:42 -0700 -Subject: [PATCH] replace cgi.escape with html.escape (#656) - ---- - test/normalize.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/normalize.py b/test/normalize.py -index 6073bf01..f8ece18d 100644 ---- a/test/normalize.py -+++ b/test/normalize.py -@@ -13,7 +13,7 @@ class HTMLParseError(Exception): - from html.entities import name2codepoint - import sys - import re --import cgi -+import html - - # Normalization code, adapted from - # https://github.com/karlcow/markdown-testsuite/ -@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs): - self.output += ("=" + '"' + - urllib.quote(urllib.unquote(v), safe='/') + '"') - elif v != None: -- self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"') -+ self.output += ("=" + '"' + html.escape(v,quote=True) + '"') - self.output += ">" - self.last_tag = tag - self.last = "starttag" 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/code2html/metadata.xml b/app-text/code2html/metadata.xml index c4cda555914c..68e754003b8f 100644 --- a/app-text/code2html/metadata.xml +++ b/app-text/code2html/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> - Code2HTML converts a program source code to syntax highlighted - HTML. It may be called as a CGI script. It can also handle include - commands in HTML files. -</longdescription> + <!-- maintainer-needed --> + <longdescription> + Code2HTML converts a program source code to syntax highlighted + HTML. It may be called as a CGI script. It can also handle include + commands in HTML files. + </longdescription> </pkgmetadata> diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild deleted file mode 100644 index 840c6a5c1e1e..000000000000 --- a/app-text/convertlit/convertlit-1.8-r3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P="clit${PV//./}" - -DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)" -HOMEPAGE="http://www.convertlit.com/" -SRC_URI="http://www.convertlit.com/${MY_P}src.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -RDEPEND=">=dev-libs/libtommath-0.36-r1" - -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/${P}-respectflags-r1.patch" - "${FILESDIR}/fix-Wformat-security-warnings.patch" - "${FILESDIR}/support-ar-variable.patch" -) - -src_compile() { - tc-export CC - - cd "${S}/lib" || die "failed to change into ${S}/lib directory" - emake - cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory" - emake -} - -src_install() { - einstalldocs - dobin "${MY_P}/clit" -} diff --git a/app-text/convertlit/convertlit-1.8-r4.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild new file mode 100644 index 000000000000..43fda1a62dee --- /dev/null +++ b/app-text/convertlit/convertlit-1.8-r4.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +MY_P="clit${PV//./}" + +DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)" +HOMEPAGE="http://www.convertlit.com/" +SRC_URI="http://www.convertlit.com/${MY_P}src.zip" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=">=dev-libs/libtommath-0.36-r1" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}"/${P}-respectflags-r1.patch + "${FILESDIR}"/fix-Wformat-security-warnings.patch + "${FILESDIR}"/support-ar-variable.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_compile() { + tc-export AR CC + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + emake -C lib + emake -C ${MY_P} +} + +src_install() { + dobin ${MY_P}/clit + einstalldocs +} diff --git a/app-text/convertlit/files/convertlit-1.8-clang16.patch b/app-text/convertlit/files/convertlit-1.8-clang16.patch new file mode 100644 index 000000000000..13d5786c13f9 --- /dev/null +++ b/app-text/convertlit/files/convertlit-1.8-clang16.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/870946 +--- a/clit18/display.c ++++ b/clit18/display.c +@@ -24,2 +24,3 @@ + #include <stdlib.h> ++#include <string.h> + #include "litlib.h" +--- a/clit18/drm5.c ++++ b/clit18/drm5.c +@@ -32,2 +32,3 @@ + #include <string.h>
++#include <ctype.h>
+ #include <assert.h>
+--- a/clit18/explode.c ++++ b/clit18/explode.c +@@ -26,2 +26,3 @@ + #include <string.h>
++#include <sys/stat.h>
+ #include "clit.h"
+--- a/clit18/hexdump.c ++++ b/clit18/hexdump.c +@@ -18,2 +18,3 @@ + #include <stdlib.h> ++#include <string.h> + +--- a/clit18/manifest.c ++++ b/clit18/manifest.c +@@ -25,2 +25,3 @@ + #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/transmute.c ++++ b/clit18/transmute.c +@@ -24,2 +24,3 @@ + #include <stdlib.h> ++#include <string.h> + #include "litlib.h" +--- a/lib/litsections.c ++++ b/lib/litsections.c +@@ -33,2 +33,3 @@ + #include "litinternal.h"
++#include "lzx/lzx.h"
+ #include "lzx.h"
+--- a/lib/newlzx/lzxglue.c ++++ b/lib/newlzx/lzxglue.c +@@ -30,2 +30,3 @@ + #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest index 2b209844456d..0fa5c9d870bc 100644 --- a/app-text/convmv/Manifest +++ b/app-text/convmv/Manifest @@ -1,2 +1 @@ -DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125 diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild deleted file mode 100644 index 2ab22aafa42a..000000000000 --- a/app-text/convmv/convmv-2.04.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="convert filenames to utf8 or any other charset" -HOMEPAGE="https://www.j3e.de/linux/convmv/" -SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc CREDITS Changes TODO VERSION -} - -src_test() { - unpack ./testsuite.tar - - cd "${S}"/suite - ./dotests.sh || die "Tests failed" -} diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild index 12ab21e7e29b..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-2020 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/convmv/convmv-2.05.ebuild b/app-text/convmv/convmv-2.05.ebuild deleted file mode 100644 index 59f68eebfee8..000000000000 --- a/app-text/convmv/convmv-2.05.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="convert filenames to utf8 or any other charset" -HOMEPAGE="https://www.j3e.de/linux/convmv/" -SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc CREDITS Changes TODO VERSION -} - -src_test() { - unpack ./testsuite.tar - - cd "${S}"/suite || die - ./dotests.sh || die "Tests failed" -} diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml index 2ac0eef8d76b..ec151f29d1be 100644 --- a/app-text/convmv/metadata.xml +++ b/app-text/convmv/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> </pkgmetadata> diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest deleted file mode 100644 index d0f98b60e95b..000000000000 --- a/app-text/coolreader/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161 -DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6 -DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6 diff --git a/app-text/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild deleted file mode 100644 index 7e824ab85bc6..000000000000 --- a/app-text/coolreader/coolreader-3.2.57.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 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 - media-libs/libpng:0 - virtual/jpeg:0 - media-libs/freetype - dev-libs/fribidi - media-libs/fontconfig - media-libs/harfbuzz - dev-libs/libunibreak - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - !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 ) )" - -src_prepare() { - cmake_src_prepare - xdg_src_prepare - - # 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=(-D GUI=WX) - else - local mycmakeargs=(-D GUI=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/coolreader-3.2.58.ebuild b/app-text/coolreader/coolreader-3.2.58.ebuild deleted file mode 100644 index 32e43b6cdee3..000000000000 --- a/app-text/coolreader/coolreader-3.2.58.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 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 - media-libs/libpng:0 - virtual/jpeg:0 - media-libs/freetype - dev-libs/fribidi - media-libs/fontconfig - media-libs/harfbuzz - dev-libs/libunibreak - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - !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 ) )" - -src_prepare() { - cmake_src_prepare - xdg_src_prepare - - # 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=(-D GUI=WX) - else - local mycmakeargs=(-D GUI=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/coolreader-3.2.59-r1.ebuild b/app-text/coolreader/coolreader-3.2.59-r1.ebuild deleted file mode 100644 index e8422f1bb4a3..000000000000 --- a/app-text/coolreader/coolreader-3.2.59-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 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 - virtual/jpeg:0 - 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} ) - !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 d51eccb7c80f..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="sourceforge">crengine</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest new file mode 100644 index 000000000000..e31b16954f84 --- /dev/null +++ b/app-text/crengine-ng/Manifest @@ -0,0 +1,2 @@ +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.11.ebuild b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild new file mode 100644 index 000000000000..f8228762d42d --- /dev/null +++ b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +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 + test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )" + +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:=[truetype] ) + libunibreak? ( dev-libs/libunibreak:= ) + fribidi? ( dev-libs/fribidi ) + zstd? ( app-arch/zstd:= ) + libutf8proc? ( dev-libs/libutf8proc:= ) + fontconfig? ( media-libs/fontconfig )" + +RDEPEND="${CDEPEND}" +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_BUILD_TYPE="Release" + local mycmakeargs=( + -DCRE_BUILD_SHARED=ON + -DCRE_BUILD_STATIC=$(usex static-libs) + -DUSE_COLOR_BACKBUFFER=ON + -DWITH_LIBPNG=$(usex png) + -DWITH_LIBJPEG=$(usex jpeg) + -DWITH_FREETYPE=ON + -DWITH_HARFBUZZ=$(usex harfbuzz) + -DWITH_LIBUNIBREAK=$(usex libunibreak) + -DWITH_FRIBIDI=$(usex fribidi) + -DWITH_ZSTD=$(usex zstd) + -DWITH_UTF8PROC=$(usex libutf8proc) + -DUSE_GIF=$(usex gif) + -DUSE_NANOSVG=$(usex svg) + -DUSE_CHM=$(usex chm) + -DUSE_ANTIWORD=ON + -DUSE_FONTCONFIG=$(usex fontconfig) + -DUSE_SHASUM=OFF + -DUSE_CMARK_GFM=ON + -DBUILD_TOOLS=OFF + -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 new file mode 100644 index 000000000000..8fec2108c8d1 --- /dev/null +++ b/app-text/crengine-ng/metadata.xml @@ -0,0 +1,27 @@ +<?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> + <name>Andrey Grozin</name> + </maintainer> + <maintainer type="person"> + <email>valexlin@gmail.com</email> + <name>Aleksey Chernov</name> + <description>upstream</description> + </maintainer> + <longdescription lang="en"> + A fork of coolreader engine. Supported formats are: fb2 (including fb2.zip), fb3, + 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> + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag> + <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> + </use> + <upstream> + <remote-id type="gitlab">coolreader-ng/crengine-ng</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/crf++/crf++-0.58-r1.ebuild b/app-text/crf++/crf++-0.58-r1.ebuild new file mode 100644 index 000000000000..c10b4b472085 --- /dev/null +++ b/app-text/crf++/crf++-0.58-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 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 ) +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++/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++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild deleted file mode 100644 index 006c97d4b825..000000000000 --- a/app-text/crf++/crf++-0.58.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools - -MY_P="${P^^[crf]}" - -DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data" -HOMEPAGE="https://taku910.github.io/crfpp/" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" - -LICENSE="|| ( BSD LGPL-2.1 )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples static-libs" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch ) -HTML_DOCS=( doc/. ) - -src_prepare() { - sed -i \ - -e "/CFLAGS/s/-O3/${CFLAGS}/" \ - -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \ - configure.in - - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_test() { - local d - for d in example/*; do - cd "${d}" - ./exec.sh || die "failed test in ${d}" - cd - >/dev/null - done -} - -src_install() { - emake DESTDIR="${D}" install - einstalldocs - - if use examples; then - docompress -x /usr/share/doc/${PF}/example - insinto /usr/share/doc/${PF} - doins -r example - fi - - if ! use static-libs; then - find "${ED}" -name "*.la" -type f -delete || die - fi -} diff --git a/app-text/crf++/files/crf++-0.58-autotools.patch b/app-text/crf++/files/crf++-0.58-autotools.patch new file mode 100644 index 000000000000..df3584432bbe --- /dev/null +++ b/app-text/crf++/files/crf++-0.58-autotools.patch @@ -0,0 +1,23 @@ +--- a/configure.in ++++ b/configure.in +@@ -49,10 +49,8 @@ + dnl + dnl check gcc + dnl +-if test -n "$GCC"; then +- CFLAGS="-O3 -Wall"; +- CXXFLAGS="-O3 -Wall"; +-fi ++CFLAGS="${CFLAGS} -Wall" ++CXXFLAGS="${CXXFLAGS} -Wall" + + AC_DEFUN(ADD_CC_FLAG, [ + AC_MSG_CHECKING(whether ${CC-cc} accepts $1) +@@ -285,6 +283,6 @@ + AC_MSG_RESULT([yes]) + + AC_SUBST(datarootdir) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_OUTPUT([Makefile Makefile.msvc swig/version.h]) + 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/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch deleted file mode 100644 index afff7edc0707..000000000000 --- a/app-text/crf++/files/crf++-automake-1.13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -240,6 +240,6 @@ - AC_MSG_RESULT([yes]) - - AC_SUBST(datarootdir) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT([Makefile Makefile.msvc swig/version.h]) - diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r2.ebuild index 5a800a9ab6ee..a5d4a7b851d4 100644 --- a/app-text/crm114/crm114-20100106-r1.ebuild +++ b/app-text/crm114/crm114-20100106-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 @@ -13,30 +13,29 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples mew mimencode nls normalizemime test" +IUSE="examples mew nls normalizemime test" RESTRICT="!test? ( test )" RDEPEND=" dev-libs/tre mew? ( app-emacs/mew ) - mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime )" DEPEND="${RDEPEND} test? ( sys-apps/miscfiles )" 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 - if use mimencode; then - sed \ - -e 's%#:mime_decoder: /mimencode -u/%:mime_decoder: /mimencode -u/%' \ - -e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \ - -i mailfilter.cf || die - elif use normalizemime; then + if use normalizemime; then sed \ -e 's%#:mime_decoder: /normalizemime/%:mime_decoder: /normalizemime/%' \ -e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \ 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/crm114/metadata.xml b/app-text/crm114/metadata.xml index db1d29d93254..7b416c13cddd 100644 --- a/app-text/crm114/metadata.xml +++ b/app-text/crm114/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="mew">Add support for using the mewdecode mime decoder (<pkg>app-emacs/mew</pkg>)</flag> - <flag name="mimencode">Add support for using the mimencode mime (<pkg>net-mail/metamail</pkg>)</flag> <flag name="normalizemime">Add support for using the normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag> </use> <upstream> diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest new file mode 100644 index 000000000000..2c58fcc18213 --- /dev/null +++ b/app-text/crqt-ng/Manifest @@ -0,0 +1 @@ +DIST crqt-ng-1.0.13.tar.bz2 444509 BLAKE2B 7f69f1ea509cff8610f62539a66c9ce7a805660da6c4188c7e0c966b1f3f63932302ace0b70e0a21c2eaa7dfbfba1ef37ceda7e64b520d248eeb671d3f35ff1d SHA512 7857efedb641635e386ca16cdb8789b77641e593bf78f3a89ed0ac8c3d91d87c14de8cf32722b36290261c55975ea250768ac525caa279b15a35bddbde62609c diff --git a/app-text/crqt-ng/crqt-ng-1.0.13.ebuild b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild new file mode 100644 index 000000000000..de0e7855551b --- /dev/null +++ b/app-text/crqt-ng/crqt-ng-1.0.13.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 new file mode 100644 index 000000000000..3816f988544b --- /dev/null +++ b/app-text/crqt-ng/metadata.xml @@ -0,0 +1,27 @@ +<?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> + <name>Andrey Grozin</name> + </maintainer> + <maintainer type="person"> + <email>valexlin@gmail.com</email> + <name>Aleksey Chernov</name> + <description>upstream</description> + </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, md, html, chm, pdb, mobi (without DRM), txt, trc, prc. + </longdescription> + <use> + <flag name="chm">Support chm format</flag> + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag> + <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> + </use> + <upstream> + <remote-id type="gitlab">coolreader-ng/crqt-ng</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest new file mode 100644 index 000000000000..14942f26777b --- /dev/null +++ b/app-text/crwx-ng/Manifest @@ -0,0 +1 @@ +DIST crwx-ng-0.3.1.tar.bz2 363898 BLAKE2B f44434014ec773c603f2497fd78236897e7988b46dc7697b2aaad7da6eb0a6334723bf6fd73b95960d835b762562fb809bc3aee6aa5ee06557b9fb442ef7aa07 SHA512 7f4c5de17ed32dc18aa7ef58f56090753c6fd4e87d3be6072ecb225f3339f1dacde8b54ec5b79bf031e3082067a00eb66008842248a819fe8c6af9eb6d080662 diff --git a/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild new file mode 100644 index 000000000000..8d503c432457 --- /dev/null +++ b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +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+" +SLOT="0" +KEYWORDS="~amd64 ~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=] + x11-libs/wxGTK:${WX_GTK_VER}[X]" +BDEPEND="${CDEPEND}" +RDEPEND="${CDEPEND} + virtual/ttf-fonts" + +pkg_prepare() { + setup-wxwidgets +} diff --git a/app-text/crwx-ng/metadata.xml b/app-text/crwx-ng/metadata.xml new file mode 100644 index 000000000000..8ff6a0b3b831 --- /dev/null +++ b/app-text/crwx-ng/metadata.xml @@ -0,0 +1,27 @@ +<?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> + <name>Andrey Grozin</name> + </maintainer> + <maintainer type="person"> + <email>valexlin@gmail.com</email> + <name>Aleksey Chernov</name> + <description>upstream</description> + </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, md, html, chm, pdb, mobi (without DRM), txt, trc, prc. + </longdescription> + <use> + <flag name="chm">Support chm format</flag> + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag> + <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> + </use> + <upstream> + <remote-id type="gitlab">coolreader-ng/crwx-ng</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/cssmin/Manifest b/app-text/cssmin/Manifest new file mode 100644 index 000000000000..ea1eaab6805d --- /dev/null +++ b/app-text/cssmin/Manifest @@ -0,0 +1 @@ +DIST cssmin-0.2.0.tar.gz 3228 BLAKE2B 2322d7c38e334234b11292c24752549404ce8c70068c6c70a1c6e227a9f63a721a923dbb3006199df2e96fc5c0aba44349a6d8ce33791aff2dc1275e186b8961 SHA512 9422152578bf28cf7c3eb063c1f0dd3604a3d8fa73cd81cde09ae297ab27669126c230ef40a2e8c37083c1e781ab977554f9012e60979fe431ceb83d43452a9d diff --git a/app-text/cssmin/cssmin-0.2.0-r1.ebuild b/app-text/cssmin/cssmin-0.2.0-r1.ebuild new file mode 100644 index 000000000000..4ebe24c1333d --- /dev/null +++ b/app-text/cssmin/cssmin-0.2.0-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 2021-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="Python port of the YUI CSS compression algorithm" +HOMEPAGE=" + https://pypi.org/project/cssmin/ + https://github.com/zacharyvoase/cssmin/ +" + +LICENSE="MIT BSD" +SLOT="0" +KEYWORDS="amd64 arm64 x86" diff --git a/app-text/cssmin/metadata.xml b/app-text/cssmin/metadata.xml new file mode 100644 index 000000000000..48e52c4496a4 --- /dev/null +++ b/app-text/cssmin/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="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">cssmin</remote-id> + <remote-id type="github">zacharyvoase/cssmin</remote-id> + </upstream> +</pkgmetadata> 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 25b8dac1a7a3..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-2020 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" @@ -16,6 +16,7 @@ IUSE="" PATCHES=( "${FILESDIR}"/${PN}-0.96-pcm.patch "${FILESDIR}"/${PN}-0.94-asneeded.patch + "${FILESDIR}"/${PN}-0.96-fix-missing-include.patch ) DOCS=( Changes README TODO ) diff --git a/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch b/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch new file mode 100644 index 000000000000..bc52d0563376 --- /dev/null +++ b/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch @@ -0,0 +1,11 @@ +index 3995cc3..2fd6ae6 100644 +--- morse.c ++++ morse.c +@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + #include <stdio.h> ++#include <ctype.h> + + #include "cw.h" + #include "morse.h" diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest deleted file mode 100644 index 931465f405e3..000000000000 --- a/app-text/dbacl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372 -DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9 diff --git a/app-text/dbacl/dbacl-1.14.1.ebuild b/app-text/dbacl/dbacl-1.14.1.ebuild deleted file mode 100644 index ee861dd57ff3..000000000000 --- a/app-text/dbacl/dbacl-1.14.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Digramic Bayesian text classifier" -HOMEPAGE="http://www.lbreyer.com/gpl.html" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="interactive" - -RDEPEND="interactive? ( - sys-libs/slang:= - sys-libs/readline:= - sys-libs/ncurses:= )" - -DEPEND="${RDEPEND}" - -src_prepare() { - # See bug #352636 for reference - export ac_cv_lib_ncurses_initscr=$(usex interactive) - export ac_cv_lib_readline_readline=$(usex interactive) - export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive) - default -} diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild deleted file mode 100644 index 2d58f06146d4..000000000000 --- a/app-text/dbacl/dbacl-1.14.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Digramic Bayesian text classifier" -HOMEPAGE="http://www.lbreyer.com/gpl.html" -SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="interactive" - -RDEPEND="interactive? ( - sys-libs/slang:= - sys-libs/readline:= - sys-libs/ncurses:= )" - -DEPEND="${RDEPEND}" - -src_prepare() { - # See bug #352636 for reference - export ac_cv_lib_ncurses_initscr=$(usex interactive) - export ac_cv_lib_readline_readline=$(usex interactive) - export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive) -} diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml deleted file mode 100644 index a7fbda3ebab2..000000000000 --- a/app-text/dbacl/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<use> -<flag name="interactive">Enable the interactive mailinspect ability</flag> -</use> -<longdescription>dbacl is a fast Bayesian text and email classifier. It builds a variety of language models using maximum entropy (minimum divergence) principles, and these can then be used to categorize input data automatically among multiple categories.</longdescription> -</pkgmetadata> diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild index 37b46061e629..9524dda5731f 100644 --- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild +++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9,10} ) inherit distutils-r1 diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12-r1.ebuild index cad3460da6c1..8ea4d20f5ee6 100644 --- a/app-text/dblatex/dblatex-0.3.12.ebuild +++ b/app-text/dblatex/dblatex-0.3.12-r1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +# Breaks installation of /usr/bin/dblatex, bug #906788 +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 @@ -13,8 +15,9 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="inkscape" +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 @@ -34,6 +37,8 @@ RDEPEND=" inkscape? ( media-gfx/inkscape ) " DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND} + test? ( ~${CATEGORY}/${P} )" S="${WORKDIR}/${PN}3-${PV}" @@ -58,3 +63,7 @@ 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/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/dblatex/metadata.xml b/app-text/dblatex/metadata.xml index 84b40f0ce16d..104575f56ef3 100644 --- a/app-text/dblatex/metadata.xml +++ b/app-text/dblatex/metadata.xml @@ -10,7 +10,7 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="inkscape">Use inkscape to convert SVG. Disable to use gnome-base/librsvg instead.</flag> + <flag name="inkscape">Use inkscape to convert SVG. Disable to use <pkg>gnome-base/librsvg</pkg> instead.</flag> </use> <longdescription> dbaltex is an opensource DocBook to LaTeX publishing software 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-r3.ebuild b/app-text/dictd/dictd-1.13.0-r7.ebuild index 81eadd890466..92b0cb5bd7c5 100644 --- a/app-text/dictd/dictd-1.13.0-r3.ebuild +++ b/app-text/dictd/dictd-1.13.0-r7.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit readme.gentoo-r1 systemd +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 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,8 +28,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=sys-apps/gawk-3.1.6 - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc test? ( !~sys-apps/gawk-4.2.1 ) " @@ -45,14 +45,15 @@ DOC_CONTENTS=" 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 ) src_prepare() { default - if [[ ${CHOST} == *-darwin* ]]; then - sed -i -e 's:libtool:glibtool:g' Makefile.in || die - fi + eautoreconf } src_configure() { @@ -64,27 +65,31 @@ src_configure() { } src_compile() { + # -j1 for bug #743292 + if use minimal; then - emake dictfmt dictzip dictzip + emake -j1 dictfmt dictzip dictzip else - emake + 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 test + + emake -j1 test } src_install() { if use minimal; then - emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt + emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt else default 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-lex.patch b/app-text/dictd/files/dictd-1.13.0-lex.patch new file mode 100644 index 000000000000..c69758c4805d --- /dev/null +++ b/app-text/dictd/files/dictd-1.13.0-lex.patch @@ -0,0 +1,28 @@ +From: orbea <orbea@riseup.net> +Date: Sat, 18 Jun 2022 09:10:18 -0700 +Subject: [PATCH] build: Fix implicit function declarations + +--- a/clientparse.y ++++ b/clientparse.y +@@ -24,6 +24,9 @@ + #define YYERROR_VERBOSE + + static dictServer *s; ++ ++int yylex(); ++void yyerror(const char *s); + %} + + %union { +--- a/servparse.y ++++ b/servparse.y +@@ -30,6 +30,9 @@ + + static dictDatabase *db; + ++int yylex(); ++void yyerror(const char *s); ++ + static int string2bool (const char *str) + { + if ( diff --git a/app-text/dictd/files/dictd-1.13.0-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch new file mode 100644 index 000000000000..f687a182f60f --- /dev/null +++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/818535 + +From: orbea <orbea@riseup.net> +Date: Fri, 17 Jun 2022 16:18:40 -0700 +Subject: [PATCH] configure: Add missing LT_INIT + +--- a/Makefile.in ++++ b/Makefile.in +@@ -28,6 +28,7 @@ endif + + .SUFFIXES: + ++top_builddir= @top_builddir@ + srcdir= @srcdir@ + VPATH= @srcdir@:. + prefix= @prefix@ +--- a/configure.in ++++ b/configure.in +@@ -35,6 +35,8 @@ AC_INIT([dict],[VERSION],[dict-beta@dict.org]) + AC_CONFIG_SRCDIR([dictd.c]) + AC_CONFIG_HEADER(config.h) + ++LT_INIT ++ + echo Configuring for dict + echo . + +@@ -70,13 +72,10 @@ echo Checking for programs + + AC_PROG_AWK + AC_PROG_INSTALL +-AC_PROG_RANLIB + AC_PROG_MAKE_SET + AC_PROG_YACC + AC_PROG_LEX + +-AC_CHECK_PROG(LIBTOOL,libtool,libtool) +- + AC_CHECK_PROGS(NROFF,gnroff nroff) + AC_CHECK_PROGS(TROFF,groff troff) + AC_CHECK_PROGS(COL,col cat) +@@ -188,7 +187,6 @@ AC_SUBST(DICT_VERSION) + AC_SUBST(USE_PLUGIN) + AC_SUBST(EXEEXT) + AC_SUBST(allsubdirs) +-AC_SUBST(LIBTOOL) + + AC_SUBST(PLUGINS) + +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -28,6 +28,7 @@ endif + + .SUFFIXES: + ++top_builddir= @top_builddir@ + srcdir= @srcdir@ + VPATH= @srcdir@ + prefix= @prefix@ 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.0-version.patch b/app-text/dictd/files/dictd-1.13.0-version.patch new file mode 100644 index 000000000000..fee60efe22da --- /dev/null +++ b/app-text/dictd/files/dictd-1.13.0-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.0) +- +- + AC_PREREQ(2.53) + AC_REVISION($Revision: 1.144 $) + +-AC_INIT([dict],[VERSION],[dict-beta@dict.org]) ++AC_INIT([dict],[1.13.0],[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/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 e57fab6485bd..33086153aba7 100644 --- a/app-text/diff-pdf/Manifest +++ b/app-text/diff-pdf/Manifest @@ -1 +1 @@ -DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88 +DIST diff-pdf-0.5.1.tar.gz 142541 BLAKE2B db402ee9c0d3013b76b5e20381d661c572206bd834e5ec31824dc9f4aed08e0fcb1d57909b4a7490297c767aaf17efdd522ca4488c63a276ba6fb3f50e74b8b9 SHA512 8f2669da974912023208cdb538256ff979935d64e1f32d547da33d6c8231945ae555f6f85481ef36ec888d3ceda7fdfdddcfbd225f0a891c5f1613be6f249f4f diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild index ec808cb9bab2..1daaf8ab5b42 100644 --- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild +++ b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild @@ -1,13 +1,13 @@ -# 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 -WX_GTK_VER="3.0-gtk3" -inherit autotools wxwidgets +WX_GTK_VER="3.2-gtk3" +inherit wxwidgets DESCRIPTION="A simple tool for visually comparing two PDF files" -HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" +HOMEPAGE="https://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz" # The COPYING.icons file states that two icons were taken from @@ -32,13 +32,6 @@ DEPEND="app-text/poppler[cairo] x11-libs/wxGTK:${WX_GTK_VER}[X]" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" ) - -src_prepare() { - default - eautoreconf -} - src_configure() { setup-wxwidgets default diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch deleted file mode 100644 index ecef020a998a..000000000000 --- a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001 -From: FX Coudert <fxcoudert@gmail.com> -Date: Sat, 12 Dec 2020 16:18:59 +0100 -Subject: [PATCH] Remove legacy poppler-cairo dependency (#69) - -poppler-glib already depended on it, so this is non-breaking, -and it is removed in poppler 0.18.1. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 382e220..2e9b6e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,7 +41,7 @@ AC_LANG(C++) - dnl === Library checks === - - PKG_CHECK_MODULES(POPPLER, -- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf]) -+ [poppler-glib >= 0.10 cairo-pdf]) - - AM_OPTIONS_WXCONFIG - AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base]) 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/ding/Manifest b/app-text/ding/Manifest index 309a55a3e1cc..6081e827bc09 100644 --- a/app-text/ding/Manifest +++ b/app-text/ding/Manifest @@ -1,2 +1 @@ -DIST ding-1.8.1.tar.gz 6543141 BLAKE2B 5393113bc8952553b3b5e5ee8dcd98b4cf6fec2d92069354e83b38808289053b0cc5a2c08968068f9b393b5a5e296541718c129ccbe23076ce591f6254c8293b SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4 DIST ding-1.9.tar.gz 7864078 BLAKE2B 9a25a2eb940b96393f556e374167a5b0aae8d26ff81de364e693f01acf79b0a5896704c39e1fe1ab2b48a875785483b2bc71339b01d3999664b78b48ecb041dc SHA512 fa5500d1ced311ba21ef8a16a25f3a3cdcebc24daacff79c05351a46cc2a1d466891caa1dec3a77ae9a4d7e59332d991974917875f967d93ac1358f5532e8a72 diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild deleted file mode 100644 index c9cdbf0e1e8c..000000000000 --- a/app-text/ding/ding-1.8.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop - -DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)" -HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/" -SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" - -RDEPEND=">=dev-lang/tk-8.3" - -src_install() { - dobin ding - insinto /usr/share/dict - doins de-en.txt - doman ding.1 - dodoc CHANGES README - - doicon ding.png - domenu ding.desktop -} diff --git a/app-text/ding/ding-1.9.ebuild b/app-text/ding/ding-1.9.ebuild index fb609a2d281f..7b7ecc39822e 100644 --- a/app-text/ding/ding-1.9.ebuild +++ b/app-text/ding/ding-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="" RDEPEND=">=dev-lang/tk-8.3" diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml index 99e2666c588b..115e9d64a669 100644 --- a/app-text/ding/metadata.xml +++ b/app-text/ding/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest index da7336021400..1aa7e0a68741 100644 --- a/app-text/discount/Manifest +++ b/app-text/discount/Manifest @@ -1 +1,3 @@ -DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08 +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.7-r2.ebuild b/app-text/discount/discount-2.2.7c.ebuild index 10b47fddbbbe..d10ba7694ad3 100644 --- a/app-text/discount/discount-2.2.7-r2.ebuild +++ b/app-text/discount/discount-2.2.7c.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=8 @@ -7,16 +7,14 @@ 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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0/2.2.7" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="minimal test" RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/gethopt-undefined.patch ) - src_prepare() { default diff --git a/app-text/discount/discount-2.2.7-r1.ebuild b/app-text/discount/discount-3.0.0a.ebuild index 1ecc2092dae3..4da7a0c94b27 100644 --- a/app-text/discount/discount-2.2.7-r1.ebuild +++ b/app-text/discount/discount-3.0.0a.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# 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 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" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86" +SLOT="0/3.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="minimal test" RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/gethopt-undefined.patch ) - src_prepare() { default diff --git a/app-text/discount/discount-3.0.0d.ebuild b/app-text/discount/discount-3.0.0d.ebuild new file mode 100644 index 000000000000..c33b32489b4f --- /dev/null +++ b/app-text/discount/discount-3.0.0d.ebuild @@ -0,0 +1,67 @@ +# 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/3.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="minimal test" +RESTRICT="!test? ( test )" + +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/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/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch deleted file mode 100644 index b74e2e79bc1a..000000000000 --- a/app-text/discount/files/gethopt-undefined.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -139,7 +139,7 @@ - - pandoc_headers.o: tools/pandoc_headers.c config.h - $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c --pandoc_headers: pandoc_headers.o -+pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON) - $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown - - branch.o: tools/branch.c config.h diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml index aa20bff17b1d..b26855d43ade 100644 --- a/app-text/discount/metadata.xml +++ b/app-text/discount/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> + <upstream> + <remote-id type="github">Orc/discount</remote-id> + </upstream> </pkgmetadata> 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/Manifest b/app-text/djvu/Manifest index fa7f8b1800d9..7853bec4b21a 100644 --- a/app-text/djvu/Manifest +++ b/app-text/djvu/Manifest @@ -1,2 +1 @@ -DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6 diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild deleted file mode 100644 index 2887ff6e9fbf..000000000000 --- a/app-text/djvu/djvu-3.5.27-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop flag-o-matic optfeature xdg-utils - -COMMIT="a00b7618c22fb35b030582147a4479c4cf41c349" -MY_P="${PN}-${PN}libre-git-${COMMIT}" - -DESCRIPTION="DjVu viewers, encoders and utilities" -HOMEPAGE="http://djvu.sourceforge.net/" -SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="debug doc jpeg tiff xml" - -RDEPEND="jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0= )" -DEPEND="${RDEPEND} - || ( gnome-base/librsvg media-gfx/inkscape )" -BDEPEND="app-arch/unzip" - -S=${WORKDIR}/${MY_P} - -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 -} - -DOCS=( NEWS README ) - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use doc && dodoc -r doc - - # Install desktop files. - cd desktopfiles - 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_icon_cache_update - xdg_mimeinfo_database_update - has_version app-text/djview || \ - optfeature "djviewer or browser plugin" app-text/djview -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/app-text/djvu/djvu-3.5.28-r1.ebuild b/app-text/djvu/djvu-3.5.28-r3.ebuild index 7468d234ff8c..fb2851ba987e 100644 --- a/app-text/djvu/djvu-3.5.28-r1.ebuild +++ b/app-text/djvu/djvu-3.5.28-r3.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2021 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 ~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? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0= )" +RDEPEND="jpeg? ( media-libs/libjpeg-turbo:= ) + tiff? ( media-libs/tiff:= )" DEPEND="${RDEPEND}" # inkscape/rsvg-convert are used to generate icons at build-time only diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28-r4.ebuild index 1a910c109796..fefb78cad008 100644 --- a/app-text/djvu/djvu-3.5.28.ebuild +++ b/app-text/djvu/djvu-3.5.28-r4.ebuild @@ -1,29 +1,35 @@ -# Copyright 1999-2021 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 ~mips ppc ppc64 ~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? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0= )" -DEPEND="${RDEPEND} +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 )" -BDEPEND="app-arch/unzip" DOCS=( NEWS README ) +PATCHES=( + "${FILESDIR}"/${PN}-3.5.28-drop-register-keyword-clang16.patch +) + src_prepare() { default eautoreconf 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/djvu/metadata.xml b/app-text/djvu/metadata.xml index ad9fd52b7898..822a5c011ab2 100644 --- a/app-text/djvu/metadata.xml +++ b/app-text/djvu/metadata.xml @@ -6,15 +6,15 @@ <name>Gentoo TeX Project</name> </maintainer> <longdescription> -DjVu is a web-centric format and software platform for distributing documents -and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for -distributing scanned documents, digital documents, or high-resolution pictures. -DjVu content downloads faster, displays and renders faster, looks nicer on a -screen, and consume less client resources than competing formats. DjVu images -display instantly and can be smoothly zoomed and panned with no lengthy -re-rendering. DjVu is used by hundreds of academic, commercial, governmental, -and non-commercial web sites around the world. -</longdescription> + DjVu is a web-centric format and software platform for distributing documents + and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for + distributing scanned documents, digital documents, or high-resolution pictures. + DjVu content downloads faster, displays and renders faster, looks nicer on a + screen, and consume less client resources than competing formats. DjVu images + display instantly and can be smoothly zoomed and panned with no lengthy + re-rendering. DjVu is used by hundreds of academic, commercial, governmental, + and non-commercial web sites around the world. + </longdescription> <upstream> <remote-id type="sourceforge">djvu</remote-id> </upstream> 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 e3203a498c06..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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild index b416d65c3188..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild index b416d65c3188..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild index b416d65c3188..34b492d34bbd 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild index 7a62740ffb32..65ff439e368d 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild index 1a818fa15b74..741061d98573 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild index 9fa5aaadf06a..58e75c67fd66 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild index 75a0ff68fff1..7fe768242249 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild index db8c331274e9..d1f6ad4d7933 100644 --- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild +++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,10 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" -DEPEND=">=app-arch/unzip-5.41" +BDEPEND=">=app-arch/unzip-5.41" S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${P}-catalog.diff ) diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild index 1b6ccb1e5dd7..34fc413680d8 100644 --- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild +++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.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,24 +13,24 @@ S=${WORKDIR}/${MY_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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="jadetex" DEPEND=">=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets + app-text/docbook-xml-dtd:4.2 app-text/openjade + app-text/xhtml1 dev-perl/SGMLSpm - ~app-text/docbook-xml-simple-dtd-4.1.2.4 - ~app-text/docbook-xml-simple-dtd-1.0 - app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~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 jadetex? ( dev-texlive/texlive-formatsextra ) - userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links @@ -42,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-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch index 490d65a0aa43..89663829e8b9 100644 --- a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch +++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch @@ -1,8 +1,8 @@ Fix wrong charakter classes no longer missinterpreted by grep-2.7 Michael Weber <xmw@gentoo.org> ---- docbook-utils-0.6.14/bin/jw.in -+++ docbook-utils-0.6.14/bin/jw.in +--- a/bin/jw.in ++++ b/bin/jw.in @@ -80,9 +80,9 @@ SGML_CATALOGS_DIR="/etc/sgml" if [ -f "$SGML_CONF" ] diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch index 5256570458af..f437b8163f5d 100644 --- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch +++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch @@ -1,6 +1,5 @@ -diff -NurdB docbook-utils-0.6.14/backends/txt docbook-utils-0.6.14-patched/backends/txt ---- docbook-utils-0.6.14/backends/txt 2004-02-11 08:58:03.000000000 -0500 -+++ docbook-utils-0.6.14-patched/backends/txt 2006-06-05 21:57:23.000000000 -0500 +--- a/backends/txt ++++ b/backends/txt @@ -10,6 +10,10 @@ then CONVERT=/usr/bin/links diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch index 29906c2046ad..0f795f7371c3 100644 --- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch +++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch @@ -1,5 +1,5 @@ ---- doc/HTML/Makefile.am~ 2007-10-08 04:13:04 +0200 -+++ doc/HTML/Makefile.am 2007-10-08 04:13:34 +0200 +--- a/doc/HTML/Makefile.am ++++ b/doc/HTML/Makefile.am @@ -23,7 +23,7 @@ $(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \ $(top_srcdir)/doc/refentry/frontend-spec.sgml \ @@ -9,8 +9,8 @@ SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \ jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \ -V '%use-id-as-filename%' $< ---- doc/man/Makefile.am~ 2007-10-08 04:14:16 +0200 -+++ doc/man/Makefile.am 2007-10-08 04:14:29 +0200 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am @@ -10,7 +10,7 @@ $(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \ @@ -20,8 +20,8 @@ SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \ nsgmls $< | \ sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl ---- bin/jw.in~ 2007-10-08 04:27:18 +0200 -+++ bin/jw.in 2007-10-08 04:28:40 +0200 +--- a/bin/jw.in ++++ b/bin/jw.in @@ -63,7 +63,7 @@ then SGML_CONF=`sgmlwhich` @@ -40,8 +40,8 @@ if [ -f "$SGML_CONF" ] then RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ---- backends/txt~ 2007-10-08 04:59:59 +0200 -+++ backends/txt 2007-10-08 05:00:52 +0200 +--- a/backends/txt ++++ b/backends/txt @@ -2,21 +2,21 @@ # Send any comments to Eric Bischoff <eric@caldera.de> # This program is under GPL license. See LICENSE file for details. @@ -72,8 +72,8 @@ ARGS="-dump" else echo >&2 "No way to convert HTML to text found." ---- configure.in~ 2004-02-11 15:14:15 +0100 -+++ configure.in 2007-10-14 10:40:51 +0200 +--- a/configure.in ++++ b/configure.in @@ -20,11 +20,11 @@ AC_SUBST(docdir) 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 f049bf68fffd..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-2021 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 ~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 @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 ee06649a6b4a..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-2021 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 ~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 @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 ee06649a6b4a..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-2021 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 ~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 @@ -51,14 +51,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 175a7581c5ed..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-2021 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 ~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 @@ -52,14 +52,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 175a7581c5ed..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-2021 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 ~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 @@ -52,14 +52,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 2f7d18739a29..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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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" @@ -38,14 +38,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 8e164c62c157..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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" @@ -41,14 +41,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 64ebd01a1246..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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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" @@ -38,14 +38,18 @@ pkg_preinst() { pkg_postinst() { local backup=${T}/xml-simple-docbook-${PV}.cat local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat + if ! cmp -s "${backup}" "${real}"; then cp "${backup}" "${real}" || die fi - build-docbook-catalog + + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postinst } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" sgml-catalog-r1_pkg_postrm } 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 1755483b705e..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-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,11 +9,11 @@ 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" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="ruby" RDEPEND=">=app-text/build-docbook-catalog-1.4 @@ -72,9 +72,11 @@ EOF } pkg_postinst() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" } 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-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild index 572429784248..bccf505ec522 100644 --- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild +++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -USE_RUBY="ruby25 ruby26 ruby27" +EAPI=8 +USE_RUBY="ruby30 ruby31" inherit ruby-single DOCBOOKDIR="/usr/share/sgml/${PN/-//}" @@ -12,23 +12,21 @@ 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 ~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 ) " -S="${WORKDIR}/${MY_P}" - -# Makefile is broken since 1.76.0 -RESTRICT=test - PATCHES=( "${FILESDIR}"/nonrecursive-string-subst.patch ) @@ -66,37 +64,34 @@ src_install() { for i in */; do i=${i%/} - cd "${S}"/${i} for doc in ChangeLog README; do - if [ -e "$doc" ]; then - mv ${doc} ${doc}.${i} - dodoc ${doc}.${i} - rm ${doc}.${i} + if [[ -e ${i}/${doc} ]]; then + newdoc ${i}/${doc} ${doc}.${i} + rm ${i}/${doc} || die fi done - doins -r "${S}"/${i} + doins -r ${i} done if use ruby; then local cmd="dbtoepub${MY_PN#docbook-xsl}" - # we can't use a symlink or it'll look for the library in the - # wrong path. - dodir /usr/bin - cat - > "${ED%/}"/usr/bin/${cmd} <<EOF -#!/usr/bin/env ruby + # we can't use a symlink or it'll look for the library in the wrong path + newbin - ${cmd} <<-EOF + #!/usr/bin/env ruby -load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub" -EOF - fperms 0755 /usr/bin/${cmd} + load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub" + EOF fi } pkg_postinst() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" } pkg_postrm() { - build-docbook-catalog + # See bug #816303 for rationale behind die + build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?" } 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 79c4b4945a1b..40749129b011 100644 --- a/app-text/docx2txt/docx2txt-1.4.ebuild +++ b/app-text/docx2txt/docx2txt-1.4.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 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" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86" RDEPEND="app-arch/unzip dev-lang/perl" diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest index 72471086c178..c3777c9a88a1 100644 --- a/app-text/dos2unix/Manifest +++ b/app-text/dos2unix/Manifest @@ -1 +1,2 @@ -DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d +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.2.ebuild b/app-text/dos2unix/dos2unix-7.5.0.ebuild index 81b5caa70133..83e99979e445 100644 --- a/app-text/dos2unix/dos2unix-7.4.2.ebuild +++ b/app-text/dos2unix/dos2unix-7.5.0.ebuild @@ -1,22 +1,24 @@ -# 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 -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 ~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=" @@ -34,8 +36,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -S="${WORKDIR}/${P/_/-}" - handle_locales() { # Make sure locale list is kept up-to-date. local detected sorted @@ -76,7 +76,7 @@ src_prepare() { lintl() { # same logic as from virtual/libintl - use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl" + use !elibc_glibc && use !elibc_musl && echo "-lintl" } src_compile() { diff --git a/app-text/dos2unix/dos2unix-7.5.1.ebuild b/app-text/dos2unix/dos2unix-7.5.1.ebuild new file mode 100644 index 000000000000..83e99979e445 --- /dev/null +++ b/app-text/dos2unix/dos2unix-7.5.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/" +SRC_URI=" + 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug nls test" + +RDEPEND=" + !app-text/hd2u + virtual/libintl" + +DEPEND=" + ${RDEPEND} + test? ( virtual/perl-Test-Simple ) +" +BDEPEND=" + dev-lang/perl + nls? ( sys-devel/gettext ) +" + +RESTRICT="!test? ( test )" + +handle_locales() { + # Make sure locale list is kept up-to-date. + local detected sorted + detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u)) + sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "PLOCALES: ${sorted}" + eerror "po*/*.po: ${detected}" + die "sync PLOCALES" + fi + + # Deal with selective install of locales. + rm_loc() { rm po*/$1.po || die; } + plocale_for_each_disabled_locale rm_loc +} + +src_prepare() { + default + + handle_locales + + sed \ + -e '/^LDFLAGS/s|=|+=|' \ + -e '/CFLAGS_OS \+=/d' \ + -e '/LDFLAGS_EXTRA \+=/d' \ + -e "/^CFLAGS/s|-O2|${CFLAGS}|" \ + -i Makefile || die + + if use debug ; then + sed -e "/^DEBUG/s:0:1:" \ + -e "/EXTRA_CFLAGS +=/s:-g::" \ + -i Makefile || die + fi + + tc-export CC +} + +lintl() { + # same logic as from virtual/libintl + use !elibc_glibc && use !elibc_musl && echo "-lintl" +} + +src_compile() { + emake prefix="${EPREFIX}/usr" \ + $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=") +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ + $(usex nls "" "ENABLE_NLS=") install +} 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 bc88a0173bd9..0439d8a6ddde 100644 --- a/app-text/dvipng/dvipng-1.17.ebuild +++ b/app-text/dvipng/dvipng-1.17.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,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 ~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 84f1ed701a17..5d0cf5d7abfa 100644 --- a/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild +++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-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 @@ -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/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/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/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 ~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/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml index 52546db07960..34452b8a1eb9 100644 --- a/app-text/dvipsk/metadata.xml +++ b/app-text/dvipsk/metadata.xml @@ -5,7 +5,7 @@ <email>aballier@gentoo.org</email> <name>Alexis Ballier</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>tex@gentoo.org</email> <name>Gentoo TeX Project</name> </maintainer> diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest index f385c668afb2..9c4090ec0f05 100644 --- a/app-text/dvisvgm/Manifest +++ b/app-text/dvisvgm/Manifest @@ -1,3 +1,5 @@ -DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78 -DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f -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 1c8d9fa3d375..000000000000 --- a/app-text/dvisvgm/dvisvgm-2.12.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 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-2.14-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild new file mode 100644 index 000000000000..be882c95b84c --- /dev/null +++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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 ~loong 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.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 +" + +PATCHES=( + "${FILESDIR}"/${P}-ghostscript.patch + "${FILESDIR}"/${P}-Add-missing-cstdint-includes-for-GCC-13.patch + "${FILESDIR}"/${PN}-2.14-configure-clang16.patch + "${FILESDIR}"/${PN}-2.14-configure-autoreconf.patch +) + +src_prepare() { + # Drop once configure patch merged for clang 16 + local macro + for macro in ax_check_compile_flag.m4 ax_code_coverage.m4 ax_cxx_compile_stdcxx.m4 ; do + cp "${BROOT}"/usr/share/aclocal/${macro} m4/ || die + done + + default + eautoreconf +} + +src_configure() { + local myargs=( + --without-ttfautohint + ) + + econf "${myargs[@]}" +} diff --git a/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild index a35bc82ca5a9..d583b7ecb4d2 100644 --- a/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild +++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild @@ -1,48 +1,54 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit toolchain-funcs flag-o-matic +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" -LICENSE="GPL-3" +# 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 ppc ppc64 ~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" -# 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" +RESTRICT="!test? ( test )" -BDEPEND=" - app-text/asciidoc - app-text/xmlto - dev-libs/libxslt - virtual/pkgconfig - test? ( dev-cpp/gtest ) -" RDEPEND=" >=app-arch/brotli-1.0.5:= - app-text/ghostscript-gpl + app-text/ghostscript-gpl:= dev-libs/kpathsea:= - dev-libs/openssl:= - >=dev-libs/xxhash-0.6.5 + >=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}" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.11 ) +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc13.patch +) src_configure() { local myargs=( + --disable-bundled-libs --without-ttfautohint ) + econf "${myargs[@]}" } diff --git a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild index 3bad4b3c179c..66f6668dae75 100644 --- a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild +++ b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild @@ -1,47 +1,48 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit toolchain-funcs flag-o-matic +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" -LICENSE="GPL-3" +# 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 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" -# 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" +RESTRICT="!test? ( test )" -BDEPEND=" - app-text/xmlto - app-text/asciidoc - dev-libs/libxslt - virtual/pkgconfig - test? ( dev-cpp/gtest ) -" RDEPEND=" >=app-arch/brotli-1.0.5:= - app-text/ghostscript-gpl + app-text/ghostscript-gpl:= dev-libs/kpathsea:= - dev-libs/openssl:= - >=dev-libs/xxhash-0.6.5 + >=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}" +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 ) 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-2.14-Add-missing-cstdint-includes-for-GCC-13.patch b/app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch new file mode 100644 index 000000000000..cad403e34fc1 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch @@ -0,0 +1,118 @@ +https://github.com/mgieseki/dvisvgm/pull/196 + +From fe5fe3996056cd385e59692b8f60916aedb7d7b9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 2 Oct 2022 19:43:23 +0100 +Subject: [PATCH] Add missing <cstdint> includes for GCC 13 + +--- a/src/BasicDVIReader.cpp ++++ b/src/BasicDVIReader.cpp +@@ -19,6 +19,7 @@ + *************************************************************************/ + + #include <algorithm> ++#include <cstdint> + #include "BasicDVIReader.hpp" + + using namespace std; +--- a/src/BasicDVIReader.hpp ++++ b/src/BasicDVIReader.hpp +@@ -21,6 +21,8 @@ + #ifndef BASICDVIREADER_HPP + #define BASICDVIREADER_HPP + ++#include <cstdint> ++ + #include "Matrix.hpp" + #include "MessageException.hpp" + #include "StreamReader.hpp" +--- a/src/Bitmap.hpp ++++ b/src/Bitmap.hpp +@@ -21,6 +21,7 @@ + #ifndef BITMAP_HPP + #define BITMAP_HPP + ++#include <cstdint> + #include <ostream> + #include <vector> + +--- a/src/CMap.hpp ++++ b/src/CMap.hpp +@@ -22,6 +22,7 @@ + #define CMAP_HPP + + #include <algorithm> ++#include <cstdint> + #include <ostream> + #include <vector> + #include "FontEncoding.hpp" +--- a/src/Color.hpp ++++ b/src/Color.hpp +@@ -21,6 +21,7 @@ + #ifndef COLOR_HPP + #define COLOR_HPP + ++#include <cstdint> + #include <string> + #include <valarray> + #include <vector> +--- a/src/DVIReader.hpp ++++ b/src/DVIReader.hpp +@@ -21,6 +21,7 @@ + #ifndef DVIREADER_HPP + #define DVIREADER_HPP + ++#include <cstdint> + #include <limits> + #include <map> + #include <stack> +--- a/src/FileSystem.hpp ++++ b/src/FileSystem.hpp +@@ -21,6 +21,7 @@ + #ifndef FILESYSTEM_HPP + #define FILESYSTEM_HPP + ++#include <cstdint> + #include <string> + #include <vector> + +--- a/src/InputBuffer.hpp ++++ b/src/InputBuffer.hpp +@@ -22,6 +22,7 @@ + #define INPUTBUFFER_HPP + + #include <algorithm> ++#include <cstdint> + #include <cstring> + #include <istream> + #include <string> +--- a/src/RangeMap.hpp ++++ b/src/RangeMap.hpp +@@ -22,6 +22,7 @@ + #define RANGEMAP_HPP + + #include <algorithm> ++#include <cstdint> + #include <ostream> + #include <vector> + +--- a/src/Unicode.cpp ++++ b/src/Unicode.cpp +@@ -21,6 +21,7 @@ + #include <algorithm> + #include <cctype> + #include <cstddef> ++#include <cstdint> + #include <iomanip> + #include <sstream> + #include <xxhash.h> +--- a/src/Unicode.hpp ++++ b/src/Unicode.hpp +@@ -21,6 +21,7 @@ + #ifndef UNICODE_HPP + #define UNICODE_HPP + ++#include <cstdint> + #include <string> + + struct Unicode { diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch new file mode 100644 index 000000000000..6641d3e2cae5 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch @@ -0,0 +1,383 @@ +https://github.com/mgieseki/dvisvgm/pull/202 + +From 2dc8627a0864ea1543027e577ad96676a56bf4c5 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 4 Nov 2022 20:04:43 +0000 +Subject: [PATCH 1/4] Cleanup obsolete m4 dist hack + +autoconf & automake, at least nowadays, handle including m4/ +correctly in dist tarballs (from `make dist`). + +Previously, dist tarballs lacked m4/ax_*.m4 and therefore `autoreconf -fi` +would break the Makefile with: +``` +make[3]: Entering directory '/var/tmp/portage/app-text/dvisvgm-2.14-r1/work/dvisvgm-2.14/libs/clipper' +Makefile:664: *** missing separator. Stop. +``` + +On that line is an unexpanded @CODE_COVERAGE_RULES@. + +Bug: https://bugs.gentoo.org/879539 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ + + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING +-SUBDIRS = libs m4 src tests doc ++SUBDIRS = libs src tests doc + ACLOCAL_AMFLAGS = -I m4 + + if USE_BUNDLED_LIBS +--- a/configure.ac ++++ b/configure.ac +@@ -228,7 +228,6 @@ AC_CONFIG_FILES([ + libs/variant/Makefile + libs/woff2/Makefile + libs/xxHash/Makefile +- m4/Makefile + src/Makefile + src/version.hpp + src/optimizer/Makefile +--- a/m4/Makefile.am ++++ /dev/null +@@ -1,4 +0,0 @@ +-M4_EXTRA_DIST = \ +- ax_check_compile_flag.m4 \ +- ax_code_coverage.m4 \ +- ax_cxx_compile_stdcxx.m4 + +From 2b03bccde2dd8a1b101f793159663446dd522ac9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 4 Nov 2022 20:27:35 +0000 +Subject: [PATCH 2/4] Update to newer autoconf-archive (AX_*) macros + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,6 +3,8 @@ + ## + ## Process this file with automake. + ++include $(top_srcdir)/aminclude_static.am ++ + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING + SUBDIRS = libs src tests doc +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,7 @@ AS_IF([test "x$enable_manpage" != "xyes"], + AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"]) + + AX_CODE_COVERAGE ++ + AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # disable optimization + changequote({,}) +--- a/libs/brotli/Makefile.am ++++ b/libs/brotli/Makefile.am +@@ -81,7 +81,6 @@ libbrotli_a_SOURCES = \ + + AM_CFLAGS = -Wall -I$(srcdir)/include + +-@CODE_COVERAGE_RULES@ + endif + + EXTRA_DIST = LICENSE +--- a/libs/clipper/Makefile.am ++++ b/libs/clipper/Makefile.am +@@ -6,6 +6,4 @@ AM_CXXFLAGS = -Wall + + clipper.cpp: clipper.hpp + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/libs/ff-woff/Makefile.am ++++ b/libs/ff-woff/Makefile.am +@@ -85,6 +85,4 @@ EXTRA_DIST = LICENSE + + AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS) + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/libs/md5/Makefile.am ++++ b/libs/md5/Makefile.am +@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall + + md5.c: md5.h + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- a/libs/potrace/Makefile.am ++++ b/libs/potrace/Makefile.am +@@ -17,7 +17,6 @@ libpotrace_a_SOURCES = \ + + AM_CFLAGS = -Wall -I$(srcdir) + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- a/libs/woff2/Makefile.am ++++ b/libs/woff2/Makefile.am +@@ -28,7 +28,6 @@ libwoff2_a_SOURCES = \ + + AM_CXXFLAGS = -Wall -I$(srcdir)/include -I$(srcdir)/../brotli/include + +-@CODE_COVERAGE_RULES@ + endif + + EXTRA_DIST = LICENSE +--- a/libs/xxHash/Makefile.am ++++ b/libs/xxHash/Makefile.am +@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall + + xxhash.c: xxhash.h xxh3.h + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- /dev/null ++++ b/m4/ax_ac_append_to_file.m4 +@@ -0,0 +1,32 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AC_APPEND_TO_FILE([FILE],[DATA]) ++# ++# DESCRIPTION ++# ++# Appends the specified data to the specified Autoconf is run. If you want ++# to append to a file when configure is run use AX_APPEND_TO_FILE instead. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 10 ++ ++AC_DEFUN([AX_AC_APPEND_TO_FILE],[ ++AC_REQUIRE([AX_FILE_ESCAPES]) ++m4_esyscmd( ++AX_FILE_ESCAPES ++[ ++printf "%s" "$2" >> "$1" ++]) ++]) +--- /dev/null ++++ b/m4/ax_ac_print_to_file.m4 +@@ -0,0 +1,32 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AC_PRINT_TO_FILE([FILE],[DATA]) ++# ++# DESCRIPTION ++# ++# Writes the specified data to the specified file when Autoconf is run. If ++# you want to print to a file when configure is run use AX_PRINT_TO_FILE ++# instead. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 10 ++ ++AC_DEFUN([AX_AC_PRINT_TO_FILE],[ ++m4_esyscmd( ++AC_REQUIRE([AX_FILE_ESCAPES]) ++[ ++printf "%s" "$2" > "$1" ++]) ++]) +--- /dev/null ++++ b/m4/ax_add_am_macro_static.m4 +@@ -0,0 +1,28 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_ADD_AM_MACRO_STATIC([RULE]) ++# ++# DESCRIPTION ++# ++# Adds the specified rule to $AMINCLUDE. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net> ++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 8 ++ ++AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[ ++ AC_REQUIRE([AX_AM_MACROS_STATIC]) ++ AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1]) ++]) +--- /dev/null ++++ b/m4/ax_am_macros_static.m4 +@@ -0,0 +1,38 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AM_MACROS_STATIC ++# ++# DESCRIPTION ++# ++# Adds support for macros that create Automake rules. You must manually ++# add the following line ++# ++# include $(top_srcdir)/aminclude_static.am ++# ++# to your Makefile.am files. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net> ++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 11 ++ ++AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am]) ++ ++AC_DEFUN([AX_AM_MACROS_STATIC], ++[ ++AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ ++# ]AMINCLUDE_STATIC[ generated automatically by Autoconf ++# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[ ++]) ++]) +--- /dev/null ++++ b/m4/ax_file_escapes.m4 +@@ -0,0 +1,30 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_FILE_ESCAPES ++# ++# DESCRIPTION ++# ++# Writes the specified data to the specified file. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Tom Howard <tomhoward@users.sf.net> ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 8 ++ ++AC_DEFUN([AX_FILE_ESCAPES],[ ++AX_DOLLAR="\$" ++AX_SRB="\\135" ++AX_SLB="\\133" ++AX_BS="\\\\" ++AX_DQ="\"" ++]) +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -225,6 +225,4 @@ $(srcdir)/psdefs.cpp: psdefs.ps + + psdefs.ps: ; + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -421,6 +421,4 @@ XMLStringTest_LDADD = $(TESTLIBS) + EXTRA_DIST += check-conv genhashcheck.py normalize.xsl + TESTS += check-conv + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno hashcheck.cpp + +From 8689f1ceb2284038627668e70ec7e15f99220a5c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 4 Nov 2022 22:42:58 +0000 +Subject: [PATCH 4/4] Upgrade to Autoconf 2.69 + +autoconf 2.69 is still pretty old and this only affects +folks who want to run autoreconf anyway. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + # + # Process this file with autoconf to produce a configure script. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.69]) + AC_INIT([dvisvgm],[2.14],[martin.gieseking@uos.de]) + DATE="August 2022" + AC_CONFIG_SRCDIR(src) +@@ -18,13 +18,11 @@ AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"]) + + # Checks for programs. + AC_PROG_CC +-AC_PROG_CC_C99 + AC_PROG_CXX + AX_CXX_COMPILE_STDCXX([11]) + AM_PROG_AR + LT_INIT + +-AC_PROG_RANLIB + AC_LANG(C) + + AX_CHECK_COMPILE_FLAG([-Wmismatched-tags -Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"]) +@@ -147,7 +145,7 @@ AC_CHECK_LIB(z, gzopen) + + # Check for header files. + AC_HEADER_DIRENT +-AC_HEADER_STDC ++ + AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h]) + + # Check for typedefs, structures, and compiler characteristics. + diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch new file mode 100644 index 000000000000..6fe679f551d1 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch @@ -0,0 +1,22 @@ +https://github.com/mgieseki/dvisvgm/pull/200 + +From e3cfc0976ec1f5bbcd389c318eabc2a783990de0 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 4 Nov 2022 05:07:09 +0000 +Subject: [PATCH] configure.ac: fix -Wimplicit-function-declaration + +Clang 16 makes -Wimplicit-function-declaration an error by default. We +need to include <stdlib.h> for exit(). + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,7 @@ AC_CHECK_LIB([kpathsea], [kpse_find_file],, + + AC_MSG_CHECKING([kpathsea version]) + AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h> ++ #include <stdlib.h> + #include <kpathsea/kpathsea.h> + int main() { + FILE *f; + diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch b/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch new file mode 100644 index 000000000000..88b3dcfde3f0 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch @@ -0,0 +1,226 @@ +https://github.com/mgieseki/dvisvgm/commit/629544928877362d0c6d64f20695f7df3073c5eb +https://github.com/mgieseki/dvisvgm/commit/0213b9252e4aa44034520112dd59a8d5d2ca4e85 +https://github.com/mgieseki/dvisvgm/commit/9bf81fd0b6e7876e5079e917ed7e12163b9e7f7f +https://bugs.gentoo.org/873961 + +From 629544928877362d0c6d64f20695f7df3073c5eb Mon Sep 17 00:00:00 2001 +From: Martin Gieseking <martin.gieseking@uos.de> +Date: Thu, 22 Sep 2022 10:41:11 +0200 +Subject: [PATCH] fixed compilation error when DISABLE_GS is set + +--- a/src/Ghostscript.hpp ++++ b/src/Ghostscript.hpp +@@ -47,8 +47,8 @@ struct Ghostscript { + Ghostscript (int argc, const char **argv, void *caller=0) {} + bool init (int argc, const char **argv, void *caller=0) {return false;} + bool available () {return false;} +- bool revision (gsapi_revision_t *r) {return false;} +- int revision () {return 0;} ++ bool revision (gsapi_revision_t *r) const {return false;} ++ int revision () const {return 0;} + std::string revisionstr () {return "";} + int set_stdio (Stdin in, Stdout out, Stderr err) {return 0;} + int run_string_begin (int user_errors, int *pexit_code) {return 0;} + +From 0213b9252e4aa44034520112dd59a8d5d2ca4e85 Mon Sep 17 00:00:00 2001 +From: Martin Gieseking <martin.gieseking@uos.de> +Date: Fri, 23 Sep 2022 19:59:01 +0200 +Subject: [PATCH] updated ierrors.h + +--- a/src/ierrors.h ++++ b/src/ierrors.h +@@ -1,22 +1,26 @@ +-/* Copyright (C) 2001-2006 Artifex Software, Inc. ++/* Copyright (C) 2001-2022 Artifex Software, Inc. + All Rights Reserved. +- ++ + This software is provided AS-IS with no warranty, either express or + implied. + +- This software is distributed under license and may not be copied, modified +- or distributed except as expressly authorized under the terms of that +- license. Refer to licensing information at http://www.artifex.com/ +- or contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134, +- San Rafael, CA 94903, U.S.A., +1(415)492-9861, for further information. ++ This software is distributed under license and may not be copied, ++ modified or distributed except as expressly authorized under the terms ++ of the license contained in the file LICENSE in this distribution. ++ ++ Refer to licensing information at http://www.artifex.com or contact ++ Artifex Software, Inc., 1305 Grant Avenue - Suite 200, Novato, ++ CA 94945, U.S.A., +1(415)492-9861, for further information. + */ + +-/* $Id: ierrors.h 8022 2007-06-05 22:23:38Z giles $ */ ++ + /* Definition of error codes */ + + #ifndef ierrors_INCLUDED + # define ierrors_INCLUDED + ++//#include "gserrors.h" ++ + /* + * DO NOT USE THIS FILE IN THE GRAPHICS LIBRARY. + * THIS FILE IS PART OF THE POSTSCRIPT INTERPRETER. +@@ -33,33 +37,7 @@ + /* Define the error name table */ + extern const char *const gs_error_names[]; + +- /* ------ PostScript Level 1 errors ------ */ +- +-#define e_unknownerror (-1) /* unknown error */ +-#define e_dictfull (-2) +-#define e_dictstackoverflow (-3) +-#define e_dictstackunderflow (-4) +-#define e_execstackoverflow (-5) +-#define e_interrupt (-6) +-#define e_invalidaccess (-7) +-#define e_invalidexit (-8) +-#define e_invalidfileaccess (-9) +-#define e_invalidfont (-10) +-#define e_invalidrestore (-11) +-#define e_ioerror (-12) +-#define e_limitcheck (-13) +-#define e_nocurrentpoint (-14) +-#define e_rangecheck (-15) +-#define e_stackoverflow (-16) +-#define e_stackunderflow (-17) +-#define e_syntaxerror (-18) +-#define e_timeout (-19) +-#define e_typecheck (-20) +-#define e_undefined (-21) +-#define e_undefinedfilename (-22) +-#define e_undefinedresult (-23) +-#define e_unmatchedmark (-24) +-#define e_VMerror (-25) /* must be the last Level 1 error */ ++ /* ------ PostScript Level 1 errors ------ */ + + #define LEVEL1_ERROR_NAMES\ + "unknownerror", "dictfull", "dictstackoverflow", "dictstackunderflow",\ +@@ -69,85 +47,26 @@ extern const char *const gs_error_names[]; + "stackunderflow", "syntaxerror", "timeout", "typecheck", "undefined",\ + "undefinedfilename", "undefinedresult", "unmatchedmark", "VMerror" + +- /* ------ Additional Level 2 errors (also in DPS) ------ */ +- +-#define e_configurationerror (-26) +-#define e_undefinedresource (-27) +-#define e_unregistered (-28) ++ /* ------ Additional Level 2 errors (also in DPS) ------ */ + + #define LEVEL2_ERROR_NAMES\ + "configurationerror", "undefinedresource", "unregistered" + +- /* ------ Additional DPS errors ------ */ +- +-#define e_invalidcontext (-29) +-/* invalidid is for the NeXT DPS extension. */ +-#define e_invalidid (-30) ++ /* ------ Additional DPS errors ------ */ + + #define DPS_ERROR_NAMES\ + "invalidcontext", "invalidid" + +-#define ERROR_NAMES\ +- LEVEL1_ERROR_NAMES, LEVEL2_ERROR_NAMES, DPS_ERROR_NAMES +- +- /* ------ Pseudo-errors used internally ------ */ +- +-/* +- * Internal code for a fatal error. +- * gs_interpret also returns this for a .quit with a positive exit code. +- */ +-#define e_Fatal (-100) +- +-/* +- * Internal code for the .quit operator. +- * The real quit code is an integer on the operand stack. +- * gs_interpret returns this only for a .quit with a zero exit code. +- */ +-#define e_Quit (-101) +- +-/* +- * Internal code for a normal exit from the interpreter. +- * Do not use outside of interp.c. +- */ +-#define e_InterpreterExit (-102) +- +-/* +- * Internal code that indicates that a procedure has been stored in the +- * remap_proc of the graphics state, and should be called before retrying +- * the current token. This is used for color remapping involving a call +- * back into the interpreter -- inelegant, but effective. +- */ +-#define e_RemapColor (-103) +- +-/* +- * Internal code to indicate we have underflowed the top block +- * of the e-stack. +- */ +-#define e_ExecStackUnderflow (-104) +- +-/* +- * Internal code for the vmreclaim operator with a positive operand. +- * We need to handle this as an error because otherwise the interpreter +- * won't reload enough of its state when the operator returns. +- */ +-#define e_VMreclaim (-105) +- +-/* +- * Internal code for requesting more input from run_string. +- */ +-#define e_NeedInput (-106) ++#define PDF_ERROR_NAMES\ ++ "pdf_stackoverflow", "pdf_circular_reference" + +-/* +- * Internal code for a normal exit when usage info is displayed. +- * This allows Window versions of Ghostscript to pause until +- * the message can be read. +- */ +-#define e_Info (-110) ++#define ERROR_NAMES\ ++ LEVEL1_ERROR_NAMES, LEVEL2_ERROR_NAMES, DPS_ERROR_NAMES, PDF_ERROR_NAMES + + /* + * Define which error codes require re-executing the current object. + */ +-#define ERROR_IS_INTERRUPT(ecode)\ +- ((ecode) == e_interrupt || (ecode) == e_timeout) ++#define GS_ERROR_IS_INTERRUPT(ecode)\ ++ ((ecode) == gs_error_interrupt || (ecode) == gs_error_timeout) + + #endif /* ierrors_INCLUDED */ + +From 9bf81fd0b6e7876e5079e917ed7e12163b9e7f7f Mon Sep 17 00:00:00 2001 +From: Martin Gieseking <martin.gieseking@uos.de> +Date: Fri, 23 Sep 2022 20:01:46 +0200 +Subject: [PATCH] dropped usage of gs_error_names() because it's no longer + accessible as of GS 10.0.0 (closes #195) + +--- a/src/Ghostscript.cpp ++++ b/src/Ghostscript.cpp +@@ -375,19 +375,9 @@ const char* Ghostscript::error_name (int code) { + if (code < 0) + code = -code; + const char *error_names[] = { ERROR_NAMES }; +- if (code == 0 || (size_t)code > sizeof(error_names)/sizeof(error_names[0])) ++ if (code == 0 || size_t(code) > sizeof(error_names)/sizeof(error_names[0])) + return nullptr; +-#if defined(HAVE_LIBGS) +- // use array defined in libgs to avoid linking the error strings into the binary +- return gs_error_names[code-1]; +-#elif defined(_WIN32) +- // gs_error_names is private in the Ghostscript DLL so we can't access it here + return error_names[code-1]; +-#else +- if (auto error_names = loadSymbol<const char**>("gs_error_names")) +- return error_names[code-1]; +- return nullptr; +-#endif + } + + #endif // !DISABLE_GS + 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 4e293663956d..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,17 +1,17 @@ -# 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 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" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv x86" IUSE="+lit2epub" DEPEND=" 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/agrep/metadata.xml b/app-text/ebook2cw/metadata.xml index 6258504e5133..001997549c54 100644 --- a/app-text/agrep/metadata.xml +++ b/app-text/ebook2cw/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>shell-tools@gentoo.org</email> - <name>Gentoo Shell Tools Project</name> + <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 c8cd95f6c868..67f854da6f6e 100644 --- a/app-text/editorconfig-core-c/Manifest +++ b/app-text/editorconfig-core-c/Manifest @@ -1,2 +1 @@ -DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e -DIST editorconfig-core-c-0.12.4.tar.gz 72141 BLAKE2B bfbd7ab2eb3ac1c73d387447e16c0888b4dce1318f14f1a511cbf1e5c34aecb31921955fb51a6c07a8a991fb388995971ceed22b4e53c53b1c56fddbbcccfdfc SHA512 e275d4f77fddd31717a588be15a67a630e693efbddc5e1cf7e9b116b1c1a700fa9bafc1322733aa73a009c78519e00083b151bbc4a5ad55128df2c7360f9a163 +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.3-r2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild deleted file mode 100644 index 02055e6d7f0d..000000000000 --- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="EditorConfig core library written in C" -HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/" -SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="cli doc" - -BDEPEND="doc? ( app-doc/doxygen )" -DEPEND="dev-libs/libpcre2:=" -RDEPEND="${DEPEND} - cli? ( !dev-python/editorconfig-core-py[cli] )" - -PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" ) - -src_configure() { - local -a mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF') - ) - cmake_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - - if ! use cli; then - rm -r "${ED}/usr/bin" || die - fi -} diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild index 2b2c11d556d4..be53eaf511e3 100644 --- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild +++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.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 cmake @@ -11,22 +11,30 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +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 } src_configure() { - local -a mycmakeargs=( + local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF') -DBUILD_STATICALLY_LINKED_EXE=OFF ) diff --git a/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch deleted file mode 100644 index 369b806467be..000000000000 --- a/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 4fa85f00f824b1dd5d1244c77667ea497d94f02b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 11 Jul 2020 21:11:58 +0200 -Subject: [PATCH] Do not build static lib if BUILD_STATICALLY_LINKED_EXE=OFF - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - src/lib/CMakeLists.txt | 36 +++++++++++++++++++++++------------- - 1 file changed, 23 insertions(+), 13 deletions(-) - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 353ab1c..12db621 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -44,16 +44,18 @@ if(WIN32) - endif() - target_link_libraries(editorconfig_shared ${PCRE2_LIBRARIES}) - --add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS}) --set_target_properties(editorconfig_static PROPERTIES -- OUTPUT_NAME editorconfig_static -- VERSION ${PROJECT_VERSION}) -+if(BUILD_STATICALLY_LINKED_EXE) -+ add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS}) -+ set_target_properties(editorconfig_static PROPERTIES -+ OUTPUT_NAME editorconfig_static -+ VERSION ${PROJECT_VERSION}) - --# We need to link Shwapi since we use PathIsRelative --if(WIN32) -- target_link_libraries(editorconfig_static Shlwapi) -+ # We need to link Shwapi since we use PathIsRelative -+ if(WIN32) -+ target_link_libraries(editorconfig_static Shlwapi) -+ endif() -+ target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES}) - endif() --target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES}) - - # EditorConfig package name for find_package() and the CMake package registry. - # On UNIX the system registry is usually just "lib/cmake/<package>". -@@ -65,11 +67,19 @@ set(editorconfig_CONFIG_EXPORT_NAME "${config_package_name}Targets") - set(editorconfig_CONFIG_INSTALL_LIBDIR - "${CMAKE_INSTALL_LIBDIR}/cmake/${config_package_name}") - --install(TARGETS editorconfig_shared editorconfig_static -- EXPORT ${editorconfig_CONFIG_EXPORT_NAME} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+if(BUILD_STATICALLY_LINKED_EXE) -+ install(TARGETS editorconfig_static -+ EXPORT ${editorconfig_CONFIG_EXPORT_NAME} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+else() -+ install(TARGETS editorconfig_shared -+ EXPORT ${editorconfig_CONFIG_EXPORT_NAME} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() - - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/editorconfig.pc.in --- -2.27.0 - diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest index 556ae82eb87f..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.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43 -DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5 +DIST enchant-2.6.1.tar.gz 1014436 BLAKE2B 3df1d72d4fa2e912788d4e12e7bc4ab2676952e358e97457259284e78c32006482be0713059d5feeef56905e83ded975e7d723563c58e4f92c845b0b279a6827 SHA512 e2faabeb6a4edc7237a0a279b210512100fb1662b097cd23f0fc07a3519e48632e5527b0d393793a7623667011eae7e11f15fcddcaa155c4abd26ab6981ddf44 diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild deleted file mode 100644 index 595d263abfd1..000000000000 --- a/app-text/enchant/enchant-1.6.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit versionator - -MY_PV="$(replace_all_version_separators '-')" -DESCRIPTION="Spellchecker wrapping library" -HOMEPAGE="https://abiword.github.io/enchant/" -SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - -IUSE="aspell +hunspell static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( hunspell aspell )" - -# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742 -COMMON_DEPENDS=" - >=dev-libs/glib-2.6:2 - aspell? ( app-text/aspell ) - hunspell? ( >=app-text/hunspell-1.2.1:0= )" -RDEPEND="${COMMON_DEPENDS}" - -DEPEND="${COMMON_DEPENDS} - virtual/pkgconfig -" -# test? ( dev-libs/unittest++ ) - -DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch -) - -src_prepare() { - default - sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die - sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484, shouldn't be an issue in 2.2 -} - -src_configure() { - econf \ - $(use_enable aspell) \ - $(use_enable hunspell myspell) \ - $(use_enable static-libs static) \ - --disable-hspell \ - --disable-ispell \ - --disable-uspell \ - --disable-voikko \ - --disable-zemberek \ - --with-myspell-dir="${EPREFIX}"/usr/share/myspell/ -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild new file mode 100644 index 000000000000..5cbf57768245 --- /dev/null +++ b/app-text/enchant/enchant-1.6.1-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="${PV//./-}" +DESCRIPTION="Spellchecker wrapping library" +HOMEPAGE="https://abiword.github.io/enchant/" +SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.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" + +IUSE="aspell +hunspell test" +RESTRICT="!test? ( test )" +REQUIRED_USE="|| ( aspell hunspell )" + +COMMON_DEPEND=" + >=dev-libs/glib-2.6:2 + aspell? ( app-text/aspell ) + hunspell? ( >=app-text/hunspell-1.2.1:0= ) +" +RDEPEND="${COMMON_DEPEND} + !<app-text/enchant-2.3.3:2 +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-libs/unittest++-2.0.0-r2 ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch +) + +src_prepare() { + default + sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484 +} + +src_configure() { + local myconf=( + --datadir="${EPREFIX}"/usr/share/enchant-1 + --disable-static + $(use_enable aspell) + $(use_enable hunspell myspell) + --disable-hspell + --disable-ispell + --disable-uspell + --disable-voikko + --disable-zemberek + --with-myspell-dir="${EPREFIX}"/usr/share/myspell/ + ) + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild deleted file mode 100644 index 148aae6be617..000000000000 --- a/app-text/enchant/enchant-2.3.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - -IUSE="aspell +hunspell test voikko" -REQUIRED_USE="|| ( hunspell aspell )" - -RDEPEND=" - >=dev-libs/glib-2.6:2 - aspell? ( app-text/aspell ) - hunspell? ( >=app-text/hunspell-1.2.1:0= ) - voikko? ( dev-libs/libvoikko )" -DEPEND="${RDEPEND} - test? ( >=dev-libs/unittest++-2.0.0-r2 )" -BDEPEND="virtual/pkgconfig" - -RESTRICT="test" # Tests fail - -src_configure() { - # TODO: Add app-text/nuspell support - econf \ - --datadir="${EPREFIX}"/usr/share/enchant-2 \ - --disable-static \ - $(use_enable test relocatable) \ - $(use_with aspell) \ - $(use_with hunspell) \ - $(use_with voikko) \ - --without-nuspell \ - --without-hspell \ - --without-applespell \ - --without-zemberek \ - --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/ -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/app-text/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.1.ebuild deleted file mode 100644 index 1c7845af2065..000000000000 --- a/app-text/enchant/enchant-2.3.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" - -IUSE="aspell +hunspell test voikko" -REQUIRED_USE="|| ( hunspell aspell )" - -RDEPEND=" - >=dev-libs/glib-2.6:2 - aspell? ( app-text/aspell ) - hunspell? ( >=app-text/hunspell-1.2.1:0= ) - voikko? ( dev-libs/libvoikko )" -DEPEND="${RDEPEND} - test? ( >=dev-libs/unittest++-2.0.0-r2 )" -BDEPEND="virtual/pkgconfig" - -RESTRICT="test" # Tests fail - -src_configure() { - # TODO: Add app-text/nuspell support - econf \ - --datadir="${EPREFIX}"/usr/share/enchant-2 \ - --disable-static \ - $(use_enable test relocatable) \ - $(use_with aspell) \ - $(use_with hunspell) \ - $(use_with voikko) \ - --without-nuspell \ - --without-hspell \ - --without-applespell \ - --without-zemberek \ - --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/ -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/app-text/enchant/enchant-2.6.1.ebuild b/app-text/enchant/enchant-2.6.1.ebuild new file mode 100644 index 000000000000..9e29da6bb928 --- /dev/null +++ b/app-text/enchant/enchant-2.6.1.ebuild @@ -0,0 +1,68 @@ +# 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" + +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=" + sys-apps/groff + virtual/pkgconfig +" + +QA_CONFIG_IMPL_DECL_SKIP=( + alignof + static_assert + unreachable +) + +src_prepare() { + default + elibtoolize +} + +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/metadata.xml b/app-text/enchant/metadata.xml index 3033ca238ad7..4b8be47deda0 100644 --- a/app-text/enchant/metadata.xml +++ b/app-text/enchant/metadata.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag> - <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag> - <flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag> + <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag> + <flag name="nuspell">Adds support for <pkg>app-text/nuspell</pkg> spell checker</flag> + <flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag> + </use> + <upstream> + <remote-id type="github">AbiWord/enchant</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6-r1.ebuild index bb889e8b0db3..f3503237816d 100644 --- a/app-text/enscript/enscript-1.6.6.ebuild +++ b/app-text/enscript/enscript-1.6.6-r1.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 @@ -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 ) " @@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.4-ebuild.st.patch "${FILESDIR}"/${PN}-1.6.5.2-php.st.patch "${FILESDIR}"/${PN}-1.6.4-fsf-gcc-darwin.patch + "${FILESDIR}"/${PN}-1.6.2-implicit-function-decl.patch ) src_prepare() { diff --git a/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch b/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch new file mode 100644 index 000000000000..90868d182023 --- /dev/null +++ b/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch @@ -0,0 +1,20 @@ +https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch?h=master-next&id=6c251848590867debaaf87bfe12bed572d8f6a8d + +From faec0206611f8ea4ca6f70987866077ac8c3c6c1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 21:24:27 -0700 +Subject: [PATCH] getopt: Include string.h for strcmp/stcncmp functions + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/compat/getopt.c ++++ b/compat/getopt.c +@@ -43,6 +43,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> /* strcmp */ + + /* 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 diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml index e2fedda90ee1..167f8f30a26a 100644 --- a/app-text/enscript/metadata.xml +++ b/app-text/enscript/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>printing@gentoo.org</email> - <name>Gentoo Printing Project</name> -</maintainer> + <maintainer type="project"> + <email>printing@gentoo.org</email> + <name>Gentoo Printing Project</name> + </maintainer> + <upstream> + <remote-id type="savannah">enscript</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest index 01e04f7bbd4c..bc3fef3d9903 100644 --- a/app-text/epspdf/Manifest +++ b/app-text/epspdf/Manifest @@ -1 +1,2 @@ +DIST epspdf-0.6.5.zip 331312 BLAKE2B 3bd2c9cd432172c38efe33d08068f20fddf169d5d7bc94c9f1720cf379de9ba54aedb1cb6fd438b721c2e98f24dfd1ca4b3dab5c1fe01a71791748f952832ac9 SHA512 28ef12546a957c62fd94b405b53359898d46c825bad8fd2167b5ab23bb2a6ea457ccbcc8263b31574e128ebe56e21b30fae27d406397df3fdc1506a088ab41f4 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea 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 new file mode 100644 index 000000000000..10eb318fdc5f --- /dev/null +++ b/app-text/epspdf/epspdf-0.6.5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop texlive-common + +DESCRIPTION="GUI and command-line converter for [e]ps and pdf" +HOMEPAGE="http://tex.aanhet.net/epspdf/" +# http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz +SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.zip" +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 ~x64-solaris" +IUSE="doc tk" + +RDEPEND="!<dev-texlive/texlive-pictures-2011-r1 + >=dev-texlive/texlive-basic-2011 + app-text/ghostscript-gpl + tk? ( dev-lang/tk )" +BDEPEND="app-arch/unzip + sys-apps/texinfo" + +src_compile() { + cd doc || die + makeinfo epspdf || die +} + +src_install() { + exeinto /usr/share/${PN} + doexe epspdf.tlu + + insinto /usr/share/${PN} + + if use tk ; then + doins epspdf.help doc/images/epspdf.png + doexe epspdftk.tcl + fi + + dobin_texmf_scripts ${PN}/epspdf.tlu + use tk && dobin_texmf_scripts ${PN}/epspdftk.tcl + + doinfo doc/epspdf.info + dodoc doc/Changelog + if use doc ; then + dodoc doc/epspdf.pdf + dodoc -r doc + fi + + # Give it a .desktop + if use tk; then + make_desktop_entry epspdftk epspdftk "${EPREFIX}/usr/share/${PN}/epspdf.png" "Graphics;ImageProcessing" + fi +} diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild index 285d5ecb3f1f..96cdb44c516c 100644 --- a/app-text/epstool/epstool-3.09.ebuild +++ b/app-text/epstool/epstool-3.09.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND="app-text/ghostscript-gpl" RDEPEND="${DEPEND}" diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index d6a0f18b996b..4b75dbd25049 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -1,2 +1 @@ -DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f -DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd +DIST evince-45.0.tar.xz 2925768 BLAKE2B a926efd836dcf265184d84b8ae3ab246612767ab7f4e600225e21cb7395aa6aa7c6c238aa3958e1924d67a6aa377a2817101a9b04633dc30c381424ee1e0ebaa SHA512 3c2f796fda6c6e4d570748b6f8fcda2fada239df4cb392c164d7f91041cda6337373ea521146e7f7a1d572692a5e894938117d092fa033ddeb81fa72f8591086 diff --git a/app-text/evince/evince-40.2.ebuild b/app-text/evince/evince-40.2.ebuild deleted file mode 100644 index 7611a7a0a0b3..000000000000 --- a/app-text/evince/evince-40.2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org 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 nsplugin postscript spell t1lib tiff xps" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" - -# atk used in libview -# bundles unarr -DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.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-0.76.0[cairo] - >=app-arch/libarchive-3.2.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) - 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 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-3.6: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/gtk-doc-1.33 ) - 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 -" - -PATCHES=( - "${FILESDIR}"/40.0-internal-synctex.patch -) - -src_prepare() { - default - - # 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=( - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nsplugin browser_plugin) - $(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) - - $(meson_feature t1lib) - - -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - - ) - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_test() { - meson_src_test -} - -src_install() { - meson_src_install -} diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-45.0.ebuild index d64fa8636548..fd78478a7ed5 100644 --- a/app-text/evince/evince-40.4.ebuild +++ b/app-text/evince/evince-45.0.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 gnome.org gnome2-utils meson systemd xdg @@ -11,52 +11,51 @@ 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 nsplugin postscript spell t1lib tiff xps" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +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 # bundles unarr DEPEND=" - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.0:1= + >=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-0.76.0[cairo] - >=app-arch/libarchive-3.2.0 + >=x11-libs/cairo-1.10 + >=app-text/poppler-22.05.0:=[cairo] + >=app-arch/libarchive-3.6.0:= djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) + ) 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 ) + keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 ) + 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-3.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/gtk-doc-1.33 ) - app-text/docbook-xml-dtd:4.3 + 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 @@ -65,26 +64,19 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/40.0-internal-synctex.patch -) - src_prepare() { - xdg_src_prepare - - # 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 + default + xdg_environment_reset } src_configure() { local emesonargs=( + -Ddevelopment=false -Dplatform=gnome -Dviewer=true -Dpreviewer=true -Dthumbnailer=true - $(meson_use nsplugin browser_plugin) $(meson_use nautilus) -Dcomics=enabled @@ -99,21 +91,28 @@ 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) $(meson_feature spell gspell) - $(meson_feature t1lib) + -Dinternal_synctex=true - -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" -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 diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch deleted file mode 100644 index 8c45548c639a..000000000000 --- a/app-text/evince/files/40.0-internal-synctex.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 12 Apr 2021 23:07:50 -0400 -Subject: [PATCH] build: always use internal synctex instead of automagically - -We don't have a separate synctex package and would have to pull in -all of texlive-core; so instead of fixing the automagic use of it, -just remove support for external synctex, as that's easier. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index abee124d..63c5040c 100644 ---- a/meson.build -+++ b/meson.build -@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found()) - - # *** libsynctex *** - synctex_dep = dependency('synctex', version: '>= 1.19', required: false) --external_synctex = synctex_dep.found() -+external_synctex = false - - # *** Mime types list *** - mime_types_list = { --- -2.26.3 - diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml index 978268577550..afa0e10cc24f 100644 --- a/app-text/evince/metadata.xml +++ b/app-text/evince/metadata.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="dvi">Enable the built-in DVI viewer</flag> - <flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag> - <flag name="postscript" restrict=">=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag> - <flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag> - <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer - (<pkg>media-libs/t1lib</pkg>)</flag> - <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="dvi">Enable the built-in DVI viewer</flag> + <flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag> + <flag name="postscript" restrict=">=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag> + <flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag> + <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/evince</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.05-r3.ebuild index c1ddd2ee423e..ee8a110a01e6 100644 --- a/app-text/expander/expander-2.0.5-r2.ebuild +++ b/app-text/expander/expander-2.05-r3.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Expander is a utility that acts as a filter for text editors" HOMEPAGE="http://www.nedit.org" -SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz" +SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-clang15.patch +) src_compile() { - emake -C src CC=$(tc-getCC) + emake -C src CC="$(tc-getCC)" } src_install() { @@ -35,7 +37,7 @@ src_install() { pkg_postinst() { elog - elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL" - elog "Macro, definition and template files can be found in /usr/share/${P}" + elog "Instructions for using expander with NEdit are in ${EROOT}/usr/share/doc/${PF}/INSTALL" + elog "Macro, definition and template files can be found in ${EROOT}/usr/share/${P}" elog } diff --git a/app-text/expander/files/expander-2.05-clang15.patch b/app-text/expander/files/expander-2.05-clang15.patch new file mode 100644 index 000000000000..a7ae9bed3ddf --- /dev/null +++ b/app-text/expander/files/expander-2.05-clang15.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/870898 +--- a/src/align_columns.c ++++ b/src/align_columns.c +@@ -28,6 +28,7 @@ + #include <string.h> + #include <stdlib.h> + #include <ctype.h> ++#include <unistd.h> + + /*============================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/align_comments.c ++++ b/src/align_comments.c +@@ -28,6 +28,7 @@ + #include <string.h> + #include <stdlib.h> + #include <ctype.h> ++#include <unistd.h> + + /*===========================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/boxcomment.c ++++ b/src/boxcomment.c +@@ -59,6 +59,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdlib.h> ++#include <unistd.h> + + /*============================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/expander.c ++++ b/src/expander.c +@@ -114,6 +114,7 @@ + #include <string.h> + #include <time.h> + #include <ctype.h> ++#include <unistd.h> + + /*==========================================================================*/ + /* MACRO DEFINITIONS */ +@@ -1264,7 +1265,7 @@ bool_t locate_definition( + bool_t ignore_definition = FALSE; + int i; + char line[ MAXBUF ]; +- static level = 0; ++ static int level = 0; + + /*--------------------- + * Recursion protection. +--- a/src/where_is.c ++++ b/src/where_is.c +@@ -54,6 +54,7 @@ + #include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <unistd.h> + + typedef int bool_t; + diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.05-gentoo.patch index 460a8164cee5..460a8164cee5 100644 --- a/app-text/expander/files/expander-2.0.5-gentoo.patch +++ b/app-text/expander/files/expander-2.05-gentoo.patch diff --git a/app-text/extract_url/extract_url-1.6.2.ebuild b/app-text/extract_url/extract_url-1.6.2.ebuild index 5f105f6cc147..e64257e765c4 100644 --- a/app-text/extract_url/extract_url-1.6.2.ebuild +++ b/app-text/extract_url/extract_url-1.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 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/m3m0ryh0l3/${PN/_/}/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=" diff --git a/app-text/fb2edit/Manifest b/app-text/fb2edit/Manifest deleted file mode 100644 index 5efe364483a7..000000000000 --- a/app-text/fb2edit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fb2edit-0.1.0.tar.gz 244667 BLAKE2B 332ba2801a346ef667760ff9f116aec6ae3ef93c7d862884514982bcc6adfd5413b22beb40859cc28ca297548e2e8f1c95885c2e68734c554922965d53c8f7ab SHA512 f13d45987a513fa9ea8139b195cda77dd39d4d680b5a826882b8b9d6d5704f10ed4b447070f1de39997b3be0fafa8378fe1261ff2d1e53cf9b3225c07a293d08 diff --git a/app-text/fb2edit/fb2edit-0.1.0.ebuild b/app-text/fb2edit/fb2edit-0.1.0.ebuild deleted file mode 100644 index 1eaa7cee867e..000000000000 --- a/app-text/fb2edit/fb2edit-0.1.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake xdg -DESCRIPTION="Create and edit fb2 books" -HOMEPAGE="https://github.com/vitlav/fb2edit" -SRC_URI="https://github.com/vitlav/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -RDEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtwebkit:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - dev-libs/libxml2:2" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -src_prepare () { - cmake_src_prepare -} diff --git a/app-text/fb2edit/metadata.xml b/app-text/fb2edit/metadata.xml deleted file mode 100644 index 21848a4c2fc9..000000000000 --- a/app-text/fb2edit/metadata.xml +++ /dev/null @@ -1,10 +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> - <upstream> - <remote-id type="github">vitlav/fb2edit</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml index 115e9d64a669..61d3aa230a8b 100644 --- a/app-text/fbpdf/metadata.xml +++ b/app-text/fbpdf/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">aligrudi/fbpdf</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild index 76413d99296f..7b1a9042d69d 100644 --- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild +++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit qmake-utils xdg +inherit qmake-utils toolchain-funcs xdg DESCRIPTION="E-Book Reader. Supports many e-book formats" HOMEPAGE="https://www.fbreader.org/" SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz - https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch" + https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-combined.patch" LICENSE="GPL-2" SLOT="0" @@ -20,7 +20,7 @@ RDEPEND=" dev-db/sqlite dev-libs/expat dev-libs/fribidi - dev-libs/libunibreak + dev-libs/libunibreak:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] @@ -71,6 +71,9 @@ src_prepare() { else echo "TARGET_STATUS = release" >> makefiles/target.mk || die fi + + # bug #437262 + tc-ld-disable-gold } src_compile() { 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 c66e3fbd29ad..de219933828b 100644 --- a/app-text/foliate/Manifest +++ b/app-text/foliate/Manifest @@ -1,2 +1 @@ -DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e -DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb +DIST foliate-3.1.0.tar.bz2 7902106 BLAKE2B cd804b168529ebde3312954de6e907d4de30ef4342dbcf872757f485d5b5e223c96629c01d6e0e0b3bb7cfcc1e98015b034b053d6a6429138a8aa1ed40b0b0c2 SHA512 36dfb6618b04fcfdd3d298133f9fb592e987b898420da08d1e2e1539f162abc4c06cf28e3c9e6ae5f008554fdec9ab36a69333f5c5074b069c345ae729301236 diff --git a/app-text/foliate/foliate-2.6.2.ebuild b/app-text/foliate/foliate-2.6.2.ebuild deleted file mode 100644 index 685d66123a4f..000000000000 --- a/app-text/foliate/foliate-2.6.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW" -inherit meson plocale xdg-utils 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} - 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] - handy? ( gui-libs/libhandy:=[introspection] ) - spell? ( app-text/gspell[introspection] )" - -src_prepare() { - default - - 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_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/app-text/foliate/foliate-2.6.3.ebuild b/app-text/foliate/foliate-2.6.3.ebuild deleted file mode 100644 index 9aa32642596b..000000000000 --- a/app-text/foliate/foliate-2.6.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW" -inherit meson plocale xdg-utils 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} - 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] - handy? ( gui-libs/libhandy:=[introspection] ) - spell? ( app-text/gspell[introspection] )" - -src_prepare() { - default - - 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_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update - 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/Manifest b/app-text/fzy/Manifest new file mode 100644 index 000000000000..a56ac8104276 --- /dev/null +++ b/app-text/fzy/Manifest @@ -0,0 +1 @@ +DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc diff --git a/app-text/fzy/files/1.0-cflags.patch b/app-text/fzy/files/1.0-cflags.patch new file mode 100644 index 000000000000..4805b4814a45 --- /dev/null +++ b/app-text/fzy/files/1.0-cflags.patch @@ -0,0 +1,34 @@ +From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 24 Apr 2020 19:12:16 -0700 +Subject: [PATCH] cflags + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2d23118..713daad 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION=1.0 + + CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE +-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps ++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps + PREFIX?=/usr/local + MANDIR?=$(PREFIX)/share/man + BINDIR?=$(PREFIX)/bin +@@ -29,7 +29,7 @@ check: test/fzytest + $(DEBUGGER) ./test/fzytest + + fzy: $(OBJECTS) +- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) + + %.o: %.c config.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +-- +2.26.2 + diff --git a/app-text/fzy/fzy-1.0-r1.ebuild b/app-text/fzy/fzy-1.0-r1.ebuild new file mode 100644 index 000000000000..a7450fedb766 --- /dev/null +++ b/app-text/fzy/fzy-1.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature savedconfig toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git" +else + SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" +fi + +DESCRIPTION="Fuzzy text selector (interactive grep) for console" +HOMEPAGE="https://github.com/jhawthorn/fzy" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/1.0-cflags.patch ) + +src_prepare() { + default + restore_config config.h + tc-export CC +} + +src_install() { + local DOCS=( ALGORITHM.md CHANGELOG.md README.md ) + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dobin contrib/fzy-tmux + dobin contrib/fzy-dvtm + einstalldocs + save_config config.h +} + +pkg_postinst() { + savedconfig_pkg_postinst + optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm + optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux +} diff --git a/app-text/fzy/fzy-9999.ebuild b/app-text/fzy/fzy-9999.ebuild new file mode 100644 index 000000000000..702455296c5c --- /dev/null +++ b/app-text/fzy/fzy-9999.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature savedconfig toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git" +else + SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +DESCRIPTION="Fuzzy text selector (interactive grep) for console" +HOMEPAGE="https://github.com/jhawthorn/fzy" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +src_prepare() { + default + restore_config config.h + tc-export CC + sed -i 's/$(LIBS)/$(LIBS) $(LDFLAGS)/g' Makefile || die +} + +src_install() { + local DOCS=( ALGORITHM.md CHANGELOG.md README.md ) + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dobin contrib/fzy-tmux + dobin contrib/fzy-dvtm + einstalldocs + save_config config.h +} + +pkg_postinst() { + savedconfig_pkg_postinst + optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm + optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux +} diff --git a/app-text/fzy/metadata.xml b/app-text/fzy/metadata.xml new file mode 100644 index 000000000000..628df2e40fcd --- /dev/null +++ b/app-text/fzy/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>shell-tools@gentoo.org</email> + <name>Gentoo Shell Tools Project</name> + </maintainer> + <longdescription lang="en"> + Fuzzy text selector (interactive grep) for console. + It can be used to filter any list: + files, command history, processes, hostnames, bookmarks, git commits, etc. + It's designed to be used both as an editor plugin and on the command line. + Rather than clearing the screen, fzy displays its interface directly below + the current cursor position, scrolling the screen if necessary. + </longdescription> + <upstream> + <remote-id type="github">jhawthorn/fzy</remote-id> + </upstream> +</pkgmetadata> 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 6bdcc0767c20..d536b91c10ca 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,6 +1,3 @@ -DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67 -DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7 -DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc -DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb -DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44 -DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12 +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-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/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch deleted file mode 100644 index 9d7f53e2fd1f..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.ghostscript.com/show_bug.cgi?id=703270 - ---- a/lib/ps2epsi -+++ b/lib/ps2epsi -@@ -40,8 +40,8 @@ else - outfile=$2 - fi - --# Note, we expect 'ps2epsi.ps' to be in the same directory as 'ps2epsi' -+# Note, we expect 'ps2epsi.ps' to be on one of the search paths which can be seen by: gs -h - "$GS_EXECUTABLE" -q -dNOOUTERSAVE -dNODISPLAY -dLastPage=1 -sOutputFile="${outfile}" \ -- --permit-file-all="${infile}" -- "$LIBDIR/ps2epsi.ps" "${infile}" 1>&2 -+ --permit-file-all="${infile}" -- ps2epsi.ps "${infile}" 1>&2 - - exit 0 - diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch deleted file mode 100644 index 59d9ae0095f7..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.ghostscript.com/show_bug.cgi?id=702985 -https://bugs.gentoo.org/747808 - ---- ghostscript-9.53.3/base/fapi_ft.c -+++ ghostscript-9.53.3/base/fapi_ft.c -@@ -125,6 +125,14 @@ - delete_inc_int_info(gs_fapi_server * a_server, - FT_IncrementalRec * a_inc_int_info); - -+#ifndef FT_CALLBACK_DEF -+#ifdef __cplusplus -+#define FT_CALLBACK_DEF( x ) extern "C" x -+#else -+#define FT_CALLBACK_DEF( x ) static x -+#endif -+#endif -+ - FT_CALLBACK_DEF(void *) - FF_alloc(FT_Memory memory, long size) - { diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch deleted file mode 100644 index 779bedad4bde..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch +++ /dev/null @@ -1,213 +0,0 @@ -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=a9bd3dec9fde03327a4a2c69dad1036bf9632e20 -https://bugs.gentoo.org/812509 - -From: Chris Liddell <chris.liddell@artifex.com> -Date: Tue, 7 Sep 2021 20:36:12 +0100 -Subject: [PATCH 1/1] Bug 704342: Include device specifier strings in access - validation - -for the "%pipe%", %handle%" and %printer% io devices. - -We previously validated only the part after the "%pipe%" Postscript device -specifier, but this proved insufficient. - -This rebuilds the original file name string, and validates it complete. The -slight complication for "%pipe%" is it can be reached implicitly using -"|" so we have to check both prefixes. - -Addresses CVE-2021-3781 ---- a/base/gdevpipe.c -+++ b/base/gdevpipe.c -@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access, - #else - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ /* The pipe device can be reached in two ways, explicltly with %pipe% -+ or implicitly with "|", so we have to check for both -+ */ -+ char f[gp_file_name_sizeof]; -+ const char *pipestr = "|"; -+ const size_t pipestrlen = strlen(pipestr); -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); -+ int code1; -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ code1 = gp_validate_path(mem, f, access); -+ -+ memcpy(f, pipestr, pipestrlen); -+ memcpy(f + pipestrlen, fname, nlen + 1); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 ) - return gs_error_invalidfileaccess; - - /* ---- a/base/gp_mshdl.c -+++ b/base/gp_mshdl.c -@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access, - long hfile; /* Correct for Win32, may be wrong for Win64 */ - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ char f[gp_file_name_sizeof]; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(f, iodev->dname, preflen); -+ memcpy(f + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, f, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_handle method. */ ---- a/base/gp_msprn.c -+++ b/base/gp_msprn.c -@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - uintptr_t *ptid = &((tid_t *)(iodev->state))->tid; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const size_t nlen = strlen(fname); - -- if (gp_validate_path(mem, fname, access) != 0) -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(pname, iodev->dname, preflen); -+ memcpy(pname + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, pname, access) != 0) - return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ ---- a/base/gp_os2pr.c -+++ b/base/gp_os2pr.c -@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, - FILE ** pfile, char *rfname, uint rnamelen) - { - os2_printer_t *pr = (os2_printer_t *)iodev->state; -- char driver_name[256]; -+ char driver_name[gp_file_name_sizeof]; - gs_lib_ctx_t *ctx = mem->gs_lib_ctx; - gs_fs_list_t *fs = ctx->core->fs; -+ const size_t preflen = strlen(iodev->dname); -+ const int size_t = strlen(fname); -+ -+ if (preflen + nlen >= gp_file_name_sizeof) -+ return_error(gs_error_invalidaccess); -+ -+ memcpy(driver_name, iodev->dname, preflen); -+ memcpy(driver_name + preflen, fname, nlen + 1); -+ -+ if (gp_validate_path(mem, driver_name, access) != 0) -+ return gs_error_invalidfileaccess; - - /* First we try the open_printer method. */ - /* Note that the loop condition here ensures we don't ---- a/base/gslibctx.c -+++ b/base/gslibctx.c -@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s) - int - gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ - rewrite_percent_specifiers(f); -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_add_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_add_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_add_control_path(mem, gs_permit_file_control, fp); -+ -+ code = gs_add_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_add_control_path(mem, gs_permit_file_writing, fp); -+ return gs_add_control_path(mem, gs_permit_file_writing, f); - } - - int - gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname) - { -- char *fp, f[gp_file_name_sizeof]; -- const int pipe = 124; /* ASCII code for '|' */ -- const int len = strlen(fname); -- int i, code; -+ char f[gp_file_name_sizeof]; -+ int code; - - /* Be sure the string copy will fit */ -- if (len >= gp_file_name_sizeof) -+ if (strlen(fname) >= gp_file_name_sizeof) - return gs_error_rangecheck; - strcpy(f, fname); -- fp = f; - /* Try to rewrite any %d (or similar) in the string */ -- for (i = 0; i < len; i++) { -- if (f[i] == pipe) { -- fp = &f[i + 1]; -- /* Because we potentially have to check file permissions at two levels -- for the output file (gx_device_open_output_file and the low level -- fopen API, if we're using a pipe, we have to add both the full string, -- (including the '|', and just the command to which we pipe - since at -- the pipe_fopen(), the leading '|' has been stripped. -- */ -- code = gs_remove_control_path(mem, gs_permit_file_writing, f); -- if (code < 0) -- return code; -- code = gs_remove_control_path(mem, gs_permit_file_control, f); -- if (code < 0) -- return code; -- break; -- } -- if (!IS_WHITESPACE(f[i])) -- break; -- } -- code = gs_remove_control_path(mem, gs_permit_file_control, fp); -+ rewrite_percent_specifiers(f); -+ -+ code = gs_remove_control_path(mem, gs_permit_file_control, f); - if (code < 0) - return code; -- return gs_remove_control_path(mem, gs_permit_file_writing, fp); -+ return gs_remove_control_path(mem, gs_permit_file_writing, f); - } - - int diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild index cdb280036d23..bd7de413886b 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild @@ -1,30 +1,30 @@ -# 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 flag-o-matic toolchain-funcs -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" - MY_PN=${PN/-gpl} MY_P="${MY_PN}-${PV/_}" PVM=$(ver_cut 1-2) PVM_S=$(ver_rs 1-2 "") -MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz" +# 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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}" fi LICENSE="AGPL-3 CPL-1.0" SLOT="0/$(ver_cut 1-2)" -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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X" +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 @@ -32,25 +32,27 @@ for X in ${LANGS} ; do done DEPEND=" - app-text/libpaper + 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:0= - >=media-libs/tiff-4.0.1:0= + >=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 - virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - unicode? ( net-dns/libidn:0= ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) " BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data +# 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 ) @@ -61,22 +63,22 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" # bug #747808 - "${FILESDIR}/${P}-fix-ps2epsi.patch" + "${FILESDIR}"/${PN}-10.02.1-c99.patch + "${FILESDIR}"/${PN}-10.02.1-c99-2.patch ) src_prepare() { - if [[ -n "${MY_PATCHSET}" ]] ; then + 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/master/debian/patches - eapply "${WORKDIR}/patches/"*.patch + # 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 + # Remove internal copies of various libraries rm -r cups/libs || die rm -r freetype || die rm -r jbig2dec || die @@ -86,7 +88,7 @@ src_prepare() { rm -r tiff || die rm -r zlib || die rm -r openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) + # Remove internal CMaps (CMaps from poppler-data are used instead) rm -r Resource/CMap || die if ! use gtk ; then @@ -105,7 +107,7 @@ src_prepare() { -e 's|-DOPJ_STATIC ||' \ -i base/lib.mak || die - # search path fix + # 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:" \ @@ -114,7 +116,7 @@ src_prepare() { -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ -i Makefile.in base/*.mak || die "sed failed" - # remove incorrect symlink, bug 590384 + # Remove incorrect symlink, bug 590384 rm ijs/ltmain.sh || die eautoreconf @@ -123,35 +125,35 @@ src_prepare() { } src_configure() { + # Unsupported upstream, bug #884841 + filter-lto + local FONTPATH for path in \ "${EPREFIX}"/usr/share/fonts/urw-fonts \ "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 + "${EPREFIX}"/usr/share/fonts do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" done - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ + # 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 \ - $(use_enable jpeg2k openjpeg) \ + --enable-openjpeg \ --disable-compile-inits \ --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ + --with-fontpath="${FONTPATH}" \ --with-ijs \ --with-jbig2dec \ --with-libpaper \ - --with-openprinting \ --with-system-libtiff \ - --without-luratech \ $(use_enable cups) \ $(use_enable dbus) \ $(use_enable gtk) \ @@ -183,14 +185,15 @@ src_install() { cd "${S}/ijs" || die emake DESTDIR="${D}" install - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap" + # 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 - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi } diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild index 26de70cf7a7c..7bd11e3f8484 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild @@ -1,30 +1,30 @@ -# 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 toolchain-funcs - -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" +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 "") -MY_PATCHSET="ghostscript-gpl-9.54-patchset-01.tar.xz" +# 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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}" fi LICENSE="AGPL-3 CPL-1.0" SLOT="0/$(ver_cut 1-2)" -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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X" +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 @@ -32,25 +32,27 @@ for X in ${LANGS} ; do done DEPEND=" - app-text/libpaper + 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:0= - >=media-libs/tiff-4.0.1:0= + >=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 - virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - unicode? ( net-dns/libidn:0= ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) " BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data +# 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 ) @@ -60,20 +62,22 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-10.02.1-c99.patch +) + src_prepare() { - if [[ -n "${MY_PATCHSET}" ]] ; then + 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}/patches/"*.patch + eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*} fi - eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch - default - # remove internal copies of various libraries + # Remove internal copies of various libraries rm -r cups/libs || die rm -r freetype || die rm -r jbig2dec || die @@ -83,7 +87,7 @@ src_prepare() { rm -r tiff || die rm -r zlib || die rm -r openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) + # Remove internal CMaps (CMaps from poppler-data are used instead) rm -r Resource/CMap || die if ! use gtk ; then @@ -102,7 +106,7 @@ src_prepare() { -e 's|-DOPJ_STATIC ||' \ -i base/lib.mak || die - # search path fix + # 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:" \ @@ -111,7 +115,7 @@ src_prepare() { -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ -i Makefile.in base/*.mak || die "sed failed" - # remove incorrect symlink, bug 590384 + # Remove incorrect symlink, bug 590384 rm ijs/ltmain.sh || die eautoreconf @@ -120,29 +124,31 @@ src_prepare() { } src_configure() { + # Unsupported upstream, bug #884841 + filter-lto + local FONTPATH for path in \ "${EPREFIX}"/usr/share/fonts/urw-fonts \ "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 + "${EPREFIX}"/usr/share/fonts do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" done - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ + # 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 \ - $(use_enable jpeg2k openjpeg) \ + --enable-openjpeg \ --disable-compile-inits \ --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ + --with-fontpath="${FONTPATH}" \ --with-ijs \ --with-jbig2dec \ --with-libpaper \ @@ -178,14 +184,15 @@ src_install() { cd "${S}/ijs" || die emake DESTDIR="${D}" install - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap" + # 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 - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi } diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild index 6b35ee1d7bda..06fb12a0d2a7 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild @@ -1,30 +1,31 @@ -# 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 flag-o-matic toolchain-funcs -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" - MY_PN=${PN/-gpl} MY_P="${MY_PN}-${PV/_}" PVM=$(ver_cut 1-2) PVM_S=$(ver_rs 1-2 "") -MY_PATCHSET="ghostscript-gpl-9.54-patchset-01.tar.xz" +# 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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" + 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 ~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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X" +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 @@ -32,25 +33,27 @@ for X in ${LANGS} ; do done DEPEND=" - app-text/libpaper + 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:0= - >=media-libs/tiff-4.0.1:0= + >=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 - virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - unicode? ( net-dns/libidn:0= ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) " BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data +# 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 ) @@ -58,20 +61,22 @@ RDEPEND="${DEPEND} l10n_zh-TW? ( media-fonts/arphicfonts ) " -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-10.03.0-c99.patch +) src_prepare() { - if [[ -n "${MY_PATCHSET}" ]] ; then + 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/master/debian/patches - eapply "${WORKDIR}/patches/"*.patch + # 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 + # Remove internal copies of various libraries rm -r cups/libs || die rm -r freetype || die rm -r jbig2dec || die @@ -81,7 +86,7 @@ src_prepare() { rm -r tiff || die rm -r zlib || die rm -r openjpeg || die - # remove internal CMaps (CMaps from poppler-data are used instead) + # Remove internal CMaps (CMaps from poppler-data are used instead) rm -r Resource/CMap || die if ! use gtk ; then @@ -100,7 +105,7 @@ src_prepare() { -e 's|-DOPJ_STATIC ||' \ -i base/lib.mak || die - # search path fix + # 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:" \ @@ -109,7 +114,7 @@ src_prepare() { -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ -i Makefile.in base/*.mak || die "sed failed" - # remove incorrect symlink, bug 590384 + # Remove incorrect symlink, bug 590384 rm ijs/ltmain.sh || die eautoreconf @@ -118,29 +123,34 @@ src_prepare() { } 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 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 + "${EPREFIX}"/usr/share/fonts do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" done - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ + # 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 \ - $(use_enable jpeg2k openjpeg) \ + --enable-openjpeg \ --disable-compile-inits \ --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ + --with-fontpath="${FONTPATH}" \ --with-ijs \ --with-jbig2dec \ --with-libpaper \ @@ -161,9 +171,7 @@ src_configure() { src_compile() { emake so all - - cd ijs || die - emake + emake -C ijs } src_install() { @@ -176,14 +184,15 @@ src_install() { cd "${S}/ijs" || die emake DESTDIR="${D}" install - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap" + # 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 - - if ! use l10n_de; then - rm -r "${ED}"/usr/share/man/de || die - fi } diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild deleted file mode 100644 index 29656ad43154..000000000000 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Interpreter for the PostScript language and PDF" -HOMEPAGE="https://ghostscript.com/" - -MY_PN=${PN/-gpl} -MY_P="${MY_PN}-${PV/_}" -PVM=$(ver_cut 1-2) -PVM_S=$(ver_rs 1-2 "") - -MY_PATCHSET="ghostscript-gpl-9.52-patchset-01.tar.xz" - -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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}" -fi - -LICENSE="AGPL-3 CPL-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="cups dbus gtk l10n_de static-libs tiff 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.16:= - >=media-libs/lcms-2.6:2 - >=media-libs/libpng-1.6.2:0= - >=media-libs/openjpeg-2.1.0:2= - >=sys-libs/zlib-1.2.7 - virtual/jpeg:0 - cups? ( >=net-print/cups-1.3.8 ) - dbus? ( sys-apps/dbus ) - gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) - unicode? ( net-dns/libidn:0= ) - tiff? ( >=media-libs/tiff-4.0.1:0= ) - X? ( x11-libs/libXt x11-libs/libXext ) -" -BDEPEND="virtual/pkgconfig" -RDEPEND="${DEPEND} - app-text/poppler-data - >=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 ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # bug #747808 - "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.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/master/debian/patches - eapply "${WORKDIR}/patches/"*.patch - 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/${PVM}/$(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() { - local FONTPATH - for path in \ - "${EPREFIX}"/usr/share/fonts/urw-fonts \ - "${EPREFIX}"/usr/share/fonts/Type1 \ - "${EPREFIX}"/usr/share/fonts \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \ - "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1 - do - FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path" - done - - PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \ - econf \ - --enable-dynamic \ - --enable-freetype \ - --enable-fontconfig \ - --enable-openjpeg \ - --disable-compile-inits \ - --with-drivers=ALL \ - --with-fontpath="$FONTPATH" \ - --with-ijs \ - --with-jbig2dec \ - --with-libpaper \ - --without-luratech \ - $(use_enable cups) \ - $(use_enable dbus) \ - $(use_enable gtk) \ - $(use_with cups pdftoraster) \ - $(use_with unicode libidn) \ - $(use_with tiff system-libtiff) \ - $(use_with X x) - - cd "${S}/ijs" || die - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_compile() { - emake so all - - cd ijs || die - emake -} - -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 - - # rename the original cidfmap to cidfmap.GS - mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die - - # install the CMaps from poppler-data properly, bug #409361 - dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap" - - 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/metadata.xml b/app-text/ghostscript-gpl/metadata.xml index 9da8ae5ef674..dd57cc77263a 100644 --- a/app-text/ghostscript-gpl/metadata.xml +++ b/app-text/ghostscript-gpl/metadata.xml @@ -14,8 +14,9 @@ </slots> <upstream> <remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id> - <remote-id type="sourceforge">djvu</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> <use> <flag name="unicode">Add support for unicode passwords via <pkg>net-dns/libidn</pkg></flag> diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild index 4a2508c9489f..e768dd0948e2 100644 --- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild +++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) -inherit gnome2 multibuild python-r1 +inherit gnome2 python-r1 DESCRIPTION="A collection of documentation utilities for the Gnome project" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils" -SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch" +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 ~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" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} @@ -24,9 +23,11 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd +" +BDEPEND=" >=dev-util/intltool-0.35 sys-devel/gettext - virtual/awk + app-alternatives/awk virtual/pkgconfig " # dev-libs/glib needed for eautofoo, bug #255114. @@ -39,6 +40,10 @@ src_prepare() { eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch eapply "${DISTDIR}"/${P}-python3.patch + # Empty py-compile, so it doesn't write its own pyo/pyc files + echo > "${S}"/py-compile + chmod a+x "${S}"/py-compile || die + gnome2_src_prepare # Leave shebang alone diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml index c6e394b17a27..b176e403791e 100644 --- a/app-text/gnome-doc-utils/metadata.xml +++ b/app-text/gnome-doc-utils/metadata.xml @@ -5,4 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">Archive/gnome-doc-utils</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest deleted file mode 100644 index 12c0bda06be2..000000000000 --- a/app-text/gocr/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9 -DIST gocr-0.52.tar.gz 445401 BLAKE2B 1f22f5377bb95053e3ab4ede074b3fceca4065f9ca0ede05a8023ebe807f41074f5ead84e133281e98be7f68f13b036dc759cccaf4a5688bf776f62f2de1970a SHA512 e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild deleted file mode 100644 index 3517d1e07a87..000000000000 --- a/app-text/gocr/gocr-0.50.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 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/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 88b44b536ed2..a0889b63e8c2 100644 --- a/app-text/grip/Manifest +++ b/app-text/grip/Manifest @@ -1 +1 @@ -DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9 +DIST grip-4.6.2.tar.gz 152280 BLAKE2B 02a5fb21190fe167428fb36390a087094c064fc11bc2016579391b3568bd421c8f0920f7b325e5be8140ebd8e7f7a0c0e20085f9d8899daf3ee85f27f33ffa9d SHA512 e4dc38d25198a1670df7ecf950fc2c815c3e8507571d54d3df844547ee7db0d1a7cbbbaa23fd7daa1391eea12a2788890d5cee09aa64b8bf1039beeb78a5d25f diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.6.2.ebuild index bcc8bb3ea4c8..7e8469d79e06 100644 --- a/app-text/grip/grip-4.5.2-r2.ebuild +++ b/app-text/grip/grip-4.6.2.ebuild @@ -1,22 +1,20 @@ -# 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 -PYTHON_COMPAT=( pypy3 python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 +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" HOMEPAGE="https://github.com/joeyespo/grip" LICENSE="MIT" SLOT="0" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" 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-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild index 86f8be4f031a..c2a7aacdc072 100644 --- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild +++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers" @@ -11,20 +12,21 @@ SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="app-text/groonga" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + DOCS=( README.md ) src_prepare() { - default_src_prepare + default + eautoreconf } src_configure() { - # ruby is only uses for tests + # ruby is only used for tests econf --without-ruby } @@ -32,5 +34,5 @@ src_install() { default find "${ED}" -name '*.la' -delete || die - rm -r "${D}usr/share/doc/${PN}" || die + rm -r "${ED}"/usr/share/doc/${PN} || die } 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/groonga/metadata.xml b/app-text/groonga/metadata.xml index 8d14952aa047..e44ae2d43a92 100644 --- a/app-text/groonga/metadata.xml +++ b/app-text/groonga/metadata.xml @@ -1,20 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> - <flag name="abort">Enable query abortion</flag> - <flag name="benchmark">Build benchmark programs</flag> - <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag> - <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag> - <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag> - <flag name="futex">Use futex</flag> - <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag> - <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag> - <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag> - <flag name="nfkc">Use nfkc based utf8 normalization</flag> - <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag> - <flag name="uyield">Build for detecting race conditions</flag> - <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="abort">Enable query abortion</flag> + <flag name="benchmark">Build benchmark programs</flag> + <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag> + <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag> + <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag> + <flag name="futex">Use futex</flag> + <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag> + <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag> + <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag> + <flag name="nfkc">Use nfkc based utf8 normalization</flag> + <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag> + <flag name="uyield">Build for detecting race conditions</flag> + <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag> + </use> + <upstream> + <remote-id type="github">groonga/groonga</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest index 0718f58bd03a..e9bd0d97025a 100644 --- a/app-text/grutatxt/Manifest +++ b/app-text/grutatxt/Manifest @@ -1 +1 @@ -DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512 +DIST grutatxt-2.200.0.tar.gz 20751 BLAKE2B 1df00316b4379f7922348fa6a90e53ed0a34e5498558b00a7dde09e7eea53098ce9b66e44260a95575b52180baff5b78073339d0f47370e30b8c61042ae40c4b SHA512 2ecf5145c42efbfde69278ecd9a7bbddceef79aed036a659e126f02ba2c20968c10425004298f6fb786b0e9407b4c78f25885ea4f112dbca111b6bf8b7e834c0 diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild deleted file mode 100644 index 68a3e9b6acbd..000000000000 --- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module - -MY_PN="Grutatxt" -MY_P=${MY_PN}-${PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="A converter from plain text to HTML and other markup languages" -HOMEPAGE="https://triptico.com/software/grutatxt.html" -SRC_URI="https://www.triptico.com/download/${MY_P}.tar.gz" -LICENSE="GPL-2" - -IUSE="" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris" - -# set the script path to /usr/bin, rather than /usr/local/bin -myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin" diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild new file mode 100644 index 000000000000..f9d512ab0d7e --- /dev/null +++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_NAME="Grutatxt" +DIST_VERSION="2.20" + +inherit perl-module + +DESCRIPTION="A converter from plain text to HTML and other markup languages" +HOMEPAGE="https://triptico.com/software/grutatxt.html" +# upstream no longer versions the tarballs +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" diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest index 34bc9840e69b..dee73ee1e7f6 100644 --- a/app-text/gspell/Manifest +++ b/app-text/gspell/Manifest @@ -1 +1 @@ -DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca +DIST gspell-1.12.2.tar.xz 442824 BLAKE2B 6a574339dfa4930e5506d63d5f0cf27d8433c2914ce1204edc8366992ebf05bf78d4777029fa17f05be73291510897862c63479e59e72522a4c4943647f66539 SHA512 c13df805f6128cfd19c41e4936fbb49516f80e09d27e79380d5638cbd1a8a3bfc6aae5ef8a4faa748495fe529bde92805bbd5530610b113c58daa36f273a5af8 diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.12.2.ebuild index 8228c7822e6f..8a3f1d0034a9 100644 --- a/app-text/gspell/gspell-1.9.1.ebuild +++ b/app-text/gspell/gspell-1.12.2.ebuild @@ -1,33 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_USE_DEPEND="vapigen" +EAPI=8 inherit gnome2 vala virtualx DESCRIPTION="Spell check library for GTK+ applications" -HOMEPAGE="https://wiki.gnome.org/Projects/gspell" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell" LICENSE="LGPL-2.1+" SLOT="0/2" # subslot = libgspell-1 soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~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 )" -DEPEND=" - >=app-text/enchant-2.1.3:2 +RDEPEND=" + >=app-text/enchant-2.2:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + test? ( sys-apps/dbus ) +" 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) ) @@ -45,7 +46,7 @@ BDEPEND=" # but we don't support them at this time (2020-04-12) in enchant:2 src_prepare() { - use vala && vala_src_prepare + use vala && vala_setup gnome2_src_prepare } @@ -56,5 +57,5 @@ src_configure() { } src_test() { - virtx emake check + virtx dbus-run-session emake check } diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml index 7b343b06be8a..b05cd3f331a8 100644 --- a/app-text/gspell/metadata.xml +++ b/app-text/gspell/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gspell</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild index d2a9465c87c3..a1eabd0729d5 100644 --- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild +++ b/app-text/gtkspell/gtkspell-2.0.16-r2.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 DESCRIPTION="Spell checking widget for GTK" HOMEPAGE="http://gtkspell.sourceforge.net/" @@ -10,18 +10,17 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig" -DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty - src_prepare() { default @@ -30,10 +29,10 @@ src_prepare() { } src_configure() { - econf --disable-static --disable-gtk-doc + econf --disable-gtk-doc } src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die } diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild index 9e36430f1a65..5570bc4fc961 100644 --- a/app-text/gtkspell/gtkspell-3.0.10.ebuild +++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild @@ -1,18 +1,20 @@ -# 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 gnome2 vala +MY_P="${PN}3-${PV}" + DESCRIPTION="Spell checking widget for GTK" HOMEPAGE="http://gtkspell.sourceforge.net/" -MY_P="${PN}3-${PV}" -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 ~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 )" @@ -22,25 +24,18 @@ RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.17 + introspection? ( >=dev-libs/gobject-introspection-1.30:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} + vala? ( $(vala_depend) )" src_configure() { + use vala && vala_setup + gnome2_src_configure \ - --disable-static \ $(use_enable introspection) \ $(use_enable vala) } diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest index d80e5087877a..d67f3279c6c4 100644 --- a/app-text/gtranslator/Manifest +++ b/app-text/gtranslator/Manifest @@ -1 +1 @@ -DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47 +DIST gtranslator-45.3.tar.xz 1524700 BLAKE2B 5437f479d5276ef405cbd82c37aaa34b1cc4fe1ffa01d32e1e946adb65da0668ac6eb7359cb374a968367a16564959efb6d260dbeb148d34aca3c69cd545926e SHA512 6b4db2f12ec57db6b0ee7ae0030f2fe5bc748e0b501e3ea6f529e47e5e77196a47cf5bf6333fe84c314eaec20d353e7a2bf9a8bea75bbbcd7da438c2dc5e22c9 diff --git a/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch new file mode 100644 index 000000000000..78a7ac9b67d1 --- /dev/null +++ b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch @@ -0,0 +1,28 @@ +https://gitlab.gnome.org/GNOME/gtranslator/-/merge_requests/127 + +From 9d8f92d37a7af3eca6985de72f52b45a21f9c91d Mon Sep 17 00:00:00 2001 +From: Daniel Garcia Moreno <daniel.garcia@suse.com> +Date: Thu, 22 Sep 2022 08:20:11 +0200 +Subject: [PATCH] Revert "Add GDA 6 compatibility" + +This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 076812bd..f734e496 100644 +--- a/meson.build ++++ b/meson.build +@@ -119,7 +119,7 @@ gtr_deps = [ + gtk_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('gthread-2.0', version: '>= 2.13.0'), +-- +2.35.1 + diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-45.3.ebuild index 00fa6d54bb65..ef91db5918ed 100644 --- a/app-text/gtranslator/gtranslator-40.0.ebuild +++ b/app-text/gtranslator/gtranslator-45.3.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 gnome.org gnome2-utils meson xdg @@ -14,16 +14,14 @@ KEYWORDS="amd64 ~ppc x86" IUSE="gtk-doc" DEPEND=" - >=dev-libs/glib-2.36.0:2 - >=x11-libs/gtk+-3.22.20:3 - gui-libs/libhandy:1= - >=dev-libs/libdazzle-3.33.90 + >=dev-libs/glib-2.71.3:2 + >=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:2.4 + net-libs/libsoup:3.0 >=dev-libs/json-glib-1.2.0 " RDEPEND="${DEPEND}" @@ -40,9 +38,14 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-45.2-Revert-Add-GDA-6-compatibility.patch +) + src_configure() { local emesonargs=( $(meson_use gtk-doc gtk_doc) + -Dprofile=default ) meson_src_configure } diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml index 64f3ff5e69dd..b5c704d5c64a 100644 --- a/app-text/gtranslator/metadata.xml +++ b/app-text/gtranslator/metadata.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription lang="en"> - Gtranslator is an enhanced gettext po file editor for the GNOME desktop - environment. - It handles all forms of gettext po files and includes very useful features - like find/replace, translation memory, different translator profiles, - messages table (for having an overview of the translations/messages in the - po file), easy navigation and editing of translation messages and comments - of the translation where accurate. - </longdescription> - <upstream> - <remote-id type="sourceforge">gtranslator</remote-id> - </upstream> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription lang="en"> + Gtranslator is an enhanced gettext po file editor for the GNOME desktop + environment. + It handles all forms of gettext po files and includes very useful features + like find/replace, translation memory, different translator profiles, + messages table (for having an overview of the translations/messages in the + po file), easy navigation and editing of translation messages and comments + of the translation where accurate. + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gtranslator</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest index bdd011b0171e..b22dca3b813f 100644 --- a/app-text/gv/Manifest +++ b/app-text/gv/Manifest @@ -1 +1,2 @@ DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50 +DIST gv-3.7.4.tar.gz 759287 BLAKE2B 2f18309d16a3c11dc0da0fa507f43c8128a4cabff8c1675895fac011702db677ef51989d2536bcbc7d3b4aa3e3cdf470a2a3e4699109b501141caffeb7e532a8 SHA512 f6dc072b6b72b6c543733501c719aa38c81a2e2fc63fbf1459b8a3a50a1a70eca9fc9def2fbeb51cb7bb81cfc3b20f136732d935740693bf541d7135975df648 diff --git a/app-text/gv/files/gv-3.7.4-bounding-box.patch b/app-text/gv/files/gv-3.7.4-bounding-box.patch new file mode 100644 index 000000000000..b55ddbd4a3ee --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-bounding-box.patch @@ -0,0 +1,15 @@ +Fix bounding box recognition +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bounding-box.patch + +diff a/src/ps.c b/src/ps.c +--- a/src/ps.c ++++ b/src/ps.c +@@ -357,7 +357,7 @@ static int parse_boundingbox(const char *l, int *boundingbox) { + while (*p == ' ' || *p == '\t') + p++; + fury = strtod(p, &pe); +- if (*pe != '\n' && *pe != '\0' && *pe != ' ' && *pe != '\t') { ++ if (*pe != '\n' && *pe != '\r'&& *pe != '\0' && *pe != ' ' && *pe != '\t') { + return 0; + } + diff --git a/app-text/gv/files/gv-3.7.4-bug1071238.patch b/app-text/gv/files/gv-3.7.4-bug1071238.patch new file mode 100644 index 000000000000..d50f67c79cb8 --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-bug1071238.patch @@ -0,0 +1,22 @@ +Fix NULL access segfault +https://bugzilla.redhat.com/show_bug.cgi?id=1071238 +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bug1071238.patch + +diff a/src/zoom.c b/src/zoom.c +--- a/src/zoom.c ++++ b/src/zoom.c +@@ -104,12 +104,12 @@ zoom_createZoom(Widget w _GL_UNUSED, XtP + + BEGINMESSAGE(zoom_createZoom) + +- if (!(gv_psfile != NULL || (gv_gs_arguments && *gv_gs_arguments))) { ++ if (!gv_psfile) { + INFMESSAGE(no file) ENDMESSAGE(zoom_createZoom) + return; + } + +- if (strcmp(gv_filename, "-")) { ++ if (gv_filename != NULL && strcmp(gv_filename, "-")) { + stat(gv_filename, &sbuf); + if (mtime != sbuf.st_mtime) { + INFMESSAGE1(file has changed) ENDMESSAGE1(zoom_createZoom)return; diff --git a/app-text/gv/files/gv-3.7.4-bz1536211.patch b/app-text/gv/files/gv-3.7.4-bz1536211.patch new file mode 100644 index 000000000000..94808a8b8ea8 --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-bz1536211.patch @@ -0,0 +1,28 @@ +Fix PDF printing +https://bugzilla.redhat.com/show_bug.cgi?id=1536211 +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bz1536211.patch + +diff -up a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -198,7 +198,7 @@ gv_intern_res_unix.dat : + @echo "" >> gv_intern_res_unix.dat + @echo "GV.gsInterpreter: gs" >> gv_intern_res_unix.dat + @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s %s pdf2dsc.ps -c quit" >> gv_intern_res_unix.dat +- @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=pswrite -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat ++ @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ps2write -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat + @echo "GV.gsX11Device: -sDEVICE=x11" >> gv_intern_res_unix.dat + @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> gv_intern_res_unix.dat + @echo "GV.gsSafeDir: True" >> gv_intern_res_unix.dat +diff -up a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1134,7 +1134,7 @@ gv_intern_res_unix.dat : + @echo "" >> gv_intern_res_unix.dat + @echo "GV.gsInterpreter: gs" >> gv_intern_res_unix.dat + @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s %s pdf2dsc.ps -c quit" >> gv_intern_res_unix.dat +- @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=pswrite -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat ++ @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ps2write -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat + @echo "GV.gsX11Device: -sDEVICE=x11" >> gv_intern_res_unix.dat + @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> gv_intern_res_unix.dat + @echo "GV.gsSafeDir: True" >> gv_intern_res_unix.dat diff --git a/app-text/gv/files/gv-3.7.4-dat.patch b/app-text/gv/files/gv-3.7.4-dat.patch new file mode 100644 index 000000000000..aeaea246d029 --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-dat.patch @@ -0,0 +1,15 @@ +Change tab to space in gv_user_res.dat +http://savannah.gnu.org/patch/?7998 +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-dat.patch + +--- a/src/gv_user_res.dat ++++ b/src/gv_user_res.dat +@@ -39,7 +39,7 @@ + save_marked + GV.scale: 0 + GV.scaleBase: 1 +-GV.scales: Natural size, 1.000, screen \n\ ++GV.scales: Natural size, 1.000, screen \n\ + Pixel based, 1.000, pixel \n\ + Arbitrary magnification, -2 \n\ + Fit height to window, -3 \n\ diff --git a/app-text/gv/files/gv-3.7.4-overflow.patch b/app-text/gv/files/gv-3.7.4-overflow.patch new file mode 100644 index 000000000000..05cbda055f63 --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-overflow.patch @@ -0,0 +1,27 @@ +Fix buffer overflows in resource.c +https://savannah.gnu.org/patch/?10096 +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-overflow.patch + +diff a/src/resource.c b/src/resource.c +--- a/src/resource.c ++++ b/src/resource.c +@@ -230,15 +230,15 @@ resource_buildDatabase ( + s = resource_getResource(db,app_class,app_name, "international",0); + if (s == NULL || !strcasecmp(s, "False")) + { +- sprintf(locale1, "noint:%s%s", loc_lang, loc_terr); +- sprintf(locale2, "noint:%s", loc_lang); ++ snprintf(locale1, 100, "noint:%s%s", loc_lang, loc_terr); ++ snprintf(locale2, 100, "noint:%s", loc_lang); + strcpy(locale3, "C"); + } + else + { + strcpy(locale1, locale); +- sprintf(locale2, "%s%s%s", loc_lang, loc_terr, loc_cs); +- sprintf(locale3, "%s%s", loc_lang, loc_cs); ++ snprintf(locale2, 100, "%s%s%s", loc_lang, loc_terr, loc_cs); ++ snprintf(locale3, 100, "%s%s", loc_lang, loc_cs); + } + + if (debug_p) diff --git a/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch b/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch new file mode 100644 index 000000000000..540d590e4520 --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/855011 + +diff -ruN a/src/Scrollbar.c b/src/Scrollbar.c +--- a/src/Scrollbar.c ++++ b/src/Scrollbar.c +@@ -1364,12 +1364,6 @@ + INFMESSAGE(returning due to LookAhead) ENDMESSAGE(NotifyThumb) + return; + } +- /* +- thumbProc is not pretty, but is necessary for backwards +- compatibility on those architectures for which it work{s,ed}; +- the intent is to pass a (truncated) float by value. +- */ +- XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&TOP); + XtCallCallbacks (w, XtNjumpProc, (XtPointer)&TOP); + ENDMESSAGE(NotifyThumb) + } diff --git a/app-text/gv/files/gv-3.7.4-resource.patch b/app-text/gv/files/gv-3.7.4-resource.patch new file mode 100644 index 000000000000..15c39e3cbdae --- /dev/null +++ b/app-text/gv/files/gv-3.7.4-resource.patch @@ -0,0 +1,33 @@ +Check for null pointers in resource requests +https://savannah.gnu.org/bugs/?38727 +https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-resource.patch + +--- a/src/main.c ++++ b/src/main.c +@@ -1449,7 +1449,7 @@ + if (s) gv_gs_arguments = s; + + s = resource_getResource(db,gv_class,gv_name,"gsSafeDir",NULL); +- if (!strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0; ++ if (s && !strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0; + + s = resource_getResource(db,gv_class,gv_name,"gsSafer",NULL); + if (s && !strcasecmp(s,"true")) gv_gs_safer = 1; else gv_gs_safer = 0; +@@ -1468,13 +1468,13 @@ + } + + s = resource_getResource(db,gv_class,gv_name,"infoVerbose",NULL); +- if (!strcasecmp(s, "Silent")) gv_infoVerbose=0; +- else if (!strcasecmp(s, "Errors")) gv_infoVerbose=1; +- else if (!strcasecmp(s, "All")) gv_infoVerbose=2; ++ if (!s || !strcasecmp(s, "Errors")) gv_infoVerbose=1; ++ else if (!strcasecmp(s, "Silent")) gv_infoVerbose=0; ++ else if (!strcasecmp(s, "All")) gv_infoVerbose=2; + else gv_infoVerbose = 1; + + s = resource_getResource(db,gv_class,gv_name,"xinerama",NULL); +- if (!strcasecmp(s, "Off")) gv_xinerama=0; ++ if (!s || !strcasecmp(s, "Off")) gv_xinerama=0; + else if (!strcasecmp(s, "On")) gv_xinerama=1; + else if (!strcasecmp(s, "Auto")) gv_xinerama=-1; + else gv_xinerama = 0; diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90-r1.ebuild index fb9fe32c8378..31c99c911a54 100644 --- a/app-text/gv/gv-3.7.3.90.ebuild +++ b/app-text/gv/gv-3.7.3.90-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://alpha.gnu.org/gnu/gv/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="xinerama" RDEPEND=" @@ -20,7 +20,7 @@ RDEPEND=" x11-libs/libICE x11-libs/libSM x11-libs/libX11 - >=x11-libs/libXaw3d-1.6-r1[unicode] + >=x11-libs/libXaw3d-1.6-r1[unicode(+)] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm diff --git a/app-text/gv/gv-3.7.4.ebuild b/app-text/gv/gv-3.7.4.ebuild new file mode 100644 index 000000000000..872bc434e38e --- /dev/null +++ b/app-text/gv/gv-3.7.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop gnuconfig toolchain-funcs + +DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript" +HOMEPAGE="https://www.gnu.org/software/gv/" +SRC_URI="https://ftp.gnu.org/gnu/gv/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="xinerama" + +RDEPEND=" + app-text/ghostscript-gpl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libXaw3d-1.6-r1[unicode(+)] + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-resource.patch + "${FILESDIR}"/${P}-dat.patch + "${FILESDIR}"/${P}-bounding-box.patch + "${FILESDIR}"/${P}-bug1071238.patch + "${FILESDIR}"/${P}-bz1536211.patch + "${FILESDIR}"/${P}-overflow.patch + "${FILESDIR}"/${P}-remove-aliasing-violation.patch +) + +src_prepare() { + default + gnuconfig_update +} + +src_configure() { + export ac_cv_lib_Xinerama_main=$(usex xinerama) + econf --enable-scrollbar-code +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + rm README.{I18N,TRANSLATION} || die + default + + doicon "${FILESDIR}"/gv_icon.xpm + make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer' +} 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 1e45eded6ce1..003099220e62 100644 --- a/app-text/highlight/Manifest +++ b/app-text/highlight/Manifest @@ -1,3 +1,7 @@ -DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99 -DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b 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 0772a0b94e40..9271ef7b7f6f 100644 --- a/app-text/highlight/highlight-4.1.ebuild +++ b/app-text/highlight/highlight-4.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 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/" @@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="examples qt5" REQUIRED_USE="${LUA_REQUIRED_USE}" @@ -39,16 +39,16 @@ PATCHES=( ) 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/" + 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/" ) src_prepare() { diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-4.6.ebuild index b302b8a2f602..d6d49225f645 100644 --- a/app-text/highlight/highlight-3.57-r100.ebuild +++ b/app-text/highlight/highlight-4.6.ebuild @@ -1,11 +1,11 @@ -# 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 -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/" @@ -13,25 +13,26 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="examples qt5" +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} - qt5? ( + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-libs/boost " BDEPEND=" virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) + gui? ( dev-qt/linguist-tools:5 ) " PATCHES=( @@ -39,23 +40,27 @@ PATCHES=( ) 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/" + 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" -i makefile || die + # 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 @@ -73,7 +78,7 @@ src_prepare() { } src_configure() { - if use qt5 ; then + 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}/\\\"' @@ -83,16 +88,15 @@ src_configure() { src_compile() { emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}" - if use qt5 ; then - pushd src/gui-qt > /dev/null || die - emake - popd > /dev/null || die + if use gui ; then + emake -C src/gui-qt fi } src_install() { emake -f makefile "${myhlopts[@]}" install - if use qt5; then + + if use gui; then emake -f makefile "${myhlopts[@]}" install-gui docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} fi diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-4.8.ebuild index b302b8a2f602..8f8dade1af5b 100644 --- a/app-text/highlight/highlight-3.60.ebuild +++ b/app-text/highlight/highlight-4.8.ebuild @@ -1,37 +1,42 @@ -# 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 -LUA_COMPAT=( lua5-{1..3} ) - -inherit lua-single qmake-utils toolchain-funcs +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" +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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="examples qt5" +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} - qt5? ( + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-libs/boost " BDEPEND=" virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) + gui? ( dev-qt/linguist-tools:5 ) + verify-sig? ( sec-keys/openpgp-keys-andresimon ) " PATCHES=( @@ -39,23 +44,27 @@ PATCHES=( ) 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/" + 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" -i makefile || die + # 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 @@ -73,7 +82,7 @@ src_prepare() { } src_configure() { - if use qt5 ; then + 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}/\\\"' @@ -83,16 +92,15 @@ src_configure() { src_compile() { emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}" - if use qt5 ; then - pushd src/gui-qt > /dev/null || die - emake - popd > /dev/null || die + if use gui ; then + emake -C src/gui-qt fi } src_install() { emake -f makefile "${myhlopts[@]}" install - if use qt5; then + + if use gui; then emake -f makefile "${myhlopts[@]}" install-gui docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS} 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/htag/htag-0.0.24-r1.ebuild b/app-text/htag/htag-0.0.24-r1.ebuild index a326995bb2ee..4a62922a36ea 100644 --- a/app-text/htag/htag-0.0.24-r1.ebuild +++ b/app-text/htag/htag-0.0.24-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit perl-module @@ -12,13 +12,12 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~mips ppc ~sparc x86" -IUSE="" src_install() { newbin htag.pl htag - # establish "${D}"usr/share/doc/${PF}, mv 2 folders in 1 line + # establish "${D}"/usr/share/doc/${PF}, mv 2 folders in 1 line perl-module_src_install - mv ./{example-scripts,docs/sample-config/} "${ED}"usr/share/doc/${PF}/ || die + mv ./{example-scripts,docs/sample-config/} "${ED}"/usr/share/doc/${PF}/ || die dodoc docs/{MACRO_DESCRIPTION,README} insinto /usr/share/htag/plugins diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest index 86852ff8c87f..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.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460 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-7.7.ebuild b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild deleted file mode 100644 index 52e4be4a403a..000000000000 --- a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-minimal - -DESCRIPTION="A number of simple utilities for manipulating HTML and XML files" -SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz" -HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos" - -RESTRICT="test" - -RDEPEND="net-misc/curl" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf -} - -src_compile() { - multilib-minimal_src_compile -} - -src_install() { - multilib-minimal_src_install -} diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild new file mode 100644 index 000000000000..40dab6ff6400 --- /dev/null +++ b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 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 + emake check SHELL="${BROOT}"/bin/bash +} diff --git a/app-text/html-xml-utils/html-xml-utils-7.8.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild deleted file mode 100644 index 6859458d15d6..000000000000 --- a/app-text/html-xml-utils/html-xml-utils-7.8.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-minimal - -DESCRIPTION="A number of simple utilities for manipulating HTML and XML files" -SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz" -HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos" - -RESTRICT="test" - -RDEPEND="net-misc/curl" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf -} - -src_compile() { - multilib-minimal_src_compile -} - -src_install() { - multilib-minimal_src_install -} diff --git a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild new file mode 100644 index 000000000000..bf51929c322d --- /dev/null +++ b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 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 + emake check SHELL="${BROOT}"/bin/bash +} 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..29a2f7e8e4d0 --- /dev/null +++ b/app-text/html-xml-utils/html-xml-utils-8.6.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 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 cfe1827107c0..910122596915 100644 --- a/app-text/html2text/Manifest +++ b/app-text/html2text/Manifest @@ -1,4 +1,2 @@ -DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5 -DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8 -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.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4 +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.0.ebuild b/app-text/html2text/html2text-2.1.1.ebuild index f7558b5e8e28..2a2be554d110 100644 --- a/app-text/html2text/html2text-2.0.0.ebuild +++ b/app-text/html2text/html2text-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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" @@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text" LICENSE="GPL-2" SLOT="0" -src_prepare() { - default +src_configure() { + # non-autoconf configure tc-export CXX + default } src_compile() { 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 f7558b5e8e28..000000000000 --- a/app-text/html2text/html2text-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 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_prepare() { - default - tc-export CXX -} - -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/metadata.xml b/app-text/html2text/metadata.xml index 3d1a383e5d9d..c8e4623184d3 100644 --- a/app-text/html2text/metadata.xml +++ b/app-text/html2text/metadata.xml @@ -5,4 +5,7 @@ <email>grobian@gentoo.org</email> <name>Fabian Groffen</name> </maintainer> + <upstream> + <remote-id type="github">grobian/html2text</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild index 8b2044b87896..65a3e66ba88e 100644 --- a/app-text/html401/html401-19991224-r4.ebuild +++ b/app-text/html401/html401-19991224-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit sgml-catalog-r1 DESCRIPTION="DTDs for the HyperText Markup Language 4.01" HOMEPAGE="https://www.w3.org/TR/html401/" -SRC_URI="https://www.w3.org/TR/1999/REC-html401-19991224/html40.tgz" +SRC_URI="https://www.w3.org/TR/1999/REC-html401-${PV}/html40.tgz" LICENSE="W3C" SLOT="0" diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest deleted file mode 100644 index 0e5f1befb819..000000000000 --- a/app-text/htmlc/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab2b30598572eca12952a0010edb1044b259ed13242534a66351c9855e43bbac613028d926370f6221e0d2 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc -DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4 diff --git a/app-text/htmlc/files/werror.patch b/app-text/htmlc/files/werror.patch deleted file mode 100644 index 4576b47b80a4..000000000000 --- a/app-text/htmlc/files/werror.patch +++ /dev/null @@ -1,18 +0,0 @@ -Dont build with -Werror like switches. -Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a -rebuild of the Makefile which needs htmlc to be installed first. -https://bugs.gentoo.org/show_bug.cgi?id=553172 - -Index: htmlc-2.6.0/config/Makefile -=================================================================== ---- htmlc-2.6.0.orig/config/Makefile -+++ htmlc-2.6.0/config/Makefile -@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA - - # The Caml compilers (those defaults should be OK) - CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep --CAML_FLAGS = -w A -warn-error A #-safe-string -+CAML_FLAGS = -w A #-safe-string - CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot - CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS) - CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000 diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild deleted file mode 100644 index 488950ddc494..000000000000 --- a/app-text/htmlc/htmlc-2.40.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0 -MY_P="${P/0[.]/.}" - -DESCRIPTION="HTML template files expander" -HOMEPAGE="http://htmlc.inria.fr/" -SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz" -S="${WORKDIR}/${MY_P}" - -LICENSE="htmlc" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="+ocamlopt" -# Files for the tests are missing... -#RESTRICT="test" - -DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -src_configure() { - ./configure \ - --install-root-dir "${ED}/usr" \ - || die -} - -src_compile() { - if use ocamlopt ; then - emake bin - else - emake byt - fi -} - -src_install() { - if use ocamlopt ; then - emake installbin - else - emake installbyt - fi - - emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman - dodoc README Announce* CHANGES -} diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild deleted file mode 100644 index 38f7c831c39b..000000000000 --- a/app-text/htmlc/htmlc-2.60.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0 -MY_P="${P/0[.]/.}" - -DESCRIPTION="HTML template files expander" -HOMEPAGE="http://htmlc.inria.fr/" -SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz" -S="${WORKDIR}/${MY_P}" - -LICENSE="htmlc" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="+ocamlopt" -# Files for the tests are missing... -#RESTRICT="test" - -DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/werror.patch -) - -src_configure() { - ./configure \ - --install-root-dir "${ED}/usr" \ - || die -} - -src_compile() { - if use ocamlopt ; then - emake bin - else - emake byt - fi -} - -src_install() { - if use ocamlopt ; then - emake installbin - else - emake installbyt - fi - - emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman - dodoc README Announce* CHANGES -} diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml deleted file mode 100644 index 115e9d64a669..000000000000 --- a/app-text/htmlc/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest index ba674f8ca501..aec781289683 100644 --- a/app-text/htmldoc/Manifest +++ b/app-text/htmldoc/Manifest @@ -1 +1 @@ -DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678 +DIST htmldoc-1.9.16-source.tar.gz 3389563 BLAKE2B 1c83e37313fb0a1196d4db3ddca47d4a418ab7aeb8f910c9a27178312a1b0239beddaf81f322b24dcf75dff7e838278fcfa0eed17b5aa493790de2393bcddebf SHA512 c901ed259ef8c0520ed03e314149e7a2fc3b5bffa9c8e9c6c3b023a8c9de1e37b7fa72d224fa7d072f3a5d4b379635d7cfaa016df672da296be8395b49fa935b diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.16.ebuild index de7e4f8afa89..20805c240a90 100644 --- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild +++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools toolchain-funcs xdg @@ -16,10 +16,10 @@ IUSE="fltk ssl" BDEPEND="virtual/pkgconfig" DEPEND=" + media-libs/libjpeg-turbo:= >=media-libs/libpng-1.4:0= sys-libs/zlib - virtual/jpeg:0 - ssl? ( net-libs/gnutls ) + ssl? ( net-libs/gnutls:= ) fltk? ( x11-libs/fltk:1 ) " RDEPEND="${DEPEND}" @@ -28,9 +28,6 @@ src_prepare() { default eautoreconf - # Make sure not to use the libs htmldoc ships with - rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib" - # Fix the documentation path in a few places. Some Makefiles aren't # autotoolized =( for file in configure doc/Makefile doc/htmldoc.man; do @@ -45,9 +42,6 @@ src_configure() { $(use_with fltk gui) $(use_enable ssl) $(use_enable ssl gnutls) - --disable-localjpeg - --disable-localpng - --disable-localzlib ) CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}" diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild index 75f74c7c325e..c57dc344d252 100644 --- a/app-text/htmlmin/htmlmin-0.1.12.ebuild +++ b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild @@ -1,9 +1,10 @@ -# 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 -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -14,11 +15,11 @@ HOMEPAGE="https://github.com/mankyd/htmlmin" SRC_URI=" https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" distutils_enable_tests setup.py diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest index bf1af04e9c9a..4df9f10537d4 100644 --- a/app-text/htmltidy/Manifest +++ b/app-text/htmltidy/Manifest @@ -1,3 +1 @@ DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44 -DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b -DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970 diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch deleted file mode 100644 index b4d6158ea04a..000000000000 --- a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001 -From: Geoff McLane <ubuntu@geoffair.info> -Date: Wed, 3 Jun 2015 20:26:03 +0200 -Subject: [PATCH] Issue #217 - avoid len going negative, ever... - ---- - src/lexer.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/lexer.c b/src/lexer.c -index 376a3d8..664f806 100644 ---- a/src/lexer.c -+++ b/src/lexer.c -@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name, - /* and prompts attributes unless --literal-attributes is set to yes */ - /* #994841 - Whitespace is removed from value attributes */ - -- if (munge && -+ /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */ -+ if ((len > 0) && munge && - TY_(tmbstrcasecmp)(name, "alt") && - TY_(tmbstrcasecmp)(name, "title") && - TY_(tmbstrcasecmp)(name, "value") && - TY_(tmbstrcasecmp)(name, "prompt")) - { -- while (TY_(IsWhite)(lexer->lexbuf[start+len-1])) -+ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0)) - --len; - -- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len) -+ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0)) - { - ++start; - --len; diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch deleted file mode 100644 index 4c805cf2226f..000000000000 --- a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN tidy.old/configure.in tidy-26/configure.in ---- tidy.old/configure.in 2006-02-13 17:17:49.000000000 +0100 -+++ tidy-26/configure.in 2006-02-13 17:17:20.000000000 +0100 -@@ -72,7 +72,7 @@ - if test $debug_build = yes; then - CFLAGS="$save_cflags -g" - else -- CFLAGS="-O2 $save_cflags" -+ CFLAGS="$save_cflags" - fi - # - # ============================================= diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch deleted file mode 100644 index 942a61e1464c..000000000000 --- a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: tidy-20090325/include/platform.h -=================================================================== ---- tidy-20090325.orig/include/platform.h -+++ tidy-20090325/include/platform.h -@@ -24,7 +24,7 @@ extern "C" { - */ - - /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */ --/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */ -+#define TIDY_CONFIG_FILE "/etc/tidyrc" - /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */ - - /* -@@ -33,7 +33,7 @@ extern "C" { - It enables tidy to find config files named ~/.tidyrc if - the HTML_TIDY environment variable is not set. - */ --/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */ -+#define TIDY_USER_CONFIG_FILE "~/.tidyrc" - - /* - Uncomment the following #define if your -@@ -48,7 +48,7 @@ extern "C" { - Contributed by Todd Lewis. - */ - --/* #define SUPPORT_GETPWNAM */ -+#define SUPPORT_GETPWNAM - - - /* Enable/disable support for Big5 and Shift_JIS character encodings */ 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-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild deleted file mode 100644 index 8cacda80a2a1..000000000000 --- a/app-text/htmltidy/htmltidy-0.99.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN="tidy" -MY_PV="20090325" -MY_P="${MY_PN}-${MY_PV}" - -inherit epatch autotools - -DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents" -HOMEPAGE="http://tidy.sourceforge.net/" -SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 - mirror://gentoo/${MY_P}-doc.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="debug doc static-libs" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - # Required to setup the source dist for autotools - einfo "Setting up autotools for source build" - cp -R ./build/gnuauto/* . || die "could not prepare autotools environment" - - # Stop tidy from appending -O2 to our CFLAGS - epatch "${FILESDIR}"/${P}-strip-O2-flag.patch - - # Define /etc/tidyrc for system wide config, bug 154834 - epatch "${FILESDIR}"/${P}-tidyrc.patch - - # Fix security bug 561452 - epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch - - eautoreconf -} - -src_compile() { - default - - if use doc ; then - doxygen htmldoc/doxygen.cfg || die "error making apidocs" - fi -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable static-libs static) -} - -src_install() { - default - - find "${ED}" -name '*.la' -exec rm -f {} + - - # Now the man page is provided as an xsl file, which - # we can't use until htmltidy is merged. - # I have generated the man page and quickref which is on - # the mirrors. (bug #132429) - doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1 - - # Fix name before installing - mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \ - "${WORKDIR}"/"${MY_P}"-doc/quickref.html - - cd "${S}"/htmldoc - # Install basic html documentation - dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html - - # If use 'doc' is set, then we also want to install the - # api documentation - use doc && dohtml -r api -} diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild index 5dcdaf488f75..a0d767ef3275 100644 --- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild +++ b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32" RUBY_OPTIONAL="yes" inherit cmake ruby-ng @@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0/58" # subslot is SOVERSION -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +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="deprecated test" RESTRICT="!test? ( test )" @@ -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 eeaae2baf2d3..6cdfe356aec2 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1 +1 @@ -DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 +DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch deleted file mode 100644 index 649eef5b293d..000000000000 --- a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -Date: Tue, 12 Nov 2019 20:03:15 +0000 -Subject: [PATCH] invalid read memory access #624 - ---- - src/hunspell/suggestmgr.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx -index dba084e9..c23f165a 100644 ---- a/src/hunspell/suggestmgr.cxx -+++ b/src/hunspell/suggestmgr.cxx -@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( - int l2 = su2.size(); - // decapitalize dictionary word - if (complexprefixes) { -- if (su1[l1 - 1] == su2[l2 - 1]) -+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) - return 1; - } else { - unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; 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.2-r1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild new file mode 100644 index 000000000000..97635c6a1145 --- /dev/null +++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is +it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu" +inherit autotools flag-o-matic + +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+ )" +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 ~x64-solaris" + +RDEPEND=" + virtual/libiconv + ncurses? ( sys-libs/ncurses:= ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/gettext-0.18 +" + +PDEPEND="" +for lang in ${LANGS}; do + IUSE+=" l10n_${lang}" + case ${lang} in + de-1901) dict="de_1901" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )" +done +unset dict lang LANGS + +DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README ) + +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}/hunspell-1.7.2-renameexes.patch" + + "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614 +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # Missing somehow... + [[ ${CHOST} == *-darwin* ]] && append-libs -liconv + + # I wanted to put the include files in /usr/include/hunspell. + # 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)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die + einstalldocs + + # Bug #908872 + keepdir "/usr/share/myspell" +} diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild index cc1274d78f52..2b5009ebd494 100644 --- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild +++ b/app-text/hunspell/hunspell-1.7.2.ebuild @@ -1,7 +1,7 @@ -# 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 LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu" @@ -9,15 +9,15 @@ inherit autotools flag-o-matic DESCRIPTION="Spell checker, morphological analyzer library and command-line tool" HOMEPAGE="https://hunspell.github.io/" -SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz" +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 ~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:0= ) + ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) " DEPEND="${RDEPEND}" @@ -35,25 +35,25 @@ for lang in ${LANGS}; do done unset dict lang LANGS -DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README.md ) +DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README ) 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" #692614 - "${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch" + "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614 ) src_prepare() { default + eautoreconf } src_configure() { - # missing somehow, and I am too lazy to fix it properly + # Missing somehow... [[ ${CHOST} == *-darwin* ]] && append-libs -liconv # I wanted to put the include files in /usr/include/hunspell. @@ -70,11 +70,13 @@ src_configure() { src_install() { default + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die - #342449 - pushd "${ED}"/usr/$(get_libdir)/ >/dev/null - ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} - popd >/dev/null + # 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 } 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/hyperestraier/files/hyperestraier-java-11.patch b/app-text/hyperestraier/files/hyperestraier-java-11.patch new file mode 100644 index 000000000000..fa143fb23872 --- /dev/null +++ b/app-text/hyperestraier/files/hyperestraier-java-11.patch @@ -0,0 +1,78 @@ +--- a/javanative/Database.java ++++ b/javanative/Database.java +@@ -135,7 +135,7 @@ + /** last happened error code */ + private int ecode; + /** callback function to inform of database events */ +- private DatabaseInformer informer; ++ private long informer; + //---------------------------------------------------------------- + // constructors and finalizers + //---------------------------------------------------------------- +--- a/javanative/database.c ++++ b/javanative/database.c +@@ -19,7 +19,7 @@ + + + /* global variables */ +-JNIEnv *infoenv = NULL; ++static JavaVM* jvm = NULL; + + + /* private function prototypes */ +@@ -181,8 +181,8 @@ + err = TRUE; + } + (*env)->SetLongField(env, obj, fid, 0); +- fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";"); +- if((infoobj = (*env)->GetObjectField(env, obj, fid)) != NULL) ++ fid = (*env)->GetFieldID(env, cls, "informer", "J"); ++ if((infoobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL) + (*env)->DeleteGlobalRef(env, infoobj); + (*env)->SetObjectField(env, obj, fid, NULL); + return err ? FALSE : TRUE; +@@ -735,16 +735,17 @@ + throwillarg(env); + return; + } +- fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";"); +- if((oldobj = (*env)->GetObjectField(env, obj, fid)) != NULL) ++ fid = (*env)->GetFieldID(env, cls, "informer", "J"); ++ if((oldobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL) + (*env)->DeleteGlobalRef(env, oldobj); + (*env)->SetObjectField(env, obj, fid, NULL); + if(!(informer = (*env)->NewGlobalRef(env, informer))){ + throwoutmem(env); + return; + } +- (*env)->SetObjectField(env, obj, fid, informer); +- infoenv = env; ++ (*env)->SetLongField(env, obj, fid, (PTRNUM)informer); ++ if(jvm == NULL) ++ (*env)->GetJavaVM(env, &jvm); + est_mtdb_set_informer((ESTMTDB *)(PTRNUM)coreptr, dbinform, informer); + } + +@@ -767,10 +768,12 @@ + + /* callback function for database events */ + static void dbinform(const char *message, void *opaque){ ++ JNIEnv *infoenv; + jstring msgobj; + jobject opobj; + jclass cls; + jmethodID mid; ++ (*jvm)->GetEnv(jvm, (void **)&infoenv, JNI_VERSION_1_8); + if(!(msgobj = (*infoenv)->NewStringUTF(infoenv, message))) return; + opobj = (jobject)opaque; + cls = (*infoenv)->GetObjectClass(infoenv, opobj); +--- a/javanative/myconf.h ++++ b/javanative/myconf.h +@@ -69,7 +69,6 @@ + #define CLSDOC "estraier/Document" + #define CLSCOND "estraier/Condition" + #define CLSDB "estraier/Database" +-#define CLSDBINFO "estraier/DatabaseInformer" + #define CLSRES "estraier/Result" + + diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild index fce6b6a04428..c6658e72af58 100644 --- a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild +++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -USE_RUBY="ruby25 ruby26 ruby27 ruby30" +EAPI="8" +USE_RUBY="ruby27 ruby30 ruby31" RUBY_OPTIONAL="yes" inherit autotools java-pkg-opt-2 perl-functions ruby-ng @@ -12,7 +12,7 @@ HOMEPAGE="https://fallabs.com/hyperestraier/" SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86" SLOT="0" IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib" @@ -31,6 +31,7 @@ S="${WORKDIR}/all/${P}" PATCHES=( "${FILESDIR}"/${PN}-configure.patch + "${FILESDIR}"/${PN}-java-11.patch "${FILESDIR}"/${PN}-perl.patch "${FILESDIR}"/${PN}-ruby19.patch ) diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild deleted file mode 100644 index 0556785a6caf..000000000000 --- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -USE_RUBY="ruby25 ruby26 ruby27 ruby30" -RUBY_OPTIONAL="yes" - -inherit autotools java-pkg-opt-2 perl-functions ruby-ng - -DESCRIPTION="a full-text search system for communities" -HOMEPAGE="https://fallabs.com/hyperestraier/" -SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86" -SLOT="0" -IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib" - -RDEPEND="dev-db/qdbm - bzip2? ( app-arch/bzip2 ) - java? ( >=virtual/jre-1.4:* ) - lzo? ( dev-libs/lzo ) - mecab? ( app-text/mecab ) - perl? ( dev-lang/perl ) - ruby? ( $(ruby_implementations_depend) ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.4:* )" -BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/all/${P}" - -PATCHES=( - "${FILESDIR}"/${PN}-configure.patch - "${FILESDIR}"/${PN}-perl.patch - "${FILESDIR}"/${PN}-ruby19.patch -) -HTML_DOCS=( doc/. ) - -AT_NOELIBTOOLIZE="yes" - -pkg_setup() { - java-pkg-opt-2_pkg_setup - use ruby && ruby-ng_pkg_setup -} - -he_foreach_api() { - local u d - for u in java perl ruby; do - if ! use "${u}"; then - continue - fi - if [[ "${u}" != "ruby" ]]; then - for d in ${u}native ${u}pure; do - if [[ ! -d "${d}" ]]; then - continue - fi - einfo "${EBUILD_PHASE} ${d}" - cd "${d}" - case "${EBUILD_PHASE}" in - prepare) - mv configure.{in,ac} - eautoreconf - ;; - configure) - econf - ;; - compile) - emake - ;; - test) - if [[ "${d}" == "${u}native" ]]; then - emake check - fi - ;; - install) - if [[ "${u}" != "java" ]]; then - emake DESTDIR="${D}" install - else - java-pkg_dojar *.jar - if [[ "${d}" == "${u}native" ]]; then - dolib.so lib*.so* - fi - fi - ;; - esac - cd - >/dev/null - done - else - PATCHES= ruby-ng_src_${EBUILD_PHASE} - fi - done -} - -he_foreach_ruby_api() { - local d - for d in rubynative rubypure; do - cd "${d}" - case "${EBUILD_PHASE}" in - prepare) - sed -i \ - -e "/RUBY=/cRUBY=\"${RUBY}\"" \ - -e "/=\`.*ruby/s|ruby|${RUBY}|" \ - configure.in - - mv configure.{in,ac} - eautoreconf - ;; - configure) - econf - ;; - compile) - emake - ;; - test) - if [[ "${d}" == "${u}native" ]]; then - emake check - fi - ;; - install) - emake DESTDIR="${D}" install - ;; - esac - cd - >/dev/null - done -} - -src_prepare() { - default - java-pkg-opt-2_src_prepare - - sed -i \ - -e "/^CFLAGS/s|$| ${CFLAGS}|" \ - -e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \ - -e '/^LDENV/d' \ - -e 's/make\( \|$\)/$(MAKE)\1/g' \ - Makefile.in {java,perl,ruby}*/Makefile.in - - mv configure.{in,ac} - eautoreconf - he_foreach_api # prepare -} - -all_ruby_prepare() { - sed -i "/^RUNENV /s|\.\.|${WORKDIR}/all/${P}|" ruby*/Makefile.in - sed -i "s|\.\./\.\.|${WORKDIR}/all/${P}|" rubynative/src/extconf.rb -} - -each_ruby_prepare() { - he_foreach_ruby_api -} - -src_configure() { - econf \ - $(use_enable bzip2 bzip) \ - $(use_enable debug) \ - $(use_enable lzo) \ - $(use_enable mecab) \ - $(use_enable zlib) - he_foreach_api -} - -each_ruby_configure() { - he_foreach_ruby_api -} - -src_compile() { - default - he_foreach_api -} - -each_ruby_compile() { - he_foreach_ruby_api -} - -src_test() { - default - he_foreach_api -} - -each_ruby_test() { - he_foreach_ruby_api -} - -src_install() { - emake DESTDIR="${D}" MYDOCS= install - einstalldocs - he_foreach_api - use static-libs || find "${ED}" -name '*.a' -delete || die - - if use perl; then - perl_delete_module_manpages - perl_fix_packlist - fi - - rm -f "${D}"/usr/bin/*test -} - -each_ruby_install() { - he_foreach_ruby_api -} diff --git a/app-text/idnits/Manifest b/app-text/idnits/Manifest new file mode 100644 index 000000000000..44069ce0add6 --- /dev/null +++ b/app-text/idnits/Manifest @@ -0,0 +1 @@ +DIST idnits-2.17.1.tar.gz 60480 BLAKE2B b2248236590bf025f9e06a4d804ac9d0cd207406809f17a2393dfbce2d0712c60aef58c8a4d7388c61495956ce0d2b0c5c491e290b178b7c46dcbc711615a847 SHA512 deed0c73e95e292443ec3e2ca447d2e6ceb9cbafd0775163e247185c158e74b7a4cd1e906474ca45ab40d92eac6e881e417df4c6e84a15277c71c711c590f55a diff --git a/app-text/idnits/idnits-2.17.1.ebuild b/app-text/idnits/idnits-2.17.1.ebuild new file mode 100644 index 000000000000..87ff6c1483d2 --- /dev/null +++ b/app-text/idnits/idnits-2.17.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A tool to check internet-drafts (IDs) for submission nits" +HOMEPAGE="https://www.ietf.org/tools/idnits/" +SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2+" + +SLOT="0" + +KEYWORDS="amd64 x86" + +RDEPEND=" + app-shells/bash + sys-apps/coreutils + app-alternatives/awk +" + +src_install() { + dobin idnits + dodoc about changelog todo +} diff --git a/app-text/idnits/metadata.xml b/app-text/idnits/metadata.xml new file mode 100644 index 000000000000..2b0b24ef145c --- /dev/null +++ b/app-text/idnits/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ietf-tools/idnits</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest index 3ee204c953f5..0f1bd88a2f75 100644 --- a/app-text/iso-codes/Manifest +++ b/app-text/iso-codes/Manifest @@ -1,2 +1 @@ -DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f -DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d +DIST iso-codes-v4.16.0.tar.gz 15163129 BLAKE2B 8fcdb3c12c502c1e14169765db9c9dd7778fc5d4bb0da37aa6b27efeebd5ce9f3e825e5b1a7ae8d659babf2d6b9124af08b40ed8a2a1235e88df50be9c204ca5 SHA512 04d93eb37ff309c850a1af6d4cf6bb92a16e25ee35ee12e16325f6e7b476ba40bbf5d11e2f4c425111220480911b1dbc9e244189ea7487f1f0ea4dbce2307c96 diff --git a/app-text/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.16.0.ebuild index b89d5b65020f..4aad8abc0e5a 100644 --- a/app-text/iso-codes/iso-codes-4.7.0.ebuild +++ b/app-text/iso-codes/iso-codes-4.16.0.ebuild @@ -1,30 +1,30 @@ -# 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 -PYTHON_COMPAT=( python3_{7..10} ) -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 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_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 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/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz" +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 ~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 " -S="${WORKDIR}/${PN}-${P}" +S="${WORKDIR}/${PN}-v${PV}" # This ebuild does not install any binaries. RESTRICT="binchecks strip" -DOCS=( ChangeLog.md README.md ) +DOCS=( CHANGELOG.md README.md ) # plocale_find_changes doesn't support multiple directories, # so need to do the update scan ourselves. diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild deleted file mode 100644 index 35577914637f..000000000000 --- a/app-text/iso-codes/iso-codes-4.6.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -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 kn ko kok ku 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 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_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/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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}-${P}" - -# 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/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/Manifest b/app-text/jabref-bin/Manifest index b1b67aa58426..c6c186302fcb 100644 --- a/app-text/jabref-bin/Manifest +++ b/app-text/jabref-bin/Manifest @@ -1,7 +1,2 @@ -DIST JabRef-3.7.jar 36702576 BLAKE2B a06dd79792f47cb202573a1e620da3f15c9b29705bac5e712e1c95d4df0c21c4c52d2ea30704b9e7427af11cd52ec01fd83017cb343e728ab1d073a7f2513690 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4 -DIST JabRef-3.8.1.jar 36739725 BLAKE2B edee679afcbcf3745a251e372608ac24fefc29bec9e99e41fcbbb296255edfb2ea8df38f187efe7d6345855af62e0bee82a835f781418a3202cde19abc00fff0 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780 DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fbdc0ed82b23b54855750d56631f55e371382209f331579f47ac4b3d3b1ed1d389f50f168dcc2468dff3a411c SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830 -DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d24c1f3acb133ead2d7fde4ce305b3ef27e1cab99045657701b83054d42c17a7bc6e25e0afba13e1d6ec0e6 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854 -DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2 -DIST JabRef-4.1.jar 55587800 BLAKE2B fdbe44b672d0cab611c41a4c28fbe4e11e72ed4b0dff4b743a03ab49ad74a8472173e28c0b576a23d7a5a40c2b23bc6ce6f72aed378b3e5aca4e8b96abcaaf27 SHA512 22fae27a7eb8653e11fc5bd91f721dde49be9d1d79e1a4c05282893c25f993babe8a6df29e154bbb749e9ecc940b42b37401ab3f453401dc8eaa24e2e118d1a6 DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19 diff --git a/app-text/jabref-bin/jabref-bin-3.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild deleted file mode 100644 index 7ce3bd08767b..000000000000 --- a/app-text/jabref-bin/jabref-bin-3.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 - -MY_PV_1="${PV/_beta/b}" -MY_PV="${MY_PV_1/_rc/}" -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - app-arch/unzip -" -RDEPEND=" - virtual/jre:1.8 -" - -S="${WORKDIR}" - -src_unpack() { - cp -v "${DISTDIR}/${A}" . || die - unzip ${A} images/icons/JabRef-icon-48.png || die -} - -src_install() { - java-pkg_newjar "JabRef-${MY_PV}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png - make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office -} diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild deleted file mode 100644 index 3217186a6601..000000000000 --- a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 - -MY_PV_1="${PV/_beta/b}" -MY_PV="${MY_PV_1/_rc/}" -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" -SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/unzip" - -RDEPEND="virtual/jre:1.8" - -S="${WORKDIR}" - -src_unpack() { - cp -v "${DISTDIR}/${A}" . || die - unzip ${A} images/icons/JabRef-icon-48.png || die -} - -src_install() { - java-pkg_newjar "JabRef-${MY_PV}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png - make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office -} 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 106c4590fe8c..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,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils java-pkg-2 +inherit desktop java-pkg-2 MY_PV_1="${PV/_beta/b}" MY_PV="${MY_PV_1/_rc/}" @@ -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-3.8.ebuild b/app-text/jabref-bin/jabref-bin-3.8.ebuild deleted file mode 100644 index 0bf932d8461a..000000000000 --- a/app-text/jabref-bin/jabref-bin-3.8.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 - -MY_PV_1="${PV/_beta/b}" -MY_PV="${MY_PV_1/_rc/}" -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" -SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - app-arch/unzip -" -RDEPEND=" - virtual/jre:1.8 -" - -S="${WORKDIR}" - -src_unpack() { - cp -v "${DISTDIR}/${A}" . || die - unzip ${A} images/icons/JabRef-icon-48.png || die -} - -src_install() { - java-pkg_newjar "JabRef-${MY_PV}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png - make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office -} diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild deleted file mode 100644 index 228d81dafa31..000000000000 --- a/app-text/jabref-bin/jabref-bin-4.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_WANT_TARGET=1.8 - -inherit eutils java-pkg-2 - -MY_PV_1="${PV/_beta/b}" -MY_PV="${MY_PV_1/_rc/}" -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="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/unzip" - -RDEPEND=" - dev-java/openjdk:8[javafx] - virtual/jre:1.8 -" - -S="${WORKDIR}" - -src_unpack() { - cp -v "${DISTDIR}/${A}" . || die - unzip ${A} images/external/JabRef-icon-128.png || die -} - -src_install() { - java-pkg_newjar "JabRef-${MY_PV}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/external/JabRef-icon-128.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/jabref-bin/jabref-bin-4.1.ebuild b/app-text/jabref-bin/jabref-bin-4.1.ebuild deleted file mode 100644 index 228d81dafa31..000000000000 --- a/app-text/jabref-bin/jabref-bin-4.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_WANT_TARGET=1.8 - -inherit eutils java-pkg-2 - -MY_PV_1="${PV/_beta/b}" -MY_PV="${MY_PV_1/_rc/}" -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="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/unzip" - -RDEPEND=" - dev-java/openjdk:8[javafx] - virtual/jre:1.8 -" - -S="${WORKDIR}" - -src_unpack() { - cp -v "${DISTDIR}/${A}" . || die - unzip ${A} images/external/JabRef-icon-128.png || die -} - -src_install() { - java-pkg_newjar "JabRef-${MY_PV}.jar" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" - newicon images/external/JabRef-icon-128.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/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild index 228d81dafa31..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,11 +1,11 @@ -# Copyright 1999-2020 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 -inherit eutils java-pkg-2 +inherit desktop java-pkg-2 MY_PV_1="${PV/_beta/b}" MY_PV="${MY_PV_1/_rc/}" @@ -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 0526745fe6ad..000000000000 --- a/app-text/jabref-bin/jabref-bin-4.9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils 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/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml index 75bd03e0389d..b4fbf1e649a4 100644 --- a/app-text/jabref-bin/metadata.xml +++ b/app-text/jabref-bin/metadata.xml @@ -20,8 +20,8 @@ </longdescription> <upstream> <remote-id type="sourceforge">jabref</remote-id> - <changelog>https://github.com/JabRef/jabref/blob/master/CHANGELOG.md</changelog> - <doc>http://help.jabref.org/</doc> + <changelog>https://github.com/JabRef/jabref/blob/main/CHANGELOG.md</changelog> + <doc>https://docs.jabref.org/</doc> <remote-id type="github">JabRef/jabref</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest deleted file mode 100644 index 2759022f01e2..000000000000 --- a/app-text/jabref/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 diff --git a/app-text/jabref/jabref-2.10-r6.ebuild b/app-text/jabref/jabref-2.10-r6.ebuild deleted file mode 100644 index 6a4ad2464020..000000000000 --- a/app-text/jabref/jabref-2.10-r6.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_ANT_REWRITE_CLASSPATH="true" - -inherit desktop java-pkg-2 java-ant-2 java-utils-2 - -MY_PV="${PV/_beta/b}" - -DESCRIPTION="Java GUI for managing BibTeX and other bibliographies" -HOMEPAGE="https://www.jabref.org/" -SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -COMMON_DEP=" - dev-java/antlr:0 - dev-java/antlr:3 - dev-java/fontbox:1.7 - dev-java/jempbox:1.7 - dev-java/log4j:0 - dev-java/spin:0 - dev-java/microba:0 - >=dev-java/glazedlists-1.8.0:0 - " - -DEPEND=" - virtual/jdk:1.8 - ${COMMON_DEP}" - -RDEPEND=" - virtual/jre:1.8 - ${COMMON_DEP}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - default - - # If we cleanup it complains about missing jarbundler - # BUILD FAILED - # taskdef class net.sourceforge.jarbundler.JarBundler cannot be found -# java-pkg_clean - - # Remove bundled dependencies. - rm lib/antlr*.jar || die - rm lib/fontbox*.jar || die - rm lib/jempbox*.jar || die - rm lib/spin.jar || die - rm lib/microba.jar || die - rm lib/glazedlists*.jar || die - - # Remove unjarlib target (do this only once we have removed all - # bundled dependencies in lib). - #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml - - # Fix license file copy operation for microba bundled lib. - sed -i -e 's:^.*microba-license.*::' build.xml -} - -src_compile() { - local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists" - local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})" - eant \ - -Dgentoo.classpath=${CLASSPATH} \ - jars \ - $(usex doc docs "") -} - -src_install() { - java-pkg_newjar build/lib/JabRef-${MY_PV}.jar - - use doc && java-pkg_dojavadoc build/docs/API - dodoc src/txt/README - - java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef - newicon src/images/JabRef-icon-48.png JabRef-icon.png - make_desktop_entry ${PN} JabRef JabRef-icon Office -} diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml deleted file mode 100644 index 8117e0980392..000000000000 --- a/app-text/jabref/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>nicolasbock@gentoo.org</email> - <name>Nicolas Bock</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">jabref</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest index 51d13aea3032..d415981d9743 100644 --- a/app-text/jo/Manifest +++ b/app-text/jo/Manifest @@ -1 +1,2 @@ DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169 +DIST jo-1.6.tar.gz 151941 BLAKE2B 13d7d68c33d7f89ebb4a5cdb448082bd4d245060ebf8c85149c39f2a184f03f1ac1c380833a742894c37c0815e3627569cfe29f202f9aa3dcec7fa089f99b918 SHA512 a2cb1327c8255e0f8d1b6e6056bbce081d7703192bdb974e908549b863d7db645531dbeff87629a6ed53626295ab7ca8a72816d104f9188846ef175c8a9acb07 diff --git a/app-text/jo/jo-99999.ebuild b/app-text/jo/jo-1.6.ebuild index 098a68881de3..162d12aebd86 100644 --- a/app-text/jo/jo-99999.ebuild +++ b/app-text/jo/jo-1.6.ebuild @@ -1,16 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools bash-completion-r1 git-r3 +EAPI=8 + +inherit autotools bash-completion-r1 DESCRIPTION="JSON output from a shell" HOMEPAGE="https://github.com/jpmens/jo" -EGIT_REPO_URI="https://github.com/jpmens/${PN}" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jpmens/${PN}" +else + SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="" + +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/app-text/jo/jo-9999.ebuild b/app-text/jo/jo-9999.ebuild new file mode 100644 index 000000000000..162d12aebd86 --- /dev/null +++ b/app-text/jo/jo-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 + +DESCRIPTION="JSON output from a shell" +HOMEPAGE="https://github.com/jpmens/jo" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jpmens/${PN}" +else + SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + export bashcompdir=$(get_bashcompdir) + default +} + +src_install() { + default + mv "${D}"$(get_bashcompdir)/jo{.bash,} || die +} diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml index 6aaa98d22ea0..b063edbe677f 100644 --- a/app-text/jo/metadata.xml +++ b/app-text/jo/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-needed --> - <upstream> - <remote-id type="github">jpmens/jo</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">jpmens/jo</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/katarakt/Manifest b/app-text/katarakt/Manifest new file mode 100644 index 000000000000..3a47b281192c --- /dev/null +++ b/app-text/katarakt/Manifest @@ -0,0 +1 @@ +DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68 diff --git a/app-text/katarakt/files/katarakt-0.2-install.patch b/app-text/katarakt/files/katarakt-0.2-install.patch new file mode 100644 index 000000000000..96cb6f4b6140 --- /dev/null +++ b/app-text/katarakt/files/katarakt-0.2-install.patch @@ -0,0 +1,26 @@ +From 4801619c7752b317da8d57183f590d9c3cce42e1 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach <kurt@kmk-computers.de> +Date: Thu, 30 Jan 2020 19:22:05 +0100 +Subject: [PATCH] build: Install binary + +Add an install target for the binary. + +Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> +--- + katarakt.pro | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/katarakt.pro b/katarakt.pro +index a632713db2ce..220dfd68b1b9 100644 +--- a/katarakt.pro ++++ b/katarakt.pro +@@ -57,3 +57,6 @@ web.depends = $$website.target + web.CONFIG = phony + + QMAKE_EXTRA_TARGETS += documentation website doc web ++ ++target.path = $$INSTALL_ROOT/$$PREFIX/bin/ ++INSTALLS += target +-- +2.24.1 + diff --git a/app-text/katarakt/files/katarakt-0.2-poppler.patch b/app-text/katarakt/files/katarakt-0.2-poppler.patch new file mode 100644 index 000000000000..7979bf6a59cd --- /dev/null +++ b/app-text/katarakt/files/katarakt-0.2-poppler.patch @@ -0,0 +1,29 @@ +From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001 +From: Philipp Erhardt <Philipp.Erhardt@informatik.stud.uni-erlangen.de> +Date: Mon, 19 Oct 2020 20:42:37 +0200 +Subject: [PATCH] Fix compilation if the version number contains a leading zero + +--- + katarakt.pro | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/katarakt.pro b/katarakt.pro +index a632713db2ce..84cd59797d0a 100644 +--- a/katarakt.pro ++++ b/katarakt.pro +@@ -17,9 +17,9 @@ unix { + + isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf + POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER) +- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1) +- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2) +- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3) ++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'") ++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'") ++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'") + + DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR + DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR +-- +2.33.0 + diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild new file mode 100644 index 000000000000..161ff49aee54 --- /dev/null +++ b/app-text/katarakt/katarakt-0.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +MY_P="${PN}-v${PV}" + +DESCRIPTION="A simple PDF viewer designed to use as much available screen space as possible" +HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt" +SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="BSD-2" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + app-text/asciidoc + virtual/pkgconfig +" +RDEPEND=" + app-text/poppler:=[qt5] + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${P}-install.patch" + "${FILESDIR}/${P}-poppler.patch" +) + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" +} + +src_install() { + emake INSTALL_ROOT="${D}" install doc + doman doc/katarakt.1 +} diff --git a/app-text/katarakt/metadata.xml b/app-text/katarakt/metadata.xml new file mode 100644 index 000000000000..7a3b0ef78c18 --- /dev/null +++ b/app-text/katarakt/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>kurt@kmk-computers.de</email> + <name>Kurt Kanzenbach</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + katarakt is a simple PDF viewer. It is designed to use as much available + screen space as possible. + + There are currently two layouts. The presentation layout is very simple and + only supports scrolling on a per page basis. As the name suggests the + current page is displayed in the center and zoomed to fit the window. It is + active by default. + + The grid layout is much more advanced and offers continuous (smooth, per + pixel) scrolling, zooming and adjusting the column count. Pages keep their + correct relative size and are shown in a grid. + </longdescription> +</pkgmetadata> diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest index 776ec0507801..c44092fd5cf1 100644 --- a/app-text/kbibtex/Manifest +++ b/app-text/kbibtex/Manifest @@ -1 +1 @@ -DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a +DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild index 6dfd1e597201..11a10b600ce5 100644 --- a/app-text/kbibtex/kbibtex-0.9.2.ebuild +++ b/app-text/kbibtex/kbibtex-0.10.0.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 ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org +ECM_TEST="optional" +KFMIN=5.82.0 +QTMIN=5.15.5 +inherit ecm kde.org optfeature DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX" HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX" @@ -19,15 +19,17 @@ fi LICENSE="GPL-2" SLOT="5" -IUSE="webengine zotero" +IUSE="webengine" -DEPEND=" +RESTRICT="test" + +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 @@ -50,31 +52,26 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 virtual/tex-base webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) - zotero? ( - app-crypt/qca[qt5(+)] - dev-libs/qoauth:5 - ) " -RDEPEND="${DEPEND} +RDEPEND="${COMMON_DEPEND} dev-tex/bibtex2html " - -RESTRICT+=" test" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" 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 } pkg_postinst() { - ecm_pkg_postinst - - if ! has_version "kde-apps/okular:${SLOT}" ; then - elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}" + if [[ -z "${REPLACING_VERSIONS}" ]]; then + 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 18bf404abb9d..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 ~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-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.ebuild b/app-text/kjots/kjots-5.1.1.ebuild index 933ed290e976..39834da4447e 100644 --- a/app-text/kjots/kjots-5.1.0.ebuild +++ b/app-text/kjots/kjots-5.1.1.ebuild @@ -1,11 +1,11 @@ -# 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 KDE_ORG_CATEGORY="pim" -KFMIN=5.77.0 -QTMIN=5.15.2 +KFMIN=5.103.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Note taking utility by KDE" @@ -13,24 +13,25 @@ HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2" SLOT="5" -IUSE="" +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-20.12.2:5 - >=kde-apps/akonadi-notes-20.12.2:5 - >=kde-apps/kmime-20.12.2:5 - >=kde-apps/kontactinterface-20.12.2:5 - >=kde-apps/kpimtextedit-20.12.2:5 + >=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 @@ -43,6 +44,14 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + >=kde-apps/kdepim-runtime-23.04.0:5 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package speech KF5TextEditTextToSpeech) + ) -PATCHES+=( "${FILESDIR}/${P}-unused-dep.patch" ) + ecm_src_configure +} diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml index d925f2439758..8e5041d0d9ff 100644 --- a/app-text/kjots/metadata.xml +++ b/app-text/kjots/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">pim/kjots</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest new file mode 100644 index 000000000000..fb204db40447 --- /dev/null +++ b/app-text/kramdown-rfc/Manifest @@ -0,0 +1,2 @@ +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.36.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild new file mode 100644 index 000000000000..eca764b9c1dd --- /dev/null +++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31" + +# 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" +# 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 + +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" + +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/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/' "${RUBY_FAKEGEM_GEMSPEC}" || die +} diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild new file mode 100644 index 000000000000..eca764b9c1dd --- /dev/null +++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31" + +# 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" +# 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 + +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" + +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/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/' "${RUBY_FAKEGEM_GEMSPEC}" || die +} diff --git a/app-text/kramdown-rfc2629/metadata.xml b/app-text/kramdown-rfc/metadata.xml index 06c61aaee4c8..c84d9ca8a5a3 100644 --- a/app-text/kramdown-rfc2629/metadata.xml +++ b/app-text/kramdown-rfc/metadata.xml @@ -5,4 +5,7 @@ <name>Florian Schmaus</name> <email>flow@gentoo.org</email> </maintainer> + <upstream> + <remote-id type='github'>cabo/kramdown-rfc</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest deleted file mode 100644 index 0984cf5d93e0..000000000000 --- a/app-text/kramdown-rfc2629/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild deleted file mode 100644 index c3777b12f31c..000000000000 --- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby26 ruby27" - -RUBY_FAKEGEM_RECIPE_TEST="none" -RUBY_FAKEGEM_EXTRADOC="README.md" -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit ruby-fakegem - -DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser" -HOMEPAGE="https://github.com/cabo/kramdown-rfc2629" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -ruby_add_rdepend " - >=dev-ruby/kramdown-2.3.0 - >=dev-ruby/certified-1.0.0 - >=dev-ruby/json-2.0.0 -" - -all_ruby_prepare() { - sed -i 's/json_pure/json/' ../metadata || 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 6085c6264fb8..e7d983914683 100644 --- a/app-text/krop/krop-0.6.0-r1.ebuild +++ b/app-text/krop/krop-0.6.0-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +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 71df1f4d3c20..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-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -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 3a4f4ed94a7e..8a8532d979be 100644 --- a/app-text/languagetool/Manifest +++ b/app-text/languagetool/Manifest @@ -1,2 +1,2 @@ -DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef -DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d +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 new file mode 100644 index 000000000000..79568f20051a --- /dev/null +++ b/app-text/languagetool/files/languagetool.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Distributed under the terms of the GNU General Public License v2 + +depend() { + after modules +} + +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 + eend $? +} + +stop() { + ebegin "Stopping languagetool [server]" + start-stop-daemon --stop --exec /bin/bash -- /usr/bin/languagetool-server + eend $? +} diff --git a/app-text/languagetool/languagetool-4.6.ebuild b/app-text/languagetool/languagetool-5.4-r2.ebuild index 8f9296077b67..d7a7b86d7aef 100644 --- a/app-text/languagetool/languagetool-4.6.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,23 +13,22 @@ 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/guava:20 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 - dev-java/slf4j-nop:0 " -RDEPEND=">=virtual/jre-1.8 +RDEPEND=" + >=virtual/jre-1.8 ${CP_DEPEND}" BDEPEND="app-arch/unzip" @@ -38,8 +37,8 @@ S=${WORKDIR}/${MY_P} src_prepare() { default - rm libs/commons-{cli,collections4,io,lang,logging}.jar || die - rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.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 :( #java-pkg-2_src_prepare @@ -57,9 +56,10 @@ src_install() { 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 + 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 diff --git a/app-text/languagetool/languagetool-4.5.ebuild b/app-text/languagetool/languagetool-6.3.ebuild index afb2f0cde174..ddcbe701a0a1 100644 --- a/app-text/languagetool/languagetool-4.5.ebuild +++ b/app-text/languagetool/languagetool-6.3.ebuild @@ -1,45 +1,44 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit java-pkg-2 +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://www.languagetool.org/" -SRC_URI="https://www.languagetool.org/download/${MY_P}.zip" +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 ~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/guava:20 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 - dev-java/slf4j-nop:0 " -RDEPEND=">=virtual/jre-1.8 +RDEPEND=" + >=virtual/jre-1.8 ${CP_DEPEND}" BDEPEND="app-arch/unzip" -S=${WORKDIR}/${MY_P} - src_prepare() { default - rm libs/commons-{cli,collections4,io,lang,logging}.jar || die - rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.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 :( #java-pkg-2_src_prepare @@ -57,6 +56,10 @@ src_install() { 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 @@ -64,3 +67,11 @@ src_install() { 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 b1b8d8ccf1f9..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-2021 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 ~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 74b7b9316cce..2deb7f2d7be7 100644 --- a/app-text/lesspipe/Manifest +++ b/app-text/lesspipe/Manifest @@ -1,2 +1,2 @@ -DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2 -DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5 +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-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild deleted file mode 100644 index 07996432881b..000000000000 --- a/app-text/lesspipe/lesspipe-1.85.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="a preprocessor for less" -HOMEPAGE="https://github.com/wofr06/lesspipe" -SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -# Tests are broken in 1.84, 1.85. -# Please check again on bumps! -# bug #734896 -RESTRICT="test" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - !<sys-apps/less-483-r1" - -src_configure() { - # Not an autoconf script. - ./configure --fixed || die -} - -src_compile() { - # Nothing to build. - : -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install - einstalldocs -} - -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-1.89.ebuild b/app-text/lesspipe/lesspipe-1.89.ebuild deleted file mode 100644 index bc53c82f7b8e..000000000000 --- a/app-text/lesspipe/lesspipe-1.89.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 - -DESCRIPTION="A preprocessor for less" -HOMEPAGE="https://github.com/wofr06/lesspipe" -SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Tests are broken in 1.84, 1.85. -# Still fragile in 1.88. Passes when lesspipe is not installed. -# Please check again on bumps! -# bug #734896 -RESTRICT="test" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - !<sys-apps/less-483-r1" - -src_prepare() { - default - - # Drop a failing test. Not ideal, however: - # The test suite for this package is pretty fragile; it's more valuable - # to have _something_ failing/passing overall, than relying on a single - # test which seems to fail due to an unpredictable external command. - sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die -} - -src_configure() { - # Not an autoconf script. - ./configure --fixed || die -} - -src_compile() { - # Nothing to build (avoids the "all" target) - : -} - -src_test() { - # LC_ALL=C manages to fix one test failure - LC_ALL=C ./test.pl -d || die "Tests failed!" -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install - einstalldocs -} - -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.11-r1.ebuild b/app-text/lesspipe/lesspipe-2.11-r1.ebuild new file mode 100644 index 000000000000..975d91af0d67 --- /dev/null +++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild @@ -0,0 +1,68 @@ +# 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" +BDEPEND=" + ${RDEPEND} + virtual/pkgconfig + 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. + # + # 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/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/letterize/files/letterize-1.4-clang16.patch b/app-text/letterize/files/letterize-1.4-clang16.patch new file mode 100644 index 000000000000..82a1258a60d3 --- /dev/null +++ b/app-text/letterize/files/letterize-1.4-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/870775 +--- a/letterize.c ++++ b/letterize.c +@@ -234,3 +234,3 @@ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { diff --git a/app-text/letterize/letterize-1.4.ebuild b/app-text/letterize/letterize-1.4.ebuild index 91dbcfff516e..d28a490c6729 100644 --- a/app-text/letterize/letterize-1.4.ebuild +++ b/app-text/letterize/letterize-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + src_configure() { tc-export CC default diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild index 71115f275264..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-2019 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 ~ppc64 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 @@ -24,8 +24,8 @@ RDEPEND=" sys-libs/zlib " DEPEND="${RDEPEND} - >=dev-libs/boost-1.46 - sys-devel/libtool + dev-libs/boost + 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 28eae3a3163b..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-2021 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 ~ppc64 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.ebuild b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild index 3b3e96693e44..8a42b9ad5d22 100644 --- a/app-text/libepubgen/libepubgen-0.1.1.ebuild +++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild @@ -1,15 +1,15 @@ -# 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="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 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="debug doc test" RESTRICT="!test? ( test )" @@ -18,13 +18,15 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - virtual/pkgconfig - doc? ( app-doc/doxygen ) test? ( dev-util/cppunit dev-libs/libxml2:2 ) " +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) +" src_configure() { econf \ @@ -36,5 +38,5 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild index 212b6c2ce430..4cad77ca17f5 100644 --- a/app-text/libetonyek/libetonyek-0.1.10.ebuild +++ b/app-text/libetonyek/libetonyek-0.1.10-r2.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=7 +EAPI=8 -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" inherit autotools git-r3 else SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" fi + DESCRIPTION="Library parsing Apple Keynote presentations" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" @@ -18,28 +19,28 @@ 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-1.5: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() { @@ -49,6 +50,12 @@ src_configure() { $(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 a9b34322cd7f..874395b30224 100644 --- a/app-text/libetonyek/libetonyek-9999.ebuild +++ b/app-text/libetonyek/libetonyek-9999.ebuild @@ -1,15 +1,18 @@ -# 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 -if [[ ${PV} == *9999 ]]; then +MDDS_VER="3.0" + +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git" inherit autotools git-r3 else SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi + DESCRIPTION="Library parsing Apple Keynote presentations" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" @@ -18,33 +21,34 @@ 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-1.5:1= + dev-util/mdds:1/${MDDS_VER} 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) diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest index 6d45082a4aff..16f844a8ca24 100644 --- a/app-text/libexttextcat/Manifest +++ b/app-text/libexttextcat/Manifest @@ -1 +1 @@ -DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6 +DIST libexttextcat-3.4.7.tar.xz 1122804 BLAKE2B 45d4fab17d66ede2a32cf65a8ee79c85ccb9993b1b5a5260f77a468c67478a28a9a45bf5fc9c5e6f6eb9f21407dff861d08649c6398373f00b036dd49f9cd4ee SHA512 ccd95061419aedd651c3b899fade6d3cc8ebf87ddfea622edecacd810798de8257829255e3cb3325fa2a0b9f54bc20d4e24b6596ae37891ed3fbe7c0425ff864 diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild deleted file mode 100644 index 31d321846aae..000000000000 --- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Library implementing N-gram-based text categorization" -HOMEPAGE="http://software.wise-guys.nl/libtextcat/" -SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - --disable-werror \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild new file mode 100644 index 000000000000..4a99457d295e --- /dev/null +++ b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild @@ -0,0 +1,22 @@ +# 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://wiki.documentfoundation.org/Libexttextcat" +SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + +src_configure() { + econf \ + --disable-werror +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest index beb1de92287b..e5454b6256c0 100644 --- a/app-text/libgepub/Manifest +++ b/app-text/libgepub/Manifest @@ -1 +1 @@ -DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99 +DIST libgepub-0.7.1.tar.xz 28576 BLAKE2B a65ecdd13bfcc96fbf0e1998d24cc565f0bd60213f278fdf592dcdf1ad6a1b40c9c10e3ffc3fe9ac500d92f5471619432badd746dfc57538e96a2b6a138b0a26 SHA512 9a9c56cffab485b78f0fdf115e655c4f395ee6e3f00b203fee5dfbb2054aa58540ca1fe8dc9dd82460ae3b39e89471e128086be10e77b247d0ce7b195bfbe8e3 diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.7.1.ebuild index a00d54d6d7f2..b11faee98b41 100644 --- a/app-text/libgepub/libgepub-0.6.0.ebuild +++ b/app-text/libgepub/libgepub-0.7.1.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=8 @@ -10,22 +10,31 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86" -IUSE="+introspection" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" +IUSE="+introspection webkit" RDEPEND=" - app-arch/libarchive + net-libs/libsoup:3.0 dev-libs/glib:2 dev-libs/libxml2 - net-libs/libsoup:2.4 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 + app-arch/libarchive:= + webkit? ( >=net-libs/webkit-gtk-2.38.0:4.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +src_prepare() { + default + + # Tests are not executed by `meson test` and they require GTK+3 + sed -i -e "/subdir('tests')/d" meson.build || die +} + src_configure() { - meson_src_configure \ + local emesonargs=( $(meson_use introspection) + $(meson_use webkit widget) + ) + meson_src_configure } diff --git a/app-text/libgepub/metadata.xml b/app-text/libgepub/metadata.xml index c6e394b17a27..e45303093deb 100644 --- a/app-text/libgepub/metadata.xml +++ b/app-text/libgepub/metadata.xml @@ -5,4 +5,10 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> + <use> + <flag name="webkit">Build with GepubWidget based on Webkit</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libgepub</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2-r3.ebuild index f92890236f9c..f8d91b750c47 100644 --- a/app-text/libgxps/libgxps-0.3.2.ebuild +++ b/app-text/libgxps/libgxps-0.3.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="gtk-doc +introspection jpeg lcms tiff" RDEPEND=" @@ -18,11 +18,11 @@ RDEPEND=" >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 - >=x11-libs/cairo-1.10[svg] + >=x11-libs/cairo-1.10[svg(+)] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) - tiff? ( media-libs/tiff:0[zlib] ) + tiff? ( media-libs/tiff:=[zlib] ) " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml index 7b343b06be8a..d3a4eae54712 100644 --- a/app-text/libgxps/metadata.xml +++ b/app-text/libgxps/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/libgxps</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest index 23a73ff05742..0d9dc5a7892a 100644 --- a/app-text/liblangtag/Manifest +++ b/app-text/liblangtag/Manifest @@ -1 +1 @@ -DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf +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.7.ebuild index fd3c9a30603f..7d8e6ddb24f1 100644 --- a/app-text/liblangtag/liblangtag-0.6.3.ebuild +++ b/app-text/liblangtag/liblangtag-0.6.7.ebuild @@ -1,25 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit xdg-utils -DESCRIPTION="An interface library to access tags for identifying languages" +DESCRIPTION="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 x86" -IUSE="debug doc introspection static-libs test" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" +IUSE="debug doc introspection test" + +# Upstream expect liblangtag to be installed when one runs tests... +RESTRICT="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 ) @@ -27,13 +24,12 @@ RDEPEND=" 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" -) +BDEPEND=" + sys-devel/gettext + dev-build/libtool + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection-common ) +" src_prepare() { default @@ -48,7 +44,6 @@ src_configure() { $(use_enable debug) $(use_enable doc gtk-doc) $(use_enable introspection) - $(use_enable static-libs static) $(use_enable test) ) econf "${myeconfargs[@]}" diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild index 20eba626a22a..dfb60ca4296b 100644 --- a/app-text/libmspub/libmspub-0.1.4.ebuild +++ b/app-text/libmspub/libmspub-0.1.4.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +inherit autotools flag-o-matic if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git" - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Library parsing Microsoft Publisher documents" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" @@ -21,7 +21,7 @@ IUSE="doc static-libs" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-libs/icu:= @@ -30,7 +30,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - sys-devel/libtool + dev-build/libtool " PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) @@ -38,7 +38,9 @@ PATCHES=( "${FILESDIR}/${P}-gcc10.patch" ) src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == *9999 ]] && eautoreconf + + # Needed for Clang: stale libtool. bug #832764 + eautoreconf } src_configure() { diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild index 2035408ee17b..81c8ae0ea3ec 100644 --- a/app-text/libmspub/libmspub-9999.ebuild +++ b/app-text/libmspub/libmspub-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +inherit autotools flag-o-matic if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git" - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Library parsing Microsoft Publisher documents" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" @@ -21,7 +21,7 @@ IUSE="doc static-libs" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-libs/icu:= @@ -30,13 +30,15 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - sys-devel/libtool + dev-build/libtool " src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == *9999 ]] && eautoreconf + + # Needed for Clang: stale libtool. bug #832764 + eautoreconf } src_configure() { diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest index 1ff60daad3d0..e0a19edb5676 100644 --- a/app-text/libmwaw/Manifest +++ b/app-text/libmwaw/Manifest @@ -1,2 +1 @@ -DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f -DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b +DIST libmwaw-0.3.22.tar.xz 1476620 BLAKE2B 8133dbd06fdde5caabe9284fd0535e97335385a96ceea4ea9bc1d6f2a28f14f22f6943d71ee6631cb8d67c8791b56ed3d928bb18c723c7aec0b8cf7faf8427d7 SHA512 8682e7006430764cb825cd0bf4822ff42ea3035606e13a804afb9fa3c6dc583f34ae24cea226c1d31eae95224525289801c0afa3853adc6ab396bb9df34a60b4 diff --git a/app-text/libmwaw/libmwaw-0.3.19.ebuild b/app-text/libmwaw/libmwaw-0.3.19.ebuild deleted file mode 100644 index 4f07691b3c39..000000000000 --- a/app-text/libmwaw/libmwaw-0.3.19.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw" - inherit autotools git-r3 -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -DESCRIPTION="Library parsing many pre-OSX MAC text formats" -HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc tools" - -BDEPEND=" - sys-devel/libtool - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -DEPEND=" - dev-libs/librevenge - sys-libs/zlib -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - # zip is hard enabled as the zlib is dep on the rdeps anyway - local myeconfargs=( - --enable-zip - --disable-static - --disable-werror - $(use_with doc docs) - $(use_enable tools) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/app-text/libmwaw/libmwaw-0.3.20.ebuild b/app-text/libmwaw/libmwaw-0.3.22.ebuild index f4f82fb21109..167928a4dd0b 100644 --- a/app-text/libmwaw/libmwaw-0.3.20.ebuild +++ b/app-text/libmwaw/libmwaw-0.3.22.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw" - inherit autotools git-r3 + inherit git-r3 else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm arm64 ~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" @@ -24,14 +26,16 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { default - [[ ${PV} == *9999* ]] && eautoreconf + + # Refresh stale libtool, bug #814512 + eautoreconf } src_configure() { diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild index f0bf404e1fb2..19e7cff79243 100644 --- a/app-text/libmwaw/libmwaw-9999.ebuild +++ b/app-text/libmwaw/libmwaw-9999.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw" - inherit autotools git-r3 + inherit git-r3 else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~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" @@ -24,14 +26,16 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_prepare() { default - [[ ${PV} == *9999* ]] && eautoreconf + + # Refresh stale libtool, bug #814512 + eautoreconf } src_configure() { diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest index 0188c3e9fa47..375b0acbf16f 100644 --- a/app-text/libnumbertext/Manifest +++ b/app-text/libnumbertext/Manifest @@ -1 +1 @@ -DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2 +DIST libnumbertext-1.0.11.tar.xz 302676 BLAKE2B 48fae62c95c20991c9fe7012a0ad59b5a2ffd88d0866714e88f8d4d72e94f3d6c0edb0977da324a26c83ee1af73367fae88bbf7ad0792be371ad4bfbe63ef8d5 SHA512 0c4d2b98d8cef46a2c51c4265f96ac2af6e58d3b8e63e7b6a40134e86d1dc7bec38e048abf227d1ebad7774ba8a6d68a1fac464739914b2d14786c309819c836 diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.11.ebuild index 53b9c0af234e..7784c1d2d893 100644 --- a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild +++ b/app-text/libnumbertext/libnumbertext-1.0.11.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 DESCRIPTION="Number to number name and money text conversion libraries" HOMEPAGE="https://github.com/Numbertext/libnumbertext" @@ -9,12 +9,11 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" src_configure() { econf \ - --disable-static \ --disable-werror } diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild index e93e04f93338..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-2021 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 ~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,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 6c33ab30007c..f8631363a5bc 100644 --- a/app-text/libodfgen/libodfgen-9999.ebuild +++ b/app-text/libodfgen/libodfgen-9999.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2021 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 ~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 282dc63f7330..e8ed3c20daac 100644 --- a/app-text/libpaper/Manifest +++ b/app-text/libpaper/Manifest @@ -1 +1,3 @@ +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 fb8f9a9d49d3..99fc37a02be5 100644 --- a/app-text/libpaper/libpaper-1.1.28.ebuild +++ b/app-text/libpaper/libpaper-1.1.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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.1.2.ebuild b/app-text/libpaper/libpaper-2.1.2.ebuild new file mode 100644 index 000000000000..842963ab584e --- /dev/null +++ b/app-text/libpaper/libpaper-2.1.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for handling paper characteristics" +HOMEPAGE="https://github.com/rrthomas/libpaper" +SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz" + +# See README. +# 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 ~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 +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/app-text/libpaper/libpaper-2.1.3.ebuild b/app-text/libpaper/libpaper-2.1.3.ebuild new file mode 100644 index 000000000000..06d8f269983b --- /dev/null +++ b/app-text/libpaper/libpaper-2.1.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for handling paper characteristics" +HOMEPAGE="https://github.com/rrthomas/libpaper" +SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz" + +# See README. +# 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 ~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 +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml index e2fedda90ee1..51e48c3b98f8 100644 --- a/app-text/libpaper/metadata.xml +++ b/app-text/libpaper/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>printing@gentoo.org</email> - <name>Gentoo Printing Project</name> -</maintainer> + <maintainer type="project"> + <email>printing@gentoo.org</email> + <name>Gentoo Printing Project</name> + </maintainer> + <upstream> + <remote-id type="github">rrthomas/libpaper</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild index b8a7b7ad69f9..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-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="debug doc test tools" RESTRICT="!test? ( test )" @@ -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 45abcebe3af8..6311d5b76c16 100644 --- a/app-text/libspectre/Manifest +++ b/app-text/libspectre/Manifest @@ -1 +1,2 @@ -DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2 +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/files/libspectre-0.2.0-interix.patch b/app-text/libspectre/files/libspectre-0.2.0-interix.patch deleted file mode 100644 index 8f2956331852..000000000000 --- a/app-text/libspectre/files/libspectre-0.2.0-interix.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ru libspectre/spectre-utils.c libspectre/spectre-utils.c ---- a/libspectre/spectre-utils.c 2008-05-06 08:35:07 +0200 -+++ b/libspectre/spectre-utils.c 2008-05-06 08:49:51 +0200 -@@ -148,6 +148,17 @@ - spectre_strdup_vprintf (const char *format, - va_list args) - { -+#ifdef __INTERIX -+ /* no [v]asprintf here, so we need to do something else. */ -+ char * string = NULL; -+ char buf[524288]; -+ -+ if(vsprintf(buf, format, args) < 0) -+ return NULL; -+ -+ string = strdup(buf); -+ return string; -+#else - char *string = NULL; - int len = vasprintf (&string, format, args); - -@@ -155,6 +166,7 @@ - string = NULL; - - return string; -+#endif - } - - char * diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.11.ebuild index cfb66f66da8c..9ca5e16ca44f 100644 --- a/app-text/libspectre/libspectre-0.2.9.ebuild +++ b/app-text/libspectre/libspectre-0.2.11.ebuild @@ -1,9 +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 - -inherit autotools +EAPI=8 DESCRIPTION="Library for rendering Postscript documents" HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre" @@ -11,31 +9,23 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +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-doc/doxygen ) + doc? ( app-text/doxygen[doc] ) " -RDEPEND=">=app-text/ghostscript-gpl-9.24:=" -DEPEND="${RDEPEND}" # does not actually test anything, see bug 362557 RESTRICT="test" -PATCHES=( "${FILESDIR}"/${PN}-0.2.0-interix.patch ) - -src_prepare() { - default - eautoreconf # need new libtool for interix -} - src_configure() { local myeconfargs=( $(use_enable debug asserts) $(use_enable debug checks) - --disable-static --disable-test ) econf "${myeconfargs[@]}" 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/libspectre/metadata.xml b/app-text/libspectre/metadata.xml index d0b58801b31a..92e1bf951816 100644 --- a/app-text/libspectre/metadata.xml +++ b/app-text/libspectre/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">libspectre/libspectre</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild index 09a586e63ec0..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-2020 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 ~ppc64 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 22578cbcb776..a4cfd8260b1e 100644 --- a/app-text/libstaroffice/libstaroffice-9999.ebuild +++ b/app-text/libstaroffice/libstaroffice-9999.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 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 autotools else SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~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/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild index 7031422c057d..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-2021 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 ~mips ~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 c2c69bbccd14..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-2021 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 ~mips ~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 94014b449366..c90c80ccfba6 100644 --- a/app-text/libwps/Manifest +++ b/app-text/libwps/Manifest @@ -1 +1 @@ -DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649 +DIST libwps-0.4.14.tar.xz 719016 BLAKE2B 9f89b8534851760bb2cc3453e75840dea22eb09fd51a1d8ec7b7308fbb63ef7e34416ccfdbb5b1abc87616b7da17edc0bcf1e7fcc93414bf197dd904f6de759b SHA512 bbf9047f35d1b42c2da8deee24116d6a3fb20749a4255d369b62967a99185f52f21dda3e1b385056c1924995f2a72b670960bb476f38c3bf78933e25ff4a5779 diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.14.ebuild index 4e131ee40afe..a085ae2e0252 100644 --- a/app-text/libwps/libwps-0.4.12.ebuild +++ b/app-text/libwps/libwps-0.4.14.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 ~ppc64 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 ) -" -DEPEND=" - dev-libs/librevenge + doc? ( app-text/doxygen ) " -RDEPEND="${DEPEND}" src_configure() { local myeconfargs=( - --disable-static $(use_enable debug) $(use_with doc docs) $(use_enable tools) 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/Manifest b/app-text/linuxdoc-tools/Manifest index e5c63c2ef18f..e5ce01ec717c 100644 --- a/app-text/linuxdoc-tools/Manifest +++ b/app-text/linuxdoc-tools/Manifest @@ -1 +1,2 @@ DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252 +DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4 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 new file mode 100644 index 000000000000..28e6b697a3ad --- /dev/null +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch @@ -0,0 +1,245 @@ +Patch emailed to upstream. + +From 216e770ced47ad0017cd43033ef213c2634fe87a Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 6 Dec 2022 08:53:14 +0000 +Subject: [PATCH] sgmls-1.1: fix configure script with Clang 16 + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default. + +Unfortunately, this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. In this case, it led to a build failure +(see https://bugs.gentoo.org/883203). + +We also fix -Wstrict-prototypes while here as it's easy to do and it prepares +us for C23. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Bug: https://bugs.gentoo.org/883203 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/sgmls-1.1/configure ++++ b/sgmls-1.1/configure +@@ -110,13 +110,14 @@ cat >doit.c <<\EOF + + #include <ctype.h> + #include <signal.h> ++#include <stdlib.h> + +-static int whoops() ++static void whoops(int signal) + { + _exit(1); + } + +-main() ++int main(void) + { + int c; + #ifdef isascii +@@ -213,9 +214,9 @@ else + fi + + cat >doit.c <<\EOF +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdio.h> ++#include <stdlib.h> ++int main(int argc, char **argv) + { + if (argc == 0) + remove("foo"); +@@ -231,9 +232,9 @@ else + fi + + cat >doit.c <<\EOF +-main(argc, argv) +-int argc; +-char **argv; ++#include <unistd.h> ++#include <stdlib.h> ++int main(int argc, char **argv) + { + if (argc == 0) + getopt(argc, argv, "v"); +@@ -249,9 +250,9 @@ else + fi + + cat >doit.c <<\EOF +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++#include <unistd.h> ++int main(int argc, char **argv) + { + if (argc == 0) + access("foo", 4); +@@ -267,9 +268,9 @@ else + fi + + cat >doit.c <<\EOF +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++#include <unistd.h> ++int main(int argc, char **argv) + { + if (argc == 0) + vfork(); +@@ -285,9 +286,9 @@ else + fi + + cat >doit.c <<\EOF +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++#include <sys/wait.h> ++int main(int argc, char **argv) + { + + if (argc == 0) { +@@ -306,10 +307,9 @@ else + fi + + cat >doit.c <<\EOF ++#include <stdlib.h> + #include <string.h> +-main(argc, argv) +-int argc; +-char **argv; ++int main(int argc, char **argv) + { + if (argc == 0) + strerror(0); +@@ -326,9 +326,8 @@ fi + + cat >doit.c <<\EOF + #include <strings.h> +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++int main(int argc, char **argv) + { + if (argc == 0) + bcopy((char *)0, (char *)0, 0); +@@ -340,10 +339,9 @@ if $CC $CFLAGS -o doit doit.c $LIBS >/dev/null 2>&1 && ./doit 2>/dev/null + then + # Only use BSD_STRINGS if ANSI string functions don't work. + cat >doit.c <<\EOF ++#include <stdlib.h> + #include <string.h> +-main(argc, argv) +-int argc; +-char **argv; ++int main(int argc, char **argv) + { + if (argc == 0) + memcpy((char *)0, (char *)0, 0); +@@ -363,9 +361,8 @@ fi + + cat >doit.c <<\EOF + #include <signal.h> +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++int main(int argc, char **argv) + { + if (argc == 0) + raise(SIGINT); +@@ -382,9 +379,8 @@ fi + + cat >doit.c <<\EOF + #include <stdio.h> +-main(argc, argv) +-int argc; +-char **argv; ++#include <stdlib.h> ++int main(int argc, char **argv) + { + if (argc == 0) { + fpos_t pos; +@@ -404,12 +400,11 @@ fi + + cat >doit.c <<\EOF + #include <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/wait.h> + +-main(argc, argv) +-int argc; +-char **argv; ++int main(int argc, char **argv) + { + if (argc == 0) { + pid_t pid; +@@ -436,14 +431,15 @@ fi + + cat >doit.c <<\EOF + #include <stdio.h> ++#include <stdlib.h> + #include <signal.h> + +-static int whoops() ++static void whoops(int signal) + { + _exit(1); + } + +-main() ++int main(void) + { + char buf[30]; + #ifdef SIGSEGV +@@ -469,10 +465,9 @@ fi + + cat >doit.c <<\EOF + #include <nl_types.h> ++#include <stdlib.h> + +-main(argc, argv) +-int argc; +-char **argv; ++int main(int argc, char **argv) + { + if (argc == 0) { + nl_catd d = catopen("foo", 0); +@@ -492,12 +487,11 @@ fi + + cat >doit.c <<\EOF + #include <limits.h> ++#include <stdlib.h> + + char c = UCHAR_MAX; + +-main(argc, argv) +-int argc; +-char **argv; ++int main(int argc, char **argv) + { + #if CHAR_MIN < 0 + exit(!(c < 0)); +@@ -512,7 +506,8 @@ then + char_signed= + else + cat >doit.c <<\EOF +-main() ++#include <stdlib.h> ++int main(void) + { + int i; + +-- +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 afa70d83839c..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-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ RDEPEND=" sys-apps/groff " DEPEND="${RDEPEND} - sys-devel/flex - virtual/awk + app-alternatives/lex + app-alternatives/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild new file mode 100644 index 000000000000..3bf30133b667 --- /dev/null +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs + +DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files" +HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools" +SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+ MIT SGMLUG" +SLOT="0" +KEYWORDS="amd64 ~ia64 ppc ~sparc x86" +IUSE="doc" + +RDEPEND=" + || ( app-text/openjade app-text/opensp ) + app-text/sgml-common + dev-lang/perl:= + sys-apps/groff +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/awk + app-alternatives/lex + doc? ( + dev-texlive/texlive-fontsrecommended + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.82-configure-clang16.patch +) + +src_prepare() { + default + + # Pregenerated configure scripts fail. + eautoreconf +} + +src_configure() { + perl_set_version + tc-export CC + local myeconfargs=( + --disable-docs + --with-texdir="${TEXMF}/tex/latex/${PN}" + --with-perllibdir="${VENDOR_ARCH}" + --with-installed-iso-entities + ) + use doc && myeconfargs+=(--enable-docs="txt pdf html") + + econf "${myeconfargs[@]}" +} + +src_compile() { + # Prevent access violations from bitmap font files generation. + use doc && export VARTEXFONTS="${T}/fonts" + + default +} + +src_install() { + # Makefile ignores docdir configuration option. + emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install + dodoc ChangeLog README + + insinto /etc/sgml + newins - linuxdoc.cat <<-EOF + CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog" + EOF +} + +pkg_preinst() { + # work around sgml-catalog.eclass removing it + cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die +} + +pkg_postinst() { + local backup=${T}/linuxdoc.cat + local real=${EROOT}/etc/sgml/linuxdoc.cat + if ! cmp -s "${backup}" "${real}"; then + cp "${backup}" "${real}" || die + fi + + latex-package_pkg_postinst + sgml-catalog-r1_pkg_postinst +} + +pkg_postrm() { + latex-package_pkg_postrm + sgml-catalog-r1_pkg_postrm +} 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/logmerge/logmerge-0.5.2b.ebuild b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild index a7f24d5fd1f8..9fc47fd81530 100644 --- a/app-text/logmerge/logmerge-0.5.2b.ebuild +++ b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 DESCRIPTION="Small and powerful script to merge two or more logfiles" HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge" @@ -15,5 +15,5 @@ RDEPEND="dev-lang/perl" src_install() { default - dobin ${PN} + dobin logmerge } diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest index ba3e9378cc09..c01019b38596 100644 --- a/app-text/lowdown/Manifest +++ b/app-text/lowdown/Manifest @@ -1 +1 @@ -DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34 +DIST lowdown-1.1.0.tar.gz 599219 BLAKE2B f623399cb41c5eaf180550283c5b2738993563ff30be4cfa1a471df036ed4289057d3f886a7727d85283896fbfe1316e9cc86d32c629cea1fd775af16cf58839 SHA512 b7b788694abf6760ca4abbd8d5d2c226d5406067ebf9b55307f136e1ab373e517fb20187659c09029463872310a5b39a0129842d1bc6b7bd64f2d440390e2676 diff --git a/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch new file mode 100644 index 000000000000..0337f3d68d99 --- /dev/null +++ b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch @@ -0,0 +1,11 @@ +diff --git a/lowdown.in.pc b/lowdown.in.pc +index 078d0c0..a31aaac 100644 +--- a/lowdown.in.pc ++++ b/lowdown.in.pc +@@ -9,5 +9,5 @@ URL: https://kristaps.bsd.lv/lowdown + Version: @VERSION@ + Requires: + Libs.private: +-Libs: -L${libdir} -llowdown -lm ++Libs: -L${libdir} -llowdown -lm -lmd + Cflags: -I${includedir} diff --git a/app-text/lowdown/files/lowdown-0.8.4-configure.patch b/app-text/lowdown/files/lowdown-0.8.4-configure.patch deleted file mode 100644 index ad7bcb69d631..000000000000 --- a/app-text/lowdown/files/lowdown-0.8.4-configure.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Makefile b/Makefile -index c2e2715..4fe977f 100644 ---- a/Makefile -+++ b/Makefile -@@ -143,7 +143,6 @@ install: all - $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig - $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR) - $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR) -- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR) - for f in $(MANS) ; do \ - name=`basename $$f .html` ; \ -diff --git a/configure b/configure -index d1c16ab..941f185 100755 ---- a/configure -+++ b/configure -@@ -92,12 +92,12 @@ LDADD_STATIC= - CPPFLAGS= - LDFLAGS= - DESTDIR= --PREFIX="/usr/local" -+PREFIX="/usr" - BINDIR= - SBINDIR= - INCLUDEDIR= - LIBDIR= --MANDIR= -+MANDIR="/usr/share/man" - SHAREDIR= - INSTALL="install" - INSTALL_PROGRAM= 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-0.8.4-r1.ebuild b/app-text/lowdown/lowdown-0.8.4-r1.ebuild deleted file mode 100644 index b517049ebd47..000000000000 --- a/app-text/lowdown/lowdown-0.8.4-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="VERSION_${PV//./_}" -DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" -HOMEPAGE="https://kristaps.bsd.lv/lowdown/" -SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="virtual/libcrypt:=" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/lowdown-0.8.4-configure.patch" -) - -src_configure() { - CC="$(tc-getCC)" ./configure || die "./configure failed" -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" AR="$(tc-getAR)" $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') -} - -src_test() { - emake regress -} diff --git a/app-text/lowdown/lowdown-1.1.0.ebuild b/app-text/lowdown/lowdown-1.1.0.ebuild new file mode 100644 index 000000000000..dd3d86d63148 --- /dev/null +++ b/app-text/lowdown/lowdown-1.1.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +MY_PV="VERSION_${PV//./_}" +DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats" +HOMEPAGE="https://kristaps.bsd.lv/lowdown/" +SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="ISC" +SLOT="0/2" +KEYWORDS="amd64 ~arm64 ~x86" + +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-1.1.0-shared-linking.patch" +) + +src_configure() { + append-flags -fPIC + tc-export CC AR + + ./configure \ + PREFIX="/usr" \ + MANDIR="/usr/share/man" \ + LDFLAGS="${LDFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LIBDIR="/usr/$(get_libdir)" \ + || die "./configure failed" +} + +src_compile() { + emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '') +} + +src_test() { + LD_LIBRARY_PATH="${S}" emake regress +} diff --git a/app-text/lowdown/metadata.xml b/app-text/lowdown/metadata.xml index bd6443d4a375..80961c799908 100644 --- a/app-text/lowdown/metadata.xml +++ b/app-text/lowdown/metadata.xml @@ -5,4 +5,7 @@ <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> + <upstream> + <remote-id type="github">kristapsdz/lowdown</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild deleted file mode 100644 index 065e2cd8201a..000000000000 --- a/app-text/lv/lv-4.51-r4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools toolchain-funcs - -MY_P="${PN}${PV//./}" - -DESCRIPTION="Powerful Multilingual File Viewer" -#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -RDEPEND="!app-editors/levee - sys-libs/ncurses:0=" -DEPEND="${RDEPEND} - dev-lang/perl" -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-gentoo.patch - "${FILESDIR}"/${PN}-headers.patch - "${FILESDIR}"/${PN}-tinfo.patch - "${FILESDIR}"/${PN}-xz.patch -) -DOCS=( README hello.sample ) -HTML_DOCS=( index.html relnote.html hello.sample.gif ) - -src_prepare() { - default - - cd src - mv configure.{in,ac} - eautoreconf -} - -src_configure() { - ECONF_SOURCE=src econf -} - -src_compile() { - emake CC="$(tc-getCC)" -} diff --git a/app-text/lv/lv-4.51-r5.ebuild b/app-text/lv/lv-4.51-r5.ebuild index b67db19482ea..58fee6c0a2bb 100644 --- a/app-text/lv/lv-4.51-r5.ebuild +++ b/app-text/lv/lv-4.51-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="!app-editors/levee diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest index f44b4b353ca7..fbfe6541cf5b 100644 --- a/app-text/mandoc/Manifest +++ b/app-text/mandoc/Manifest @@ -1 +1 @@ -DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 +DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4 diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch deleted file mode 100644 index 6d976683772c..000000000000 --- a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5 -https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2 - -https://bugs.gentoo.org/707254 ---- mandoc/compat_reallocarray.c 2014/12/11 09:05:01 1.4 -+++ mandoc/compat_reallocarray.c 2020/06/15 01:37:15 1.5 -@@ -1,8 +1,0 @@ --#include "config.h" -- --#if HAVE_REALLOCARRAY -- --int dummy; -- --#else -- -@@ -23,6 +15,7 @@ int dummy; - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#include "config.h" - - #include <sys/types.h> - #include <errno.h> -@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size) - } - return realloc(optr, size * nmemb); - } -- --#endif /*!HAVE_REALLOCARRAY*/ ---- mandoc/compat_getline.c 2015/11/07 20:52:52 1.1 -+++ mandoc/compat_getline.c 2020/06/15 01:37:14 1.2 -@@ -1,8 +1,0 @@ --#include "config.h" -- --#if HAVE_GETLINE -- --int dummy; -- --#else -- -@@ -22,6 +14,7 @@ int dummy; - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#include "config.h" - - #include <sys/types.h> - #include <errno.h> -@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp) - return pos; - } - } -- --#endif diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild index e23baa856a58..07c5d97647c2 100644 --- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild +++ b/app-text/mandoc/mandoc-1.14.6.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 @@ -11,8 +11,9 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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,11 +23,12 @@ 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 - "${FILESDIR}"/${PN}-1.14.5-gcc10.patch ) pkg_pretend() { @@ -107,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/mandoc/metadata.xml b/app-text/mandoc/metadata.xml index bcdbf9ac8af3..8e701fbbd8ba 100644 --- a/app-text/mandoc/metadata.xml +++ b/app-text/mandoc/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + </maintainer> <use> <flag name="cgi">build man.cgi web plugin for viewing man pages</flag> <flag name="system-man">set as the default man provider</flag> diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild index 49301d4d54ef..e9a237b608f4 100644 --- a/app-text/manpager/manpager-1.ebuild +++ b/app-text/manpager/manpager-1.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 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" 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 ~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 8a28e07ea954..67f47900de21 100644 --- a/app-text/master-pdf-editor/Manifest +++ b/app-text/master-pdf-editor/Manifest @@ -1 +1,3 @@ -DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf +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.7.90.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild index 1300656eb4a5..69d1eed91eb1 100644 --- a/app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild +++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild @@ -1,13 +1,14 @@ -# 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 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" @@ -15,18 +16,18 @@ KEYWORDS="~amd64" RESTRICT="mirror" RDEPEND=" - dev-libs/nss + sys-libs/glibc >=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" - -S="${WORKDIR}/${PN}-${PV%%.*}" +QA_PREBUILT="opt/${PN}/masterpdfeditor5" src_install() { insinto /opt/${PN} diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild new file mode 100644 index 000000000000..69d1eed91eb1 --- /dev/null +++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 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-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/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/mathtex/Manifest b/app-text/mathtex/Manifest index b75bc4c44d79..f4a8cd628072 100644 --- a/app-text/mathtex/Manifest +++ b/app-text/mathtex/Manifest @@ -1 +1 @@ -DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601 +DIST mathtex-1.05.zip 161624 BLAKE2B 9812cfadcc5d47286afb86c6ad38f5bdf932ef39efad2228b04b3b39cbb7543f78be9d82cfa8bbfcc72c9f46fa1931e39aeb71e3abab865dcd60e4e9717e2377 SHA512 f116618de4264efdbccb122b0e9769bbe622f6300266284a96e65f37346c000364063f201b31554bde62a4a4e13c0c8f16d570dca359d3ef27bc0f7622af3715 diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.05.ebuild index ac93ae93133a..47b8d0d3f71b 100644 --- a/app-text/mathtex/mathtex-1.04.ebuild +++ b/app-text/mathtex/mathtex-1.05.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc" -HOMEPAGE="http://www.forkosh.com/mathtex.html" -SRC_URI="mirror://gentoo/${P}.zip" +HOMEPAGE="https://www.ctan.org/pkg/mathtex" +SRC_URI="https://mirrors.ctan.org/support/${PN}.zip -> ${P}.zip" LICENSE="GPL-3" SLOT="0" @@ -16,9 +16,9 @@ IUSE="png" RDEPEND="app-text/dvipng virtual/latex-base" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" -S=${WORKDIR} +S=${WORKDIR}/${PN} einfo_run_command() { einfo "${@}" @@ -31,13 +31,12 @@ src_compile() { -DLATEX=\"/usr/bin/latex\" \ -DDVIPNG=\"/usr/bin/dvipng\" \ $(use png && echo "-DPNG") \ - mathtex.c -o mathtex + mathtex.c -o mathtex } src_install() { dobin mathtex - dodoc README - dohtml mathtex.html + dodoc README mathtex.html } pkg_postinst() { diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest new file mode 100644 index 000000000000..554bfbc00189 --- /dev/null +++ b/app-text/mdbook/Manifest @@ -0,0 +1,238 @@ +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 ammonia-3.3.0.crate 46061 BLAKE2B 082ee30f39ad788c9ae87888f003c2f6d08fbea7ae4983f1f5419c87c5303d860ecabf6f530bb76ff03da44c1f72f664053da79e6e3f4991e39b23104bcedd97 SHA512 8bed262b3790a5629918f188c246f0039f4e3b46908b367993e61c280a99c775b85982bb5cdce5c66781a40b8b7f8ab1ebbe2900d590ee3ba0788dd5d854b155 +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 anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 +DIST assert_cmd-2.0.13.crate 23917 BLAKE2B 72fbb8afc12429a96c89b07dce8b2a969a1c2656aedf19ac9cd2bd1e5d5f29b3c558616858ad01a86807b787c88efc556ad432a55b59b0df5b4bdbeb9b6ab05e SHA512 3599483d28f1893945b63d693f38d656724f382ac7a0c2cb0773d72e6bba3dcc9137cca51575fca984c2435b081cd6ad68ed5d1fa04e606484926528cc41a305 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +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 bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214 +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chrono-0.4.33.crate 221279 BLAKE2B cc7b71b996a1c15b6b013d06f57ffd8af78b72fab87c0e9123f87918d404787ade2217e8e58fb0153552e49c6e11ca6e820eb0c0f1add8c43619849fa096a214 SHA512 172996d2ccc8733957d45fcc24fefb3531c7b33a798ab9f494be23f08d6d2bc350401574c626fd8eec0191ba28c0f7b73af7bc4235ec72a4b1d437fb7e89c875 +DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 +DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2 +DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +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-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 data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae +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.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba +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 equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +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.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.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 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 handlebars-5.1.0.crate 97779 BLAKE2B 584b6f710a4860168b0ca6e587adf19181ea7580a733ba2570380d0d7418fbf7551a77d5a52677704122e7ba7f2d63d3740d6f95a2731119669e6335389ff81a SHA512 6f80735c183bdfea58547329bfd72bc63aa21e6bdf74dc06782adfbb4e987ee31f0f86d9ceee4abab99b5ea2083c3d3369856ac51123e3bfaa0e4704e2406d64 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +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.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5 +DIST html5ever-0.26.0.crate 72921 BLAKE2B bba23709f6404afcb86dc5af8fe8c0728c4c407de7cfc679c286ef13a790077329f7df2a065eae742e7b4c2303e01793e1b936daadd73f663cf2933845d975c9 SHA512 383a25421cddb0573e41ca93131d681cfbfaf551989337845a197e939a2580751ae90e96605bfc4e187dbd5189b6c014557cc69e3d7d2d2cdfb88eeca8896089 +DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51 +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.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a +DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c +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 inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2 +DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST js-sys-0.3.67.crate 80764 BLAKE2B aee8b96c8c5811020b3ee4277524902e27d96a027add7b21a8ff94eaac7db15e8de08a9e203ff462b05ce10d0a44aff78a355c07514794e41f49fa936a3c8fb2 SHA512 590d947a869c3435166e34c25b3011351f6804b43887ee76bc2be69b7407b5181bbbc3a5bf6c50867c65d73fcd8e65ac7b0d395710ccd52000beb87f8826be96 +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 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 log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +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_rcdom-0.2.0.crate 222948 BLAKE2B 2105ceee730f5fbb3c14ddb7bfe8ee5139febc870e37e9ea169f107ac8060ee4f5782b185310bada5f646600c2b8bb7fbed144c056e5b437133443f62a04ad99 SHA512 bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4 +DIST mdbook-0.4.37.tar.gz 1530568 BLAKE2B 42c3daa2c4169fd9baf7aa217b8f0d119b3aa9146c514af35b5d8747111ab1f44e0e66191fb7df2c650bb55fe011af9cbaec399cc7171bf8407f9843e88030f9 SHA512 f7f11ea46b6f1ca89922c0898ce5ed68711cab0e6cc1cde5654454dbd4424fdbd907787d40ac188c82b581223badd4d4d82d65c4bc1119114b3e7062d8c44e8a +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908 +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2 +DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85 +DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea +DIST normpath-1.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca +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_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 parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +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.7.crate 118478 BLAKE2B e1464444fc114fcfa261e671733f73849001f8481e9e204c3782197a907162b9a037f7e804abf6f4be544ff9736ca63d87b7ea109470a8953b53a5c91e6ce920 SHA512 3edceb5acc379082e1a3e3d3600039232e8440fcf7b323c70951c78bc195069a5758cc6c47a69734f3e2bf323b520587610727105da70a2bd28f963e286dcd76 +DIST pest_derive-2.7.7.crate 35839 BLAKE2B b51f407eb54f9f8f1adbcfc4d1c2af3ac76b0c6d4cfa1a0eaa265a00458e892bd421f3d440904dd404a1818e7b79465d8050ed027f1e6f3e54125a887f4576ab SHA512 5717026ac6882dfa99ecf68d6ffe7dffdf5c74def257039d5619d2878816c245faeae0e5925372f9c636fe1d5067c6227197b34e0657c7788b753ae729dc431f +DIST pest_generator-2.7.7.crate 18184 BLAKE2B a66c47676bbc7a911a4fc0e4687e445e10b6022277505aaab91632801ee7de59ce8b9ba665bbabe668437ac90e81e3718294d15a1c875cb7b6586f81e86795c8 SHA512 93b41b542bcddbdfd546963ea26d4871a9cfc38a2da55efad3b354ae705ee7f8ee6884279cb8a56da9e33e5f039f72964f2396c89d5346dcd668502a38ac73c3 +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_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1 +DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7 +DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5 +DIST pin-project-1.1.4.crate 54230 BLAKE2B e90fcdc609f42171b18a42626e59dd904555774c4c012a274149d18ee899ade6969c31d9fd706a363ee2d1a510d80d24e438e04cbed5f4ab26b9d645256e2438 SHA512 e378034c6de9148797d874e9a4ecf66039c662c54c263a06413a2ebf5bbbbdf21419e8738d6b2eca6bb5d2043102e52dc6d0e370e7c242830ced0779e13cb6d8 +DIST pin-project-internal-1.1.4.crate 28249 BLAKE2B 6d8dae4d59d0b71c9a66414cf5babb45285a8d67f798a25e5521495ae23e983b871bc8f70c20d0785b5b53acf9a5cf734f137b581852a542f98b0492cf6568f6 SHA512 b8a687d1d2fa84bccb41eb7652434036c227268177f2f05a7071b0dfb16672fc8a9762ecac6c4e519478cefe16ed4bcc2c77dd9298057dc42f87021f8e0a603b +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +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-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 pulldown-cmark-0.10.0.crate 139056 BLAKE2B 72974ca5b8fa8de1dccadb65900295ea3a0adf9f86913c89ab16c5c49f65d4f3368453dc2fae807f5cfda5646b26a822e3f7e4b7f6f15bdd7ef058365f3eafef SHA512 cf6dd2f0a3a4a9a1f4032ae7f6084ca7805d54576de8083951c50dfff7a426ee5b0846bc7719ecf07c43a298a02e85ff1fcd891d0a163528361baf19a0b19044 +DIST pulldown-cmark-escape-0.10.0.crate 8944 BLAKE2B 554bef1897d8bd20fb679d155c710cfb8bcba4bec52afe6b8f634b671b6d2e4dc12ad6655df0b94196d57a1f3e1bb39bfdc652e42f3ec90d880529bf5da36e48 SHA512 282bf294d525f0b7550ef33fd8ca8604c62d4175b083f241a4524e377ab26d9f578ff2f52e0bf33e371fdfd0f93adf0d14d0e3171c412046f17bcb91826d25ea +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +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.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +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.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST select-0.6.0.crate 60292 BLAKE2B 725c9b4e8d9143633f07472268c834a25040a9f133ba95db1c41ceb45692b98a9fe7fba98c10bdc48524722b37bf9395a105385752c6bd3beb044b7d65aacf07 SHA512 8e5b14ee8cd2d88eb908fdf750cfd724741019ad4bbafa1fdeafde10db0b7cc6a86883d8aad7c1267e772dec63e2f138e57d52ab425b8c5a10faed9329dccdfe +DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35 +DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e43bff6b7921db85e19f34ee5022eb1086890edb6987428cbb707a59277ae007d1536b5d80a7da615fc3f36a SHA512 0917aa36d855ca77726d538fb7fcfcf629722c784d747b3869c0d69444c447d7b1fab556a9eb9594ddf6cc508df636fdde051a1c3909f9c691e4921946ebda19 +DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8a298d6f07d12a2326ff144baaac07fcbd4af1d18b8b1188d4cc192e253fcd79860d1dbb2ecb148025449c0ac954c72 SHA512 f4df7f835e8416e4662c62a46d5f6e6d45ffd103812d681b220f8080310720e27f738a34a8e622df722fed55a1d8c654dd4abfbd78d1fdc871306bf3985baf22 +DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34 +DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 +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 socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +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.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa +DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f +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-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +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-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-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +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.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 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 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.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.90.crate 182529 BLAKE2B 309bf19f4f0551ced885ef7ef80c56bc54431cf06c77e430872fb87e3cfde0c0dc49b018d070b505ea8e488e94a4845ed143430e3c4b70ee48713147b980c6e9 SHA512 c6f73581590a8142b66bdc6373d925f1b1d37d4d09718b49c3454d3d2e16eab3dde97724cbd246420e0c29656bac8ede82eaa0b0e94f22238628dd974223db62 +DIST wasm-bindgen-backend-0.2.90.crate 28348 BLAKE2B 14193bacce7df590b372bbab1126255cca027fd94c76c17ab13b06e7c18346b5ffff5e2c9d0ff5bdc631846fca70eac9a43e4ffcaf58f0c062ee36fe025abf75 SHA512 7b19cfee23dad5b09b6089d2b56692bc183d477fed5db8a91a6b30c574b3de4b1d45004761248d8c5437ce20a5ff64f7e081fccbd84e8ed72fd154e5a06607da +DIST wasm-bindgen-macro-0.2.90.crate 13904 BLAKE2B bd5e3521c27f7ec3cee0f2ac4cf894ea5a9b9bde65ec55ae9b29d033b986338af92e2dc9932b87dbf739f4ba48230f17a16226cf1826afe13b102225af29c1c8 SHA512 97dc09c02ea4daa1694f3a118aed3ae958373e179bc7ae4d7bcd14b9958f79c03564d678ec04d7f80b6e6a5529f63f1a853b2905055be8a210d41a12ff279007 +DIST wasm-bindgen-macro-support-0.2.90.crate 20008 BLAKE2B 46172ab1e6d03faa2a29d8b2d1bb3b37dcb830d73aa96d0922b63627a6eced1d38729ff85bba7eba3e89dfbd04fbb92a4b87cd74a1a906286c61145e3ad38da9 SHA512 9a5782cebb192276a0a05b54f8cadd994cbb97388d72c85f9c60754ade309684883cb2f916badc1360522a6599172eab84aa2bc981889cf2ef2aed8a4e0a3577 +DIST wasm-bindgen-shared-0.2.90.crate 7264 BLAKE2B 2082267bcfae660b72f6d5996a563d10319a1cd7078b37070f41e96aa56da31ca0a22c168a1e5fe52294f5d7a50c76d06f03d489cfcc0826db29316f2e67ebbc SHA512 f6639c004b17661d0a571181e1447db7eeadbfe93005d6f0e1bab983967591b64cf2ed21e7b77934ad45058adedcae28af1ef141696bd598f9c2d683abf93018 +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.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +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_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_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_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_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_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_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_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 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.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/tidy-html5/metadata.xml b/app-text/mdbook/metadata.xml index 42d16d811efe..8ced3c48b9d3 100644 --- a/app-text/tidy-html5/metadata.xml +++ b/app-text/mdbook/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <upstream> - <remote-id type="github">nhatminhle/cofoja</remote-id> + <remote-id type="github">rust-lang/mdBook</remote-id> </upstream> </pkgmetadata> 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/files/mecab-0.996-clang-16-register.patch b/app-text/mecab/files/mecab-0.996-clang-16-register.patch new file mode 100644 index 000000000000..5e782e61fb0c --- /dev/null +++ b/app-text/mecab/files/mecab-0.996-clang-16-register.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/894362 +https://github.com/taku910/mecab/pull/66 + +From 731d738f33dcf62dc9da93104ca1dd6f4c7c9c5f Mon Sep 17 00:00:00 2001 +From: Yuriy Chernyshov <thegeorg@yandex-team.ru> +Date: Fri, 11 Feb 2022 12:31:33 +0300 +Subject: [PATCH 1/2] Remove register storage specifier + +register does not work in modern C / C++. +--- a/src/char_property.h ++++ b/src/char_property.h +@@ -37,7 +37,7 @@ class CharProperty { + inline const char *seekToOtherType(const char *begin, const char *end, + CharInfo c, CharInfo *fail, + size_t *mblen, size_t *clen) const { +- register const char *p = begin; ++ const char *p = begin; + *clen = 0; + while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) { + p += *mblen; + +From 82fd6424fde64c77f49695883a18f368ba96850e Mon Sep 17 00:00:00 2001 +From: Yuriy Chernyshov <thegeorg@yandex-team.ru> +Date: Sat, 12 Feb 2022 14:31:03 +0300 +Subject: [PATCH 2/2] More fixes + +--- a/src/darts.h ++++ b/src/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; +--- a/src/viterbi.cpp ++++ b/src/viterbi.cpp +@@ -318,11 +318,11 @@ template <bool IsAllPath> bool connect(size_t pos, Node *rnode, + const Connector *connector, + Allocator<Node, Path> *allocator) { + for (;rnode; rnode = rnode->bnext) { +- register long best_cost = 2147483647; ++ long best_cost = 2147483647; + Node* best_node = 0; + for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) { +- register int lcost = connector->cost(lnode, rnode); // local cost +- register long cost = lnode->cost + lcost; ++ int lcost = connector->cost(lnode, rnode); // local cost ++ long cost = lnode->cost + lcost; + + if (cost < best_cost) { + best_node = lnode; + diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild index 68305e1647f7..13064cdcfed4 100644 --- a/app-text/mecab/mecab-0.996-r1.ebuild +++ b/app-text/mecab/mecab-0.996-r1.ebuild @@ -1,36 +1,42 @@ -# 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 autotools +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 ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" SLOT="0" IUSE="static-libs unicode" -DEPEND="dev-lang/perl - virtual/libiconv" -RDEPEND="" -PDEPEND="|| ( +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}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch +) -PATCHES=( "${FILESDIR}"/${PN}-0.98-iconv.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 @@ -38,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/msort/files/msort-8.53-configure-clang16.patch b/app-text/msort/files/msort-8.53-configure-clang16.patch new file mode 100644 index 000000000000..de19a029caa4 --- /dev/null +++ b/app-text/msort/files/msort-8.53-configure-clang16.patch @@ -0,0 +1,18 @@ +https://src.fedoraproject.org/rpms/msort/blob/addd4dfbb265c79e76f3329c691639d3cf837cb4/f/msort-configure-c99.patch + +Include <stdio.h> for the printf function. This avoids a check +failure with future compilers which do not support implicit function +declarations. + +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DEFUN([AC_C_LONG_LONG], + ]) + + AC_DEFUN([AC_C_PRINTF_THSEP], +-[AC_TRY_COMPILE(,[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no) ++[AC_TRY_COMPILE([#include <stdio.h>],[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no) + if test $ac_cv_c_printf_thsep = yes; then + AC_DEFINE(HAVE_PRINTF_THSEP, 1, [compiler understands printf flag for thousands separation in ints]) + fi + diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53-r2.ebuild index 62a6fff19ef6..39dfa9ff4a68 100644 --- a/app-text/msort/msort-8.53.ebuild +++ b/app-text/msort/msort-8.53-r2.ebuild @@ -1,7 +1,7 @@ -# 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 autotools @@ -26,7 +26,8 @@ PATCHES=( "${FILESDIR}/${P}-fix-missing-limits-header.patch" "${FILESDIR}/${P}-fix-segfault-on-certain-input.patch" "${FILESDIR}/${P}-respect-users-cflags.patch" - ) + "${FILESDIR}/${P}-configure-clang16.patch" +) src_prepare() { default diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index 3b7bdb9651a2..a4fca6b2b477 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1 +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/files/multitail-7.0.0-fix-clang16-build.patch b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch new file mode 100644 index 000000000000..1c706e0d0236 --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch @@ -0,0 +1,34 @@ +Clang16 will not suppert implicit int and implicit function declarations. +This patch makes the source code ready for clang16. +See also: https://bugs.gentoo.org/870412 + +Bug: https://bugs.gentoo.org/874102 + +This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/misc.c ++++ b/misc.c +@@ -477,7 +477,7 @@ void heartbeat(void) + mydoupdate(); + } + +-void do_check_for_mail() ++void do_check_for_mail(dtime_t time) + { + if (check_for_mail > 0 && mail_spool_file != NULL) + { +diff --git a/misc.h b/misc.h +index febf11a..5566519 100644 +--- a/misc.h ++++ b/misc.h +@@ -1,5 +1,7 @@ ++#import "mt.h" ++ + void info(void); + void statistics_menu(void); + void heartbeat(void); +-void do_check_for_mail(); ++void do_check_for_mail(dtime_t time); + void store_statistics(proginfo *cur, dtime_t now); diff --git a/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch new file mode 100644 index 000000000000..6ad621dd540e --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch @@ -0,0 +1,29 @@ +Fix mismatching declarations so build does not fail with -Werror=lto-type-mismatch + +Bug: https://bugs.gentoo.org/855017 + +This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/globals.c ++++ b/globals.c +@@ -81,7 +81,7 @@ double heartbeat_t = 0.0; + off64_t msf_prev_size = 0; + + dtime_t msf_last_check = 0; +-dtime_t mt_started; ++time_t mt_started; + + pid_t children_list[MAX_N_SPAWNED_PROCESSES]; + pid_t tail_proc = 0; /* process used by checker-proc */ +--- a/selbox.h ++++ b/selbox.h +@@ -1,4 +1,6 @@ +-int selection_box(void **list, char *needs_mark, int nlines, char type, int what_help, char *heading); ++#include "mt.h" ++ ++int selection_box(void **list, char *needs_mark, int nlines, selbox_type_t type, int what_help, char *heading); + int select_window(int what_help, char *heading); + proginfo * select_subwindow(int f_index, int what_help, char *heading); + char * select_file(char *input, int what_help); diff --git a/app-text/multitail/files/multitail-7.0.0-gentoo.patch b/app-text/multitail/files/multitail-7.0.0-gentoo.patch new file mode 100644 index 000000000000..5219334abbe0 --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-gentoo.patch @@ -0,0 +1,32 @@ +Gentoo splits off tinfo from ncurses, so we need to ask pkg-config here what the user has on the system. + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/Makefile ++++ b/Makefile +@@ -24,10 +24,10 @@ ifeq ($(PLATFORM),Darwin) + LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm + else + ifeq ($(UTF8_SUPPORT),yes) +- LDFLAGS+=-lpanelw -lncursesw -lutil -lm ++ LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm + CPPFLAGS+=-DUTF8_SUPPORT + else +- LDFLAGS+=-lpanel -lncurses -lutil -lm ++ LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm + endif + endif + +@@ -40,10 +40,10 @@ DEPENDS:= $(OBJS:%.o=%.d) + all: multitail + + multitail: $(OBJS) +- $(CC) $(OBJS) $(LDFLAGS) -o multitail ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o multitail $(LIBS) + + ccmultitail: $(OBJS) +- ccmalloc --no-wrapper -Wextra $(CC) $(OBJS) $(LDFLAGS) -o ccmultitail ++ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o ccmultitail $(LIBS) + + install: multitail + mkdir -p $(DESTDIR)$(PREFIX)/bin diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml index 3d78de6e91c8..b1c36c1034d5 100644 --- a/app-text/multitail/metadata.xml +++ b/app-text/multitail/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Shell Tools Project</name> </maintainer> <upstream> - <remote-id type="github">flok99/multitail</remote-id> + <remote-id type="github">folkertvanheusden/multitail</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/multitail/multitail-6.4.2-r1.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild index 8c10123313f6..8f3629c5129d 100644 --- a/app-text/multitail/multitail-6.4.2-r1.ebuild +++ b/app-text/multitail/multitail-6.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="debug examples unicode" RESTRICT="test" # bug 492270 diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild new file mode 100644 index 000000000000..a4b9c0057b6a --- /dev/null +++ b/app-text/multitail/multitail-7.0.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 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 + "${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch + "${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.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=6.4.3 || die + + DOCS=( readme.txt thanks.txt ) + HTML_DOCS=( manual.html ) + einstalldocs + + if use examples; then + docinto examples + dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl + fi +} + +pkg_postinst() { + optfeature "send a buffer to the X clipboard" x11-misc/xclip +} 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 acda2b0eb4e3..a835f7c90abd 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1 +1,3 @@ -DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8 +DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59 +DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737 +DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777 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.18.0-CVE-2021-3407.patch b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch deleted file mode 100644 index 566ee562389c..000000000000 --- a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://bugs.gentoo.org/772311 - -From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001 -From: Robin Watts <Robin.Watts@artifex.com> -Date: Fri, 22 Jan 2021 17:05:15 +0000 -Subject: [PATCH 1/1] Bug 703366: Fix double free of object during - linearization. - -This appears to happen because we parse an illegal object from -a broken file and assign it to object 0, which is defined to -be free. - -Here, we fix the parsing code so this can't happen. ---- - source/pdf/pdf-parse.c | 6 ++++++ - source/pdf/pdf-xref.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 7abc8c3d4..5761c3351 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num); - } - gen = buf->i; -+ if (gen < 0 || gen >= 65536) -+ { -+ if (try_repair) -+ *try_repair = 1; -+ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen); -+ } - - tok = pdf_lex(ctx, file, buf); - if (tok != PDF_TOK_OBJ) -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 1b2bdcd59..30197b4b8 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) - { - ofs = fz_tell(ctx, doc->file); - trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL); -+ if (num == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n"); - } - fz_catch(ctx) - { --- -2.17.1 - diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c deleted file mode 100644 index dc4000b4cde6..000000000000 --- a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c +++ /dev/null @@ -1,102 +0,0 @@ -From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001 -From: Robin Watts <Robin.Watts@artifex.com> -Date: Thu, 8 Oct 2020 16:15:40 +0100 -Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs. - -We count the number of layers, and allocate space for them in -an array. We then walk the tree reading details of those layers -in. If we hit a problem that causes a repair while reading the -information, the number of layers can magically increase. In -the existing code we run off the end of the array. - -In the new code we watch for hitting the end of the array and -realloc as required. ---- - source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++------- - 1 file changed, 25 insertions(+), 7 deletions(-) - -diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c -index 177f0c947..b8e9d7cad 100644 ---- a/source/pdf/pdf-layer.c -+++ b/source/pdf/pdf-layer.c -@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj) - } - - static pdf_ocg_ui * --populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked) -+get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill) -+{ -+ if (fill == desc->num_ui_entries) -+ { -+ /* Number of layers changed while parsing; -+ * probably due to a repair. */ -+ int newsize = desc->num_ui_entries * 2; -+ if (newsize == 0) -+ newsize = 4; /* Arbitrary non-zero */ -+ desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui); -+ desc->num_ui_entries = newsize; -+ } -+ return &desc->ui[fill]; -+} -+ -+static int -+populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked) - { - int len = pdf_array_len(ctx, order); - int i, j; -+ pdf_ocg_ui *ui; - - for (i = 0; i < len; i++) - { -@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * - continue; - - fz_try(ctx) -- ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked); -+ fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked); - fz_always(ctx) - pdf_unmark_obj(ctx, o); - fz_catch(ctx) -@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * - - continue; - } -- ui->depth = depth; - if (pdf_is_string(ctx, o)) - { -+ ui = get_ocg_ui(ctx, desc, fill++); -+ ui->depth = depth; - ui->ocg = -1; - ui->name = pdf_to_str_buf(ctx, o); - ui->button_flags = PDF_LAYER_UI_LABEL; - ui->locked = 1; -- ui++; - continue; - } - -@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj * - } - if (j == desc->len) - continue; /* OCG not found in main list! Just ignore it */ -+ ui = get_ocg_ui(ctx, desc, fill++); -+ ui->depth = depth; - ui->ocg = j; - ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL); - ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX; - ui->locked = pdf_array_contains(ctx, o, locked); -- ui++; - } -- return ui; -+ return fill; - } - - static void -@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc - desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui"); - fz_try(ctx) - { -- (void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked); -+ desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked); - } - fz_catch(ctx) - { diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c deleted file mode 100644 index d19f0593a119..000000000000 --- a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c +++ /dev/null @@ -1,41 +0,0 @@ -From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001 -From: Robin Watts <Robin.Watts@artifex.com> -Date: Thu, 8 Oct 2020 18:10:28 +0100 -Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value. - ---- - source/fitz/pixmap.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c -index 66873d214..80d8bb62f 100644 ---- a/source/fitz/pixmap.c -+++ b/source/fitz/pixmap.c -@@ -555,7 +555,8 @@ void - fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) - { - unsigned char *s; -- int w, h, n, stride, len; -+ int w, h, n; -+ ptrdiff_t stride, len; - int alpha = pix->alpha; - - w = pix->w; -@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) - - n = pix->n; - stride = pix->stride; -- len = w * n; -+ len = (ptrdiff_t)w * n; - - s = pix->samples; - if (value == 255 || !alpha) -@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value) - } - while (h--) - { -- memset(s, value, (unsigned int)len); -+ memset(s, value, len); - s += stride; - } - } diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch index 32ee7e57c493..b266655aaeca 100644 --- a/app-text/mupdf/files/mupdf-1.18-Makefile.patch +++ b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index b0fb617..528e117 100644 +index 7fa74b3..e842374 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ @@ -10,16 +10,20 @@ index b0fb617..528e117 100644 + build := debug endif - ifndef OUT -@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO) - - $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ) + default: all +@@ -252,17 +252,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) else -MUPDF_LIB = $(OUT)/libmupdf.a ++MUPDF_LIB = libmupdf.so.$(GENTOO_PV) + LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) -THIRD_LIB = $(OUT)/libmupdf-third.a -+MUPDF_LIB = libmupdf.so.$(GENTOO_PV) -+MUPDF_STATIC = $(OUT)/libmupdf.a +THIRD_LIB = ++MUPDF_STATIC = $(OUT)/libmupdf.a + ifneq ($(USE_SYSTEM_GLUT),yes) + THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a + endif THREAD_LIB = $(OUT)/libmupdf-threads.a PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a @@ -28,15 +32,6 @@ index b0fb617..528e117 100644 +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) + $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS) +$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ) + $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ) $(THREAD_LIB) : $(THREAD_OBJ) $(PKCS7_LIB) : $(PKCS7_OBJ) - endif -@@ -374,7 +376,7 @@ install: libs apps - - install -d $(DESTDIR)$(docdir) - install -d $(DESTDIR)$(docdir)/examples -- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir) -+ install -m 644 README CHANGES $(DESTDIR)$(docdir) - install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir) - install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples - diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch index 0576033a03a2..643b6d2c8b1e 100644 --- a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch +++ b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch @@ -4,9 +4,9 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- --- 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 $@ $< + @@ -22,12 +22,12 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- +PKG_CONFIG ?= pkg-config +CC_FOR_BUILD ?= $(CC) + - ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),) - # clang does not support these in combination with -fembed-bitcode - CFLAGS += -ffunction-sections -fdata-sections -@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS) - else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS) + endif + endif - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) @@ -79,18 +79,18 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- + SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) endif -- HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes) -+ HAVE_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes) - ifeq ($(HAVE_LEPTONICA),yes) +- 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_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes) -+ HAVE_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract-ocr >= 4.0.0' && echo yes) - ifeq ($(HAVE_TESSERACT),yes) +- 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) @@ -107,7 +107,9 @@ https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use- endif HAVE_GLUT := yes -@@ -183,14 +183,14 @@ else ifeq ($(OS),Linux) +@@ -209,16 +212,16 @@ endif + SYS_GLUT_LIBS := -lglut -lGL + endif HAVE_X11 := not-unless-portage-tells-me ifeq ($(HAVE_X11),yes) diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch index cdd8ccf0f40d..a81c7a008e44 100644 --- a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch +++ b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch @@ -1,6 +1,6 @@ --- a/Makerules +++ b/Makerules -@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW) +@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW) else ifeq ($(OS),MACOS) HAVE_GLUT := yes SYS_GLUT_CFLAGS := -Wno-deprecated-declarations @@ -15,22 +15,20 @@ + LD ?= xcrun ld + RANLIB ?= xcrun ranlib - else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes ---- a/Makerules -+++ b/Makerules -@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS) - AR ?= xcrun ar - 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) + endif + endif - -else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes +endif - ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2) -@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux) + 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) PTHREAD_LIBS := -lpthread endif diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch new file mode 100644 index 000000000000..4d449a2fec15 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch @@ -0,0 +1,33 @@ +--- /dev/null ++++ ./platform/debian/mupdf.desktop +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++Name=MuPDF ++GenericName=PDF file viewer ++Exec=mupdf %f ++TryExec=mupdf ++Icon=new-mupdf-icon ++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} diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch new file mode 100644 index 000000000000..4f51f72deb1e --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/859847 + +From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 26 Jul 2022 15:47:02 -0400 +Subject: [PATCH] Fix aliasing violation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Noticed when compiling with link-time optimizations. + +include/GL/freeglut_std.h:240:18: error: type of `glutBitmapHelvetica18` does not match original declaration [-Werror=lto-type-mismatch] + 240 | extern void* glutBitmapHelvetica18; + | ^ +src/x11/fg_glutfont_definitions_x11.c:103:27: note: `glutBitmapHelvetica18` was previously declared here + 103 | struct freeglutBitmapFont glutBitmapHelvetica18 ; + | ^ +src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless `-fno-strict-aliasing` is used +--- + src/x11/fg_glutfont_definitions_x11.c | 29 ++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +--- a/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c ++++ b/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c +@@ -91,14 +91,25 @@ struct freeglutBitmapFont + }; + + +-struct freeglutStrokeFont glutStrokeRoman ; +-struct freeglutStrokeFont glutStrokeMonoRoman ; ++static struct freeglutStrokeFont glutStrokeRoman_ ; ++static struct freeglutStrokeFont glutStrokeMonoRoman_ ; + +-struct freeglutBitmapFont glutBitmap9By15 ; +-struct freeglutBitmapFont glutBitmap8By13 ; +-struct freeglutBitmapFont glutBitmapTimesRoman10 ; +-struct freeglutBitmapFont glutBitmapTimesRoman24 ; +-struct freeglutBitmapFont glutBitmapHelvetica10 ; +-struct freeglutBitmapFont glutBitmapHelvetica12 ; +-struct freeglutBitmapFont glutBitmapHelvetica18 ; ++static struct freeglutBitmapFont glutBitmap9By15_ ; ++static struct freeglutBitmapFont glutBitmap8By13_ ; ++static struct freeglutBitmapFont glutBitmapTimesRoman10_ ; ++static struct freeglutBitmapFont glutBitmapTimesRoman24_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica10_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica12_ ; ++static struct freeglutBitmapFont glutBitmapHelvetica18_ ; + ++ ++void *glutStrokeRoman = &glutStrokeRoman_ ; ++void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ; ++ ++void *glutBitmap9By15 = &glutBitmap9By15_ ; ++void *glutBitmap8By13 = &glutBitmap8By13_ ; ++void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ; ++void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ; ++void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ; ++void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ; ++void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ; +-- +2.35.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 new file mode 100644 index 000000000000..9f2b9d692f4e --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch @@ -0,0 +1,18 @@ +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.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch new file mode 100644 index 000000000000..02fa3bfdd45c --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch @@ -0,0 +1,120 @@ +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/Makerules ++++ b/Makerules +@@ -9,6 +9,9 @@ ifeq ($(OS),) + OS := $(OS:Darwin=MACOS) + endif + ++PKG_CONFIG ?= pkg-config ++CC_FOR_BUILD ?= $(CC) ++ + WARNING_CFLAGS := -Wall -Wsign-compare + + # Feature configuration options +@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux) + LDFLAGS += -sTOTAL_MEMORY=48MB + 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_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 +@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux) + SYS_GLUT_LIBS := -lglut -lGL + endif + + 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) ++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext) ++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext) + endif + + 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) ++ 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.23.3-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch new file mode 100644 index 000000000000..c151d81f175d --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch @@ -0,0 +1,45 @@ +--- a/Makerules ++++ b/Makerules +@@ -161,11 +161,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.") +@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS) + endif + endif + +-else ifeq ($(OS),Linux) +- 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) +@@ -263,8 +255,6 @@ else ifeq ($(OS),Linux) + PTHREAD_LIBS := -lpthread + endif + +-endif +- + # The following section has various cross compilation configurations. + # + # Invoke these as: diff --git a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch new file mode 100644 index 000000000000..b91bd9ad12e3 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch @@ -0,0 +1,19 @@ +--- a/Makerules ++++ b/Makerules +@@ -243,14 +243,14 @@ else ifeq ($(OS),Linux) + SYS_GLUT_LIBS := -lglut -lGL + 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 641cbd3703e7..c0d61774dbcf 100644 --- a/app-text/mupdf/metadata.xml +++ b/app-text/mupdf/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sam@gentoo.org</email> - <name>Sam James</name> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="drm">Enable support for Digital rights management (DRM)</flag> + </use> </pkgmetadata> diff --git a/app-text/mupdf/mupdf-1.22.0-r1.ebuild b/app-text/mupdf/mupdf-1.22.0-r1.ebuild new file mode 100644 index 000000000000..fc8bbe571872 --- /dev/null +++ b/app-text/mupdf/mupdf-1.22.0-r1.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2024 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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="+drm +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.21.0-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 + "${FILESDIR}"/${PN}-1.21.1-no-drm.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch +) + +src_prepare() { + default + + 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" \ + -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.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.23.3-r1.ebuild index 66511fc715fd..7c7e19d9e75c 100644 --- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild +++ b/app-text/mupdf/mupdf-1.23.3-r1.ebuild @@ -1,18 +1,21 @@ -# 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 + +# 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" +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" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+javascript opengl ssl X" REQUIRED_USE="opengl? ( javascript )" @@ -20,41 +23,43 @@ REQUIRED_USE="opengl? ( javascript )" # 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= + dev-libs/gumbo:= + media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= - virtual/jpeg - javascript? ( >=dev-lang/mujs-1.0.7:= ) + >=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}" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.15-CFLAGS.patch - "${FILESDIR}"/${PN}-1.18-Makefile.patch - "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch - "${FILESDIR}"/${PN}-1.18.0-darwin.patch + "${FILESDIR}"/${PN}-1.19.0-Makefile.patch + "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.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.18.0-cross-fixes.patch - # Additional security patches post-1.18.0 - "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c - "${FILESDIR}"/${P}-fix-oob-in-pixmap.c - "${FILESDIR}"/${P}-CVE-2021-3407.patch + "${FILESDIR}"/${P}-cross-fixes.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch ) src_prepare() { - xdg_src_prepare + default use hppa && append-cflags -ffunction-sections @@ -67,7 +72,12 @@ src_prepare() { -e "1iAR = $(tc-getAR)" \ -e "1iverbose = yes" \ -e "1ibuild = debug" \ - -i Makerules || die + -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() { @@ -120,16 +130,16 @@ src_compile() { src_install() { if use opengl || use X ; then domenu platform/debian/${PN}.desktop - doicon platform/debian/${PN}.xpm + doicon -s scalable docs/logo/new-${PN}-icon.svg else - rm docs/man/${PN}.1 || die + 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 + -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()" _emake install @@ -144,7 +154,8 @@ src_install() { fi # Respect libdir (bug #734898) - sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die + 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 diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild new file mode 100644 index 000000000000..d27ecf8911d4 --- /dev/null +++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2024 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 ~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:= + 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} + 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.23.3-darwin.patch + # See bugs #662352 + "${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch + # General cross fixes from Debian (refreshed) + "${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch + "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.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.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" +} + +_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 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 + + dodoc README CHANGES CONTRIBUTORS +} diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest index eecadde98eb5..d54eb82d5a6e 100644 --- a/app-text/mythes/Manifest +++ b/app-text/mythes/Manifest @@ -1 +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 da748d27b525..000000000000 --- a/app-text/mythes/mythes-1.2.4-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 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 ~ppc ~ppc64 ~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 new file mode 100644 index 000000000000..1d2f70215835 --- /dev/null +++ b/app-text/mythes/mythes-1.2.5.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Simple thesaurus for LibreOffice" +HOMEPAGE="https://github.com/hunspell/mythes" +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" +IUSE="debug" + +RDEPEND="app-text/hunspell:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + econf \ + --disable-werror \ + $(use_enable debug) +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest index 8629ab62e8e8..a234f0388999 100644 --- a/app-text/namazu/Manifest +++ b/app-text/namazu/Manifest @@ -1,2 +1,2 @@ DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6 -DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989 +DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0 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-emacs-27.patch b/app-text/namazu/files/namazu-emacs-27.patch new file mode 100644 index 000000000000..cb9dd4de9590 --- /dev/null +++ b/app-text/namazu/files/namazu-emacs-27.patch @@ -0,0 +1,14 @@ +--- a/lisp/namazu.el ++++ b/lisp/namazu.el +@@ -99,9 +99,9 @@ + (defmacro defgroup (&rest args) + nil) + (defmacro defcustom (var value doc &rest args) +- (` (defvar (, var) (, value) (, doc)))) ++ `(defvar (, var) (, value) (, doc))) + (defmacro defface (var value doc &rest args) +- (` (make-face (, var)))) ++ `(make-face (, var))) + (defmacro define-widget (&rest args) + nil))) + 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 5d0b4d0d14e3..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-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools elisp-common @@ -9,7 +9,7 @@ DESCRIPTION="Namazu is a full-text search engine" HOMEPAGE="http://www.namazu.org/" SRC_URI="http://www.namazu.org/stable/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="emacs l10n_ja nls static-libs tk" @@ -30,21 +30,25 @@ RDEPEND="dev-perl/File-MMagic dev-lang/tk:0 www-client/lynx )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +DEPEND="${RDEPEND}" +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 ) src_prepare() { default - mv configure.{in,ac} - mv tk${PN}/configure.{in,ac} + mv configure.{in,ac} || die + mv tk${PN}/configure.{in,ac} || die eautoreconf } @@ -64,7 +68,7 @@ src_configure() { } src_compile() { - emake + default if use emacs; then cd lisp @@ -73,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_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild index 8517c8554367..d902b8bc9dbe 100644 --- a/app-text/namazu/namazu-2.0.22_pre7.ebuild +++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools elisp-common @@ -11,7 +11,7 @@ DESCRIPTION="Namazu is a full-text search engine" HOMEPAGE="http://www.namazu.org/" SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="" IUSE="emacs l10n_ja nls static-libs tk" @@ -32,17 +32,22 @@ RDEPEND="dev-perl/File-MMagic dev-lang/tk:0 www-client/lynx )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +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 - mv configure.{in,ac} - mv tk${PN}/configure.{in,ac} + mv configure.{in,ac} || die + mv tk${PN}/configure.{in,ac} || die eautoreconf } @@ -62,7 +67,7 @@ src_configure() { } src_compile() { - emake + default if use emacs; then cd lisp @@ -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/nfoview/Manifest b/app-text/nfoview/Manifest index e7f92bafe55d..358784e45e64 100644 --- a/app-text/nfoview/Manifest +++ b/app-text/nfoview/Manifest @@ -1,2 +1 @@ -DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2 -DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3 +DIST nfoview-1.28.1.tar.gz 62571 BLAKE2B 5ecfd83e9429f3d616d9b633a5f3042308df06253065946ea13c66f71dd937a2325f252e04812894d000fea3364337378c4d91b2c54ee530c9d225ce7752dc90 SHA512 55179791b1a8058777a8a8527758687ab5924e00086d1c85a95759d85eb65ec46f072ba5bd5521629f39737437002eb6cf4070bc25b0e9246c511c32c6b08e99 diff --git a/app-text/nfoview/nfoview-1.27.1.ebuild b/app-text/nfoview/nfoview-1.27.1.ebuild deleted file mode 100644 index 446109f53d49..000000000000 --- a/app-text/nfoview/nfoview-1.27.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 xdg-utils - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git" - inherit git-r3 -else - SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage" -HOMEPAGE="https://otsaloma.io/nfoview/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - sys-devel/gettext" -DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - media-fonts/terminus-font" - -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/nfoview/nfoview-1.28-r1.ebuild b/app-text/nfoview/nfoview-1.28.1-r1.ebuild index eccd3ea00f3e..015d8780b5e0 100644 --- a/app-text/nfoview/nfoview-1.28-r1.ebuild +++ b/app-text/nfoview/nfoview-1.28.1-r1.ebuild @@ -1,10 +1,10 @@ -# 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 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 virtualx xdg @@ -29,12 +29,13 @@ RDEPEND="${DEPEND} media-fonts/cascadia-code x11-libs/gtk+:3[introspection]" +EPYTEST_DESELECT=( + "nfoview/test/test_util.py::TestModule::test_show_uri__unix" + "nfoview/test/test_util.py::TestModule::test_show_uri__windows" +) + distutils_enable_tests pytest -python_test() { - local deselect=( - --deselect 'nfoview/test/test_util.py::TestModule::test_show_uri__unix' - --deselect 'nfoview/test/test_util.py::TestModule::test_show_uri__windows' - ) - virtx epytest "${deselect[@]}" +src_test() { + virtx distutils-r1_src_test } diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild deleted file mode 100644 index c619ae9688c5..000000000000 --- a/app-text/nfoview/nfoview-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 xdg - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git" - inherit git-r3 -else - SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage" -HOMEPAGE="https://otsaloma.io/nfoview/" - -LICENSE="GPL-3+" -SLOT="0" - -BDEPEND="${PYTHON_DEPS} - sys-devel/gettext" -DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - media-fonts/cascadia-code" diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest index a3212369e1b7..71de41a24016 100644 --- a/app-text/nuspell/Manifest +++ b/app-text/nuspell/Manifest @@ -1,6 +1,2 @@ -DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b54ece92ac1589c418aab46c925419e9e1bc7e257a8320e24399f49bb867600679e34a5e40070b01a660578c92c SHA512 ed5206cb9ffa7e4ec6843988a75627d4ae7d5170444b6e7bd3496c1bf61c25412c4e68864800f2ad238d014b4e50d25282f367de2900f8a230f3ecc9ae5772be -DIST nuspell-4.0.0.tar.gz 379136 BLAKE2B 90aebe8318cd28240dfb7c1b034b2c045ac208c6d25344a3f2fc2f1a38995a1d6f81e70399c644c70255fbbb30f61e340808d1a71dfccab1726f89b742cf7b65 SHA512 2b08e30c4ac91a243c74f21eaf4a8d55d8b1c834e0f293fea76a9f02660f2ee89fe4d4071b1b9ed97b8c1db80b0645c71f8746738d97fc3ae779a65dc1583d3b -DIST nuspell-4.0.1.tar.gz 379342 BLAKE2B be52797ddd737c523a6141fc1c2683690cfcd1aa09e6548d7eed593ab023d2b45d3538f2a9964a7c2b4abc6506c67058cdc2479ec12ae5438ffe9faa00f0680c SHA512 122616fd24c2de35000ba12d680d3617e7fe97881d33febbcb106ce70d3bac356a00d90680a1bc8ee631ed532ace0f4b4f9fce4760a25b0f7fc1d60553e74528 -DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e66532150614dd3463eda95ab421094e6c0485396b7ef1dd4b7fc03cadf10316d9cfdb1390b2769ddcc963d8b3 SHA512 d0c01dd73fefd8b9c800e6419fe916e55a53b8b19f5848d3766cdcb50383fdcd9e9bb49362b5cea4d9d2d7fda21aed055f28cb47b006e2049b2a904355f7f9ed -DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d -DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5 +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/metadata.xml b/app-text/nuspell/metadata.xml index 5e487ead4f56..11557a865054 100644 --- a/app-text/nuspell/metadata.xml +++ b/app-text/nuspell/metadata.xml @@ -11,4 +11,7 @@ Nuspell is a pure C++ re-implementation of <pkg>app-text/hunspell</pkg>. </longdescription> + <upstream> + <remote-id type="github">nuspell/nuspell</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2.ebuild deleted file mode 100644 index 57cbf24e8c75..000000000000 --- a/app-text/nuspell/nuspell-3.1.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/3" # due to libnuspell.so.3 -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-text/ronn ) - test? ( >=dev-cpp/catch-2.3.0:0 ) - >=dev-libs/boost-1.62[icu,nls]" - -DOCS=( CHANGELOG.md ) - -RESTRICT="!test? ( test )" - -src_prepare() { - rm -R external/Catch2/ || die - 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/nuspell/nuspell-4.0.0.ebuild b/app-text/nuspell/nuspell-4.0.0.ebuild deleted file mode 100644 index b7de7c6dd8c8..000000000000 --- a/app-text/nuspell/nuspell-4.0.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/4" # due to libnuspell.so.4 -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-text/ronn ) - test? ( >=dev-cpp/catch-2.3.0:0 ) - >=dev-libs/boost-1.62[icu,nls]" - -DOCS=( CHANGELOG.md ) - -RESTRICT="!test? ( test )" - -src_prepare() { - rm -R external/Catch2/ || die - 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/nuspell/nuspell-4.0.1.ebuild b/app-text/nuspell/nuspell-4.0.1.ebuild deleted file mode 100644 index f38131dbab56..000000000000 --- a/app-text/nuspell/nuspell-4.0.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/4" # due to libnuspell.so.4 -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-text/pandoc ) - test? ( >=dev-cpp/catch-2.3.0:0 ) - >=dev-libs/boost-1.62[icu,nls]" - -DOCS=( CHANGELOG.md ) - -RESTRICT="!test? ( test )" - -src_prepare() { - rm -R external/Catch2/ || die - 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/nuspell/nuspell-4.1.0.ebuild b/app-text/nuspell/nuspell-4.1.0.ebuild deleted file mode 100644 index f38131dbab56..000000000000 --- a/app-text/nuspell/nuspell-4.1.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/4" # due to libnuspell.so.4 -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-text/pandoc ) - test? ( >=dev-cpp/catch-2.3.0:0 ) - >=dev-libs/boost-1.62[icu,nls]" - -DOCS=( CHANGELOG.md ) - -RESTRICT="!test? ( test )" - -src_prepare() { - rm -R external/Catch2/ || die - 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/nuspell/nuspell-5.0.0.ebuild b/app-text/nuspell/nuspell-5.1.3.ebuild index f23bbc3b51bf..18d0806fde8f 100644 --- a/app-text/nuspell/nuspell-5.0.0.ebuild +++ b/app-text/nuspell/nuspell-5.1.3.ebuild @@ -1,7 +1,7 @@ -# 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 @@ -11,13 +11,13 @@ 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 ~x86" +KEYWORDS="amd64 ~loong ~riscv x86" IUSE="doc test" -RDEPEND=">=dev-libs/icu-59" +RDEPEND=">=dev-libs/icu-60" DEPEND="${RDEPEND} - doc? ( app-text/pandoc ) - test? ( >=dev-cpp/catch-2.3.0:0 ) + doc? ( virtual/pandoc ) + test? ( <dev-cpp/catch-3:0 ) " DOCS=( CHANGELOG.md ) @@ -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-4.2.0.ebuild b/app-text/nuspell/nuspell-5.1.4.ebuild index fa0c2f915189..d0791bda1ad5 100644 --- a/app-text/nuspell/nuspell-4.2.0.ebuild +++ b/app-text/nuspell/nuspell-5.1.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -10,14 +10,14 @@ 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/4" # due to libnuspell.so.4 -KEYWORDS="~amd64 ~x86" +SLOT="0/5" # due to libnuspell.so.5 +KEYWORDS="~amd64 ~loong ~riscv ~x86" IUSE="doc test" -RDEPEND="dev-libs/icu" +RDEPEND=">=dev-libs/icu-60" DEPEND="${RDEPEND} - doc? ( app-text/pandoc ) - test? ( >=dev-cpp/catch-2.3.0:0 ) + doc? ( virtual/pandoc ) + test? ( >=dev-cpp/catch-3.1.1:0 ) " DOCS=( CHANGELOG.md ) @@ -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/ocrad/Manifest b/app-text/ocrad/Manifest index 86555c36086f..e2db2e2b29da 100644 --- a/app-text/ocrad/Manifest +++ b/app-text/ocrad/Manifest @@ -1,2 +1 @@ -DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml index 553d68b0ca07..1e689d2596fc 100644 --- a/app-text/ocrad/metadata.xml +++ b/app-text/ocrad/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>tex@gentoo.org</email> - <name>Gentoo TeX Project</name> -</maintainer> -<longdescription>GNU Ocrad is an OCR (Optical Character Recognition) + <!-- maintainer-needed --> + <longdescription>GNU Ocrad is an OCR (Optical Character Recognition) program impleme nted as a filter and based on a feature extraction method. It reads a bitmap ima ge in pbm format and outputs text in ISO-8859-1 (Latin-1) charset.</longdescription> + <upstream> + <remote-id type="savannah-nongnu">ocrad</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild deleted file mode 100644 index 8a51b1c52434..000000000000 --- a/app-text/ocrad/ocrad-0.26.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit unpacker toolchain-funcs - -DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program" -HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86" - -DEPEND="$(unpacker_src_uri_depends)" - -DOCS="AUTHORS ChangeLog NEWS README" - -src_configure() { - # ./configure is not based on autotools - ./configure \ - CPPFLAGS="${CPPFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - --prefix=/usr || die -} - -src_install() { - default - doman doc/${PN}.1 - doinfo doc/${PN}.info -} diff --git a/app-text/ocrad/ocrad-0.27.ebuild b/app-text/ocrad/ocrad-0.27.ebuild index d7001dd7c77e..be1acd75228b 100644 --- a/app-text/ocrad/ocrad-0.27.ebuild +++ b/app-text/ocrad/ocrad-0.27.ebuild @@ -13,9 +13,9 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86" -DEPEND="$(unpacker_src_uri_depends)" +BDEPEND="$(unpacker_src_uri_depends)" -DOCS="AUTHORS ChangeLog NEWS README" +DOCS=( AUTHORS ChangeLog NEWS README ) src_configure() { # ./configure is not based on autotools @@ -27,8 +27,13 @@ src_configure() { --prefix=/usr || die } +src_compile() { + emake AR="$(tc-getAR)" +} + src_install() { default + doman doc/${PN}.1 doinfo doc/${PN}.info } diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch deleted file mode 100644 index 05957269888e..000000000000 --- a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile ---- odt2txt-0.4/Makefile 2008-06-23 23:32:28 +0400 -+++ odt2txt-0.4/Makefile 2010-05-24 15:39:16 +0400 -@@ -56,6 +56,9 @@ - CFLAGS += -I$(ZLIB_DIR) - LIBS = $(ZLIB_DIR)/libz.a - endif -+ifeq ($(UNAME_S),Darwin) -+ LIBS += -liconv -+endif - ifeq ($(UNAME_O),Cygwin) - CFLAGS += -DICONV_CHAR="const char" - LIBS += -liconv - diff --git a/app-text/odt2txt/files/odt2txt-0.5-makefile.patch b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch new file mode 100644 index 000000000000..b87814f3ff58 --- /dev/null +++ b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch @@ -0,0 +1,116 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,28 +2,22 @@ + UNAME_S := $(shell uname -s 2>/dev/null || echo unknown) + UNAME_O := $(shell uname -o 2>/dev/null || echo unknown) + +-ifdef DEBUG +-CFLAGS = -O0 -g -Wextra -DMEMDEBUG -DSTRBUF_CHECK +-#LDFLAGS = -lefence +-LDFLAGS += -g +-else +-CFLAGS = -O2 +-endif +- + ifdef NO_ICONV +-CFLAGS += -DNO_ICONV ++CPPFLAGS += -DNO_ICONV + endif + +-LIBS = -lz ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib) ++LDLIBS += $(shell $(PKG_CONFIG) --libs zlib) ++ + ZIP_OBJS = + ifdef HAVE_LIBZIP +- CFLAGS += -DHAVE_LIBZIP +- LIBS += -lzip ++ CPPFLAGS += -DHAVE_LIBZIP ++ LDLIBS += -lzip + else + ZIP_OBJS = kunzip/fileio.o kunzip/zipfile.o + endif + +-OBJ = odt2txt.o regex.o mem.o strbuf.o $(ZIP_OBJS) ++OBJ = regex.o mem.o strbuf.o $(ZIP_OBJS) + TEST_OBJ = t/test-strbuf.o t/test-regex.o + ALL_OBJ = $(OBJ) $(TEST_OBJ) + +@@ -37,50 +31,44 @@ + MAN1DIR = $(MANDIR)/man1 + + ifeq ($(UNAME_S),FreeBSD) +- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include ++ CPPFLAGS += -DICONV_CHAR="const char" + LDFLAGS += -L/usr/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),OpenBSD) +- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include ++ CPPFLAGS += -DICONV_CHAR="const char" + LDFLAGS += -L/usr/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),Darwin) +- CFLAGS += -I/opt/local/include +- LDFLAGS += -L/opt/local/lib +- LIBS += -liconv ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_S),NetBSD) +- CFLAGS += -DICONV_CHAR="const char" ++ CPPFLAGS += -DICONV_CHAR="const char" + endif + ifeq ($(UNAME_S),SunOS) +- ifeq ($(CC),cc) +- ifdef DEBUG +- CFLAGS = -v -g -DMEMDEBUG -DSTRBUF_CHECK +- else +- CFLAGS = -xO3 +- endif +- endif +- CFLAGS += -DICONV_CHAR="const char" ++ CPPFLAGS += -DICONV_CHAR="const char" + endif + ifeq ($(UNAME_S),HP-UX) +- CFLAGS += -I$(ZLIB_DIR) +- LIBS = $(ZLIB_DIR)/libz.a ++ CPPFLAGS += -I$(ZLIB_DIR) ++ LDLIBS += $(ZLIB_DIR)/libz.a ++endif ++ifeq ($(UNAME_S),Darwin) ++ LDLIBS += -liconv + endif + ifeq ($(UNAME_O),Cygwin) +- CFLAGS += -DICONV_CHAR="const char" +- LIBS += -liconv ++ CPPFLAGS += -DICONV_CHAR="const char" ++ LDLIBS += -liconv + EXT = .exe + endif + ifneq ($(MINGW32),) +- CFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR) +- LIBS = $(REGEX_DIR)/regex.o ++ CPPFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR) ++ LDLIBS += $(REGEX_DIR)/regex.o + ifdef STATIC +- LIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o) +- LIBS += $(ZLIB_DIR)/zlib.a ++ LDLIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o) ++ LDLIBS += $(ZLIB_DIR)/zlib.a + else +- LIBS += -liconv ++ LDLIBS += -liconv + endif + EXT = .exe + endif +@@ -89,7 +77,6 @@ + MAN = odt2txt.1 + + $(BIN): $(OBJ) +- $(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) + + t/test-strbuf: t/test-strbuf.o strbuf.o mem.o + t/test-regex: t/test-regex.o regex.o strbuf.o mem.o diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml index 85e4ed814fa2..364718ef994b 100644 --- a/app-text/odt2txt/metadata.xml +++ b/app-text/odt2txt/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">dstosberg/odt2txt</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5-r1.ebuild index e736a365e9a1..70a3b4a55b3e 100644 --- a/app-text/odt2txt/odt2txt-0.5.ebuild +++ b/app-text/odt2txt/odt2txt-0.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,23 +12,21 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc64 ~sparc x86" -IUSE="" RDEPEND=" !app-office/unoconv sys-libs/zlib - virtual/libiconv -" -DEPEND="${RDEPEND} - sys-apps/groff -" -PATCHES="${FILESDIR}/${P}-darwin_iconv.patch" - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND="sys-apps/groff" + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_configure() { + tc-export CC PKG_CONFIG } src_install() { - emake install DESTDIR="${D}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr doman odt2txt.1 } diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild index caab0f225c9e..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-2021 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 ~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 d1a4c5128f4f..8a0714583212 100644 --- a/app-text/openpaperwork-core/Manifest +++ b/app-text/openpaperwork-core/Manifest @@ -1,2 +1,2 @@ -DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00 -DIST openpaperwork-core-2.0.3.tar.gz 82231 BLAKE2B d113324f5f0f03d0a7c1c9f28bc4bdfa8dc296104f4f7aef4f172ba9ff94bc02caad928aa3db0f314df64935052b6dc4995b8d6e78e2c33367b080321414f40d SHA512 613e1b07b0ef4be3a429cc88f1fed41d1d79adab0cad70ee4e1d74c06cb8917c7fc6f8d2ffca5fcc95f97fb5c0690cdc21aa5cf7966e19cfb5ae5d2ab0fec6f3 +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/metadata.xml b/app-text/openpaperwork-core/metadata.xml index 3bbef27953e2..db57600aee06 100644 --- a/app-text/openpaperwork-core/metadata.xml +++ b/app-text/openpaperwork-core/metadata.xml @@ -6,6 +6,7 @@ <name>Bernard Cafarelli</name> </maintainer> <upstream> + <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id> <remote-id type="pypi">openpaperwork-core</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild deleted file mode 100644 index eea70cb44815..000000000000 --- a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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.0.3.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild deleted file mode 100644 index eea70cb44815..000000000000 --- a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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.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 66264cb1a603..8a0714583212 100644 --- a/app-text/openpaperwork-gtk/Manifest +++ b/app-text/openpaperwork-gtk/Manifest @@ -1,2 +1,2 @@ -DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7 -DIST openpaperwork-gtk-2.0.3.tar.gz 50590 BLAKE2B 69fd8b9b6b964a375e511dd7ef535a8fea58e6183165a4b7b96239a6a35486f791ca9fc8aced7a5b84cc21cc1ccab12c114276de87e1d1cf55b2565dc44da7fc SHA512 8da5651b7d949dfb4fa32ef84760530bba6d718674e6616ae80d1a274ae51cf5e28a55f7e08fc34e4681f61de8aef9d2094f2c4aa4862f8989b7c81da47e48c8 +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/metadata.xml b/app-text/openpaperwork-gtk/metadata.xml index 4b3eaa67df5d..5c14ec49f701 100644 --- a/app-text/openpaperwork-gtk/metadata.xml +++ b/app-text/openpaperwork-gtk/metadata.xml @@ -6,6 +6,7 @@ <name>Bernard Cafarelli</name> </maintainer> <upstream> + <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id> <remote-id type="pypi">openpaperwork-gtk</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild deleted file mode 100644 index 5bf52d2c9f69..000000000000 --- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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}] - x11-libs/gtk+:3[introspection]" -DEPEND="${RDEPEND}" diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild deleted file mode 100644 index 5bf52d2c9f69..000000000000 --- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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}] - x11-libs/gtk+:3[introspection]" -DEPEND="${RDEPEND}" diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild new file mode 100644 index 000000000000..d3f68f150bd4 --- /dev/null +++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild @@ -0,0 +1,38 @@ +# 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="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" + +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" + +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/files/opensp-1.5-gcc34.patch b/app-text/opensp/files/opensp-1.5-gcc34.patch deleted file mode 100644 index 60ee56085315..000000000000 --- a/app-text/opensp/files/opensp-1.5-gcc34.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/RangeMap.h~ 2004-04-22 20:34:13.729541096 +0300 -+++ include/RangeMap.h 2004-04-22 20:31:48.473049702 +0300 -@@ -8,6 +8,7 @@ - #include "Boolean.h" - #include "ISet.h" - #include "types.h" -+#include "constant.h" - #include <stddef.h> - - #ifdef SP_NAMESPACE diff --git a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch new file mode 100644 index 000000000000..6e6832957679 --- /dev/null +++ b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch @@ -0,0 +1,198 @@ +https://bugs.gentoo.org/889600 +https://src.fedoraproject.org/rpms/opensp/blob/ad3afd1f07f600aa21cd6a3f1960db5570682e47/f/opensp-configure-c99.patch + +Avoid implicit function declarations because they have been removed +from C in 1999. Future compilers are likely to reject them by +default. + +No need to upstream this because the aclocal.m4 file is not checked +into the repository since: + +------------------------------------------------------------------------ +r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines +Changed paths: + M /trunk/sp/Makefile.in + D /trunk/sp/config/aclocal.m4 + D /trunk/sp/config/configure.in + M /trunk/sp/configure + A /trunk/sp/configure.in + +Install headers in $(includedir)/OpenSP, move configure.in to toplevel, +remove generated file aclocal.m4. + +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -833,10 +833,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -850,7 +846,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + }] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +--- a/configure ++++ b/configure +@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include <stdlib.h>' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ +@@ -5186,8 +5186,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -9508,10 +9508,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -9525,7 +9521,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -9606,10 +9602,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -9623,7 +9615,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -13321,10 +13313,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -13338,7 +13326,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -13419,10 +13407,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -13436,7 +13420,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -19110,10 +19094,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -19127,7 +19107,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -19208,10 +19188,6 @@ else + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -19225,7 +19201,7 @@ int main () + /* dlclose (self); */ + } + +- exit (status); ++ return status; + } + EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +@@ -27450,8 +27426,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext + diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r10.ebuild index 97aa575d2dc3..7d8f3f3e0dd1 100644 --- a/app-text/opensp/opensp-1.5.2-r6.ebuild +++ b/app-text/opensp/opensp-1.5.2-r10.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit epatch flag-o-matic autotools +EAPI=8 -MY_P=${P/opensp/OpenSP} +inherit autotools flag-o-matic +MY_P=${P/opensp/OpenSP} DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" -HOMEPAGE="http://openjade.sourceforge.net/" -SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" +HOMEPAGE="https://openjade.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/openjade/opensp/${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="MIT" 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="doc elibc_glibc nls static-libs test" +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 )" -RDEPEND=" - elibc_glibc? ( net-libs/libnsl:0= ) -" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) +RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 @@ -31,11 +30,14 @@ DEPEND="${RDEPEND} app-text/sgml-common )" -S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-fix-segfault.patch + "${FILESDIR}"/${P}-c11-using.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-fix-segfault.patch - epatch "${FILESDIR}"/${P}-c11-using.patch + default use prefix && eautoreconf } @@ -48,6 +50,9 @@ 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 econf \ --enable-http \ diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r9.ebuild index 805de75745c2..6f499d123338 100644 --- a/app-text/opensp/opensp-1.5.2-r3.ebuild +++ b/app-text/opensp/opensp-1.5.2-r9.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit epatch flag-o-matic +EAPI=8 -MY_P=${P/opensp/OpenSP} +inherit autotools flag-o-matic +MY_P=${P/opensp/OpenSP} DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" -HOMEPAGE="http://openjade.sourceforge.net/" -SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" +HOMEPAGE="https://openjade.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/openjade/opensp/${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc nls static-libs test" RESTRICT="!test? ( test )" -DEPEND="net-libs/libnsl:0= - nls? ( sys-devel/gettext ) +RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 @@ -27,14 +29,15 @@ DEPEND="net-libs/libnsl:0= app-text/openjade app-text/sgml-common )" -RDEPEND="net-libs/libnsl:0=" -S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-fix-segfault.patch + "${FILESDIR}"/${P}-c11-using.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.5-gcc34.patch \ - "${FILESDIR}"/${P}-fix-segfault.patch + default + use prefix && eautoreconf } src_configure() { @@ -46,6 +49,9 @@ 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 econf \ --enable-http \ diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest new file mode 100644 index 000000000000..521e0e1cf6fc --- /dev/null +++ b/app-text/pandoc-bin/Manifest @@ -0,0 +1,4 @@ +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/metadata.xml b/app-text/pandoc-bin/metadata.xml new file mode 100644 index 000000000000..dd32ba2128b1 --- /dev/null +++ b/app-text/pandoc-bin/metadata.xml @@ -0,0 +1,26 @@ +<?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> + <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="pandoc-symlink"> + Install pandoc symlink that points to pandoc-bin + </flag> + </use> + <upstream> + <bugs-to>https://github.com/jgm/pandoc/issues/</bugs-to> + <remote-id type="github">jgm/pandoc</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild new file mode 100644 index 000000000000..1a9e4cefd9f7 --- /dev/null +++ b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 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} + !app-text/pandoc-cli + !dev-haskell/pandoc + ) +" + +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.2.ebuild b/app-text/pandoc-bin/pandoc-bin-3.2.ebuild new file mode 100644 index 000000000000..6c205a599708 --- /dev/null +++ b/app-text/pandoc-bin/pandoc-bin-3.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 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} + !app-text/pandoc-cli + !dev-haskell/pandoc + ) +" + +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-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/Manifest b/app-text/pandoc/Manifest index 6062b60a8056..983aabbbc381 100644 --- a/app-text/pandoc/Manifest +++ b/app-text/pandoc/Manifest @@ -1,3 +1 @@ -DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e -DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8 -DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 +DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212 diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch deleted file mode 100644 index 1a0dacce99bc..000000000000 --- a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/785268 ---- a/pandoc.cabal -+++ b/pandoc.cabal -@@ -729,7 +729,7 @@ executable trypandoc - main-is: trypandoc.hs - hs-source-dirs: trypandoc - if flag(trypandoc) -- build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24 -+ build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text - buildable: True - else - buildable: False diff --git a/app-text/pandoc/files/pandoc-2.18-tests.patch b/app-text/pandoc/files/pandoc-2.18-tests.patch new file mode 100644 index 000000000000..6cf30a7c9bc6 --- /dev/null +++ b/app-text/pandoc/files/pandoc-2.18-tests.patch @@ -0,0 +1,79 @@ +From 9aff86143e12e22cec152fd08ec8b68ee75ccafa Mon Sep 17 00:00:00 2001 +From: John MacFarlane <jgm@berkeley.edu> +Date: Tue, 31 May 2022 19:49:27 -0700 +Subject: [PATCH] Require skylighting 0.12.3.1 and update tests. + +--- + pandoc.cabal | 4 ++-- + stack.yaml | 4 ++-- + test/lhs-test.html | 4 ++-- + test/lhs-test.html+lhs | 4 ++-- + test/lhs-test.latex | 4 ++-- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/test/lhs-test.html b/test/lhs-test.html +index 754b25e1f570..85e5d785d14a 100644 +--- a/test/lhs-test.html ++++ b/test/lhs-test.html +@@ -190,7 +190,7 @@ + code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */ + code span.at { color: #7d9029; } /* Attribute */ + code span.bn { color: #40a070; } /* BaseN */ +- code span.bu { } /* BuiltIn */ ++ code span.bu { color: #008000; } /* BuiltIn */ + code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */ + code span.ch { color: #4070a0; } /* Char */ + code span.cn { color: #880000; } /* Constant */ +@@ -203,7 +203,7 @@ + code span.ex { } /* Extension */ + code span.fl { color: #40a070; } /* Float */ + code span.fu { color: #06287e; } /* Function */ +- code span.im { } /* Import */ ++ code span.im { color: #008000; font-weight: bold; } /* Import */ + code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */ + code span.kw { color: #007020; font-weight: bold; } /* Keyword */ + code span.op { color: #666666; } /* Operator */ +diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs +index 7198397d8f45..32e0baf4d7e2 100644 +--- a/test/lhs-test.html+lhs ++++ b/test/lhs-test.html+lhs +@@ -190,7 +190,7 @@ + code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */ + code span.at { color: #7d9029; } /* Attribute */ + code span.bn { color: #40a070; } /* BaseN */ +- code span.bu { } /* BuiltIn */ ++ code span.bu { color: #008000; } /* BuiltIn */ + code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */ + code span.ch { color: #4070a0; } /* Char */ + code span.cn { color: #880000; } /* Constant */ +@@ -203,7 +203,7 @@ + code span.ex { } /* Extension */ + code span.fl { color: #40a070; } /* Float */ + code span.fu { color: #06287e; } /* Function */ +- code span.im { } /* Import */ ++ code span.im { color: #008000; font-weight: bold; } /* Import */ + code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */ + code span.kw { color: #007020; font-weight: bold; } /* Keyword */ + code span.op { color: #666666; } /* Operator */ +diff --git a/test/lhs-test.latex b/test/lhs-test.latex +index 49521d3c1522..435d1dfefb07 100644 +--- a/test/lhs-test.latex ++++ b/test/lhs-test.latex +@@ -44,7 +44,7 @@ + \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}} + \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}} + \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}} +-\newcommand{\BuiltInTok}[1]{#1} ++\newcommand{\BuiltInTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{#1}} + \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}} + \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}} + \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}} +@@ -57,7 +57,7 @@ + \newcommand{\ExtensionTok}[1]{#1} + \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}} + \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}} +-\newcommand{\ImportTok}[1]{#1} ++\newcommand{\ImportTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{\textbf{#1}}} + \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}} + \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}} + \newcommand{\NormalTok}[1]{#1} diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml index 8f389f32b1ce..712e3e36eea3 100644 --- a/app-text/pandoc/metadata.xml +++ b/app-text/pandoc/metadata.xml @@ -4,19 +4,8 @@ <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="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag> <flag name="trypandoc">Build trypandoc cgi executable.</flag> </use> </pkgmetadata> diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild deleted file mode 100644 index d51982085be4..000000000000 --- a/app-text/pandoc/pandoc-2.11.3.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.7.9999 -#hackport: flags: -static - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="Conversion between markup formats" -HOMEPAGE="https://pandoc.org" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="embed-data-files optimize trypandoc" - -# test failure: error while loading shared libraries: -# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so: -# cannot open shared object file: No such file or directory -RESTRICT=test - -RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] - >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] - >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] - >=dev-haskell/base-compat-0.9:=[profile?] - >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?] - >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] - >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] - >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] - >=dev-haskell/citeproc-0.3.0.1:=[profile?] <dev-haskell/citeproc-0.4:=[profile?] - >=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] - >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] - >=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] - >=dev-haskell/connection-0.3.1:=[profile?] - >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] - >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] - >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?] - >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] - >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] - >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] - >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] - >=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] - >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?] - >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?] - >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?] - >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] - >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] - >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] - >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] - >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] - >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?] - >=dev-haskell/jira-wiki-markup-1.3.2:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?] - >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] - >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] - >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] - >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] - >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] - >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] - >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] - >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] - >=dev-haskell/skylighting-0.10.2:=[profile?] <dev-haskell/skylighting-0.11:=[profile?] - >=dev-haskell/skylighting-core-0.10.2:=[profile?] <dev-haskell/skylighting-core-0.11:=[profile?] - >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] - >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] - >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] - >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] - >=dev-haskell/texmath-0.12.0.2:=[profile?] <dev-haskell/texmath-0.13:=[profile?] - >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] - >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] - >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?] - >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] - >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] - >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] - >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] - >=dev-lang/ghc-8.0.1:= - trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] - dev-haskell/wai-extra:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2 - test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 - >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 - >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 - >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4 - >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 - >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 - >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 - >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) -" - -src_prepare() { - default - # optimisations require ~16GB of memory on ghc-8.8.3 - use optimize || HCFLAGS+=' -O0' -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag embed-data-files embed_data_files) \ - --flag=-static \ - $(cabal_flag trypandoc trypandoc) -} - -src_install() { - haskell-cabal_src_install - - doman "${S}/man/${PN}.1" -} diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild index f0ae5e9a8249..eced4d6a54ab 100644 --- a/app-text/pandoc/pandoc-2.13.ebuild +++ b/app-text/pandoc/pandoc-2.18-r2.ebuild @@ -1,10 +1,10 @@ -# 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 -# ebuild generated by hackport 0.6.7.9999 -#hackport: flags: -static +# ebuild generated by hackport 0.7.1.1.9999 +#hackport: flags: -static,-lua53 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal @@ -15,102 +15,93 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="embed-data-files optimize trypandoc" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="embed-data-files trypandoc" -# test failure: error while loading shared libraries: -# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so: -# cannot open shared object file: No such file or directory -RESTRICT=test - -RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] - >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] - >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] +RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?] + >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] + >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] - >=dev-haskell/citeproc-0.3.0.9:=[profile?] <dev-haskell/citeproc-0.3.1:=[profile?] - >=dev-haskell/commonmark-0.1.1.3:=[profile?] <dev-haskell/commonmark-0.2:=[profile?] - >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] - >=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] + >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?] + >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?] + >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?] + >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?] >=dev-haskell/connection-0.3.1:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] - >=dev-haskell/doclayout-0.3.0.1:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] - >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?] + >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?] + >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] - >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] - >=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] - >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?] - >=dev-haskell/hslua-module-path-0.1.0:=[profile?] <dev-haskell/hslua-module-path-0.2.0:=[profile?] - >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?] - >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?] - >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] - >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] + >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?] + >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?] + >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?] + >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?] + >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?] + >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] - >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?] - >=dev-haskell/jira-wiki-markup-1.3.4:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?] + >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?] + >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] - >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] + >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] - >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] - >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] + >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?] + >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?] + >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?] + >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] - >=dev-haskell/skylighting-0.10.5:=[profile?] <dev-haskell/skylighting-0.10.6:=[profile?] - >=dev-haskell/skylighting-core-0.10.5:=[profile?] <dev-haskell/skylighting-core-0.10.6:=[profile?] + >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?] + >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] - >=dev-haskell/texmath-0.12.2:=[profile?] <dev-haskell/texmath-0.12.3:=[profile?] - >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] + >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] - >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?] - >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] + >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?] + >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] - >=dev-haskell/xml-conduit-1.7:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] + >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] + >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] + >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] - >=dev-lang/ghc-8.4.3:= + >=dev-lang/ghc-8.10.1:= + >=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-2.2.0.1 + >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 - >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5 >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 - >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 + >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) " -PATCHES=("${FILESDIR}"/${P}-trypandoc.patch) - -src_prepare() { - default - # optimisations require ~16GB of memory on ghc-8.8.3 - use optimize || HCFLAGS+=' -O0' -} +PATCHES=("${FILESDIR}"/${P}-tests.patch ) src_configure() { haskell-cabal_src_configure \ $(cabal_flag embed-data-files embed_data_files) \ + --flag=-lua53 \ --flag=-static \ $(cabal_flag trypandoc trypandoc) } src_install() { haskell-cabal_src_install - doman "${S}/man/${PN}.1" } diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild deleted file mode 100644 index 878536e561c9..000000000000 --- a/app-text/pandoc/pandoc-2.9.2.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.4.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="Conversion between markup formats" -HOMEPAGE="https://pandoc.org" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="embed-data-files optimize static trypandoc" -# test failure: error while loading shared libraries: -# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so: -# cannot open shared object file: No such file or directory -RESTRICT=test - -RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] - >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] - >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] - >=dev-haskell/base-compat-0.9:=[profile?] - >=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?] - >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] - >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] - >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] - >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] - >=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?] - >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] - >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] - >=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?] - >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] - >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] - >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] - >=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] - >=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?] - >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?] - >=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?] - >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] - >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] - >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?] - >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] - >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] - >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?] - >=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?] - >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] - >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] - >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] - >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] - >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] - >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] - >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] - >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] - >=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] - >=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?] - >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] - >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] - >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] - >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] - >=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?] - >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] - >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] - >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?] - >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] - >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] - >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] - >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] - >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] - >=dev-lang/ghc-8.0.1:= - embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] ) - trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] - dev-haskell/wai-extra:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.0 - test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 - >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 - >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14 - >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3 - >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 - >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 - >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 - >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) -" - -src_prepare() { - default - # optimisations require ~16GB of memory on ghc-8.8.3 - use optimize || HCFLAGS+=' -O0' - cabal_chdeps \ - 'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7' -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag embed-data-files embed_data_files) \ - $(cabal_flag static static) \ - $(cabal_flag trypandoc trypandoc) -} - -src_install() { - haskell-cabal_src_install - - doman "${S}/man/${PN}.1" -} 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/q-text-as-data/metadata.xml b/app-text/paper-clip/metadata.xml index c75df62c69dc..e13559a20d75 100644 --- a/app-text/q-text-as-data/metadata.xml +++ b/app-text/paper-clip/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> <maintainer type="person"> - <email>robbat2@gentoo.org</email> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> </maintainer> <upstream> - <remote-id type="github">harelba/q</remote-id> + <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 5371758ce59a..3bb713c3cb5a 100644 --- a/app-text/paperwork-backend/Manifest +++ b/app-text/paperwork-backend/Manifest @@ -1,2 +1,4 @@ -DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2 -DIST paperwork-backend-2.0.3.tar.gz 1315449 BLAKE2B b5f788d1f3dd02ae9693ffbde6909fb343d5d68555c2d7225300371d545fc96550a34d5214b7b68594e6c5558aad6c50b38de26e444a7a2ca4f9318a7fbc4c84 SHA512 ed705910a09aedc124d6f14c1fd6d76d5e3790d2d01363bcea3cbb28955c1a08725276f09828ce1e286df06d7310b78630b95201146940d1680395c6420190a6 +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/metadata.xml b/app-text/paperwork-backend/metadata.xml index f6e9749123d3..20c7c0afde7f 100644 --- a/app-text/paperwork-backend/metadata.xml +++ b/app-text/paperwork-backend/metadata.xml @@ -6,6 +6,7 @@ <name>Bernard Cafarelli</name> </maintainer> <upstream> + <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id> <remote-id type="pypi">paperwork-backend</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild deleted file mode 100644 index 6b3c1b66ea73..000000000000 --- a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-text/poppler[introspection] - dev-python/distro[${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/python-levenshtein[${PYTHON_USEDEP}] - dev-python/simplebayes[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/whoosh[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild deleted file mode 100644 index 111e95df603f..000000000000 --- a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=bdepend -PYTHON_COMPAT=( python3_{7,8,9} ) - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-text/poppler[introspection] - dev-python/distro[${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/python-levenshtein[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild new file mode 100644 index 000000000000..bedb4d1adafb --- /dev/null +++ b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild @@ -0,0 +1,63 @@ +# 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_{10..12} ) + +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="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" + +RDEPEND=" + app-text/openpaperwork-core[${PYTHON_USEDEP}] + app-text/openpaperwork-gtk[${PYTHON_USEDEP}] + app-text/poppler[introspection] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/whoosh[${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() { + 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.2.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild new file mode 100644 index 000000000000..738513e7b1a6 --- /dev/null +++ b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild @@ -0,0 +1,63 @@ +# 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_{10..12} ) + +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" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-text/openpaperwork-core[${PYTHON_USEDEP}] + app-text/openpaperwork-gtk[${PYTHON_USEDEP}] + app-text/poppler[introspection] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/whoosh[${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 + ) +" + +distutils_enable_tests unittest + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +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 7f7bd954b947..3bb713c3cb5a 100644 --- a/app-text/paperwork/Manifest +++ b/app-text/paperwork/Manifest @@ -1,2 +1,4 @@ -DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853 -DIST paperwork-2.0.3.tar.gz 6224520 BLAKE2B 099d76893b0b89e5f7914456ec31346f28335333361a4528efed6ab4c596fa24893d375557d6c1e89f7c83f4a1acac161004138b7e1537aa2f3cb2de0460bcc3 SHA512 d5cf30ef8a6011817947c9878d4defe93a0c82f77562fd707c198d944657db754ba57d703ae3f931ac9e2d7f9f1eb7f9f9093a1d26f25dac0e336b03f9b25ed3 +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/files/paperwork-2.0.3-desktop_file.patch b/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch deleted file mode 100644 index 0fbad956449a..000000000000 --- a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py paperwork-2.0.3/src/paperwork_gtk/cmd/install.py ---- paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py 2021-02-05 17:46:17.000000000 +0100 -+++ paperwork-2.0.3/src/paperwork_gtk/cmd/install.py 2021-05-30 12:26:21.316348652 +0200 -@@ -122,8 +122,6 @@ - # PDF and all image formats supported by pillow - entry.set("MimeType", - "application/pdf;" -- "image/png;" -- "image/jpeg;" - "image/bmp;" - "image/gif;" - "image/ico;" diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml index e8fb28ebd49e..d7596dc0e9e5 100644 --- a/app-text/paperwork/metadata.xml +++ b/app-text/paperwork/metadata.xml @@ -6,13 +6,14 @@ <name>Bernard Cafarelli</name> </maintainer> <longdescription lang="en"> -Paperwork is a personal document manager for scanned documents (and PDFs). + Paperwork is a personal document manager for scanned documents (and PDFs). -It's designed to be easy and fast to use. The idea behind Paperwork is "scan and forget": You should be able to just scan a new document and forget about it until the day you need it again. + It's designed to be easy and fast to use. The idea behind Paperwork is "scan and forget": You should be able to just scan a new document and forget about it until the day you need it again. -In other words, let the machine do most of the work for you. -</longdescription> + In other words, let the machine do most of the work for you. + </longdescription> <upstream> + <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id> <remote-id type="pypi">paperwork-backend</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/paperwork/paperwork-2.0.2.ebuild b/app-text/paperwork/paperwork-2.0.2.ebuild deleted file mode 100644 index d106fb32559b..000000000000 --- a/app-text/paperwork/paperwork-2.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] - ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}] - ~app-text/paperwork-backend-${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/python-dateutil[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/simplebayes[${PYTHON_USEDEP}] - media-libs/libinsane - x11-libs/libnotify[introspection]" -DEPEND="${RDEPEND}" diff --git a/app-text/paperwork/paperwork-2.0.3.ebuild b/app-text/paperwork/paperwork-2.2.1.ebuild index 3095f01e5a0d..9124bd50a325 100644 --- a/app-text/paperwork/paperwork-2.0.3.ebuild +++ b/app-text/paperwork/paperwork-2.2.1.ebuild @@ -1,19 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 + +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="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}] @@ -21,23 +26,38 @@ 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/python-dateutil[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/simplebayes[${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 -PATCHES=( "${FILESDIR}"/${P}-desktop_file.patch ) +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +src_prepare() { + default + cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/ +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} python_install_all() { distutils-r1_python_install_all # This queries tesseract languages and will fail sandbox with - # USE=opencl, bug #793446 + # USE=opencl, bugs #793446 #830012 #852134 + addpredict /dev/dri/renderD128 + addpredict /dev/kfd addpredict /dev/nvidiactl PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \ diff --git a/app-text/paperwork/paperwork-2.2.2.ebuild b/app-text/paperwork/paperwork-2.2.2.ebuild new file mode 100644 index 000000000000..ee6ce4a56117 --- /dev/null +++ b/app-text/paperwork/paperwork-2.2.2.ebuild @@ -0,0 +1,66 @@ +# 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 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="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" + +RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}] + ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}] + ~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}] + dev-python/libpillowfight[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=dev-python/pyocr-0.3.0[${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() { + default + cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/ +} + +python_compile() { + emake l10n_compile + + distutils-r1_python_compile +} + +python_install_all() { + distutils-r1_python_install_all + + # This queries tesseract languages and will fail sandbox with + # USE=opencl, bugs #793446 #830012 #852134 + addpredict /dev/dri/renderD128 + addpredict /dev/kfd + addpredict /dev/nvidiactl + + PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \ + --icon_base_dir="${ED}"/usr/share/icons \ + --data_base_dir="${ED}"/usr/share +} 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/pastebinit/files/pastebinit-1.5.1-distro.patch b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch new file mode 100644 index 000000000000..ee7245c03faa --- /dev/null +++ b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch @@ -0,0 +1,13 @@ +Fix DeprecationWarning +--- a/pastebinit ++++ b/pastebinit +@@ -32,8 +32,7 @@ + # Now try to override it with a distributor pastebin + try: + import distro +- release = distro.linux_distribution( +- full_distribution_name=False)[0].lower() ++ release = distro.id() + if release == 'debian': + defaultPB = "paste.debian.net" + elif release == 'fedora': diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml index 82a1a366072a..946d7034d93b 100644 --- a/app-text/pastebinit/metadata.xml +++ b/app-text/pastebinit/metadata.xml @@ -3,9 +3,6 @@ <pkgmetadata> <!--maintainer-needed--> <stabilize-allarches/> - <use> - <flag name="crypt">Install pbputs for gpg-encrypted pastes</flag> - </use> <upstream> <remote-id type="launchpad">pastebinit</remote-id> </upstream> diff --git a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild new file mode 100644 index 000000000000..bf613cf69206 --- /dev/null +++ b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild @@ -0,0 +1,74 @@ +# 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="xml(+)" +inherit optfeature python-single-r1 + +MY_P="${PN}_${PV}" +DESCRIPTION="A software that lets you send anything you want directly to a pastebin" +HOMEPAGE="https://launchpad.net/pastebinit" +SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" +IUSE="man" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/configobj[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + sys-devel/gettext + man? ( + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ) +" + +PATCHES=( "${FILESDIR}"/${P}-distro.patch ) + +src_prepare() { + default + python_fix_shebang "${S}"/${PN} +} + +src_compile() { + emake -C po + + if use man; then + ebegin "Generating a manpage with xsltproc" + xsltproc --nonet \ + "${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ + pastebinit.xml + eend $? + fi +} + +src_install() { + dobin pastebinit utils/pbput + dosym pbput /usr/bin/pbget + dosym pbput /usr/bin/pbputs + + einstalldocs + doman utils/*.1 + use man && doman pastebinit.1 + + insinto /usr/share/locale + doins -r po/mo/* + + insinto /usr/share + doins -r pastebin.d +} + +pkg_postinst() { + optfeature "identification of your distribution" dev-python/distro + optfeature "pbput and pbputs scripts" app-arch/xz-utils + optfeature "pbget and pbputs scripts" app-crypt/gnupg +} diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild deleted file mode 100644 index 550104a796b0..000000000000 --- a/app-text/pastebinit/pastebinit-1.5.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="xml" -inherit python-single-r1 - -MY_P="${PN}_${PV}" -DESCRIPTION="A software that lets you send anything you want directly to a pastebin" -HOMEPAGE="https://launchpad.net/pastebinit" -SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="crypt" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND="app-text/docbook-xsl-stylesheets" -RDEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/configobj[${PYTHON_USEDEP}] - ') - crypt? ( app-crypt/gnupg ) -" - -src_prepare() { - local mo="" - - for lang in ${LINGUAS}; do - if [[ -f po/${lang}.po ]]; then - mo="${mo} ${lang}.mo" - fi - done - - sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die - - default -} - -src_compile() { - emake -C po - xsltproc --nonet \ - "${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ - pastebinit.xml || die -} - -src_install() { - dobin pastebinit utils/pbput - - python_fix_shebang "${ED}/usr/bin/${PN}" - - dosym pbput /usr/bin/pbget - - if use crypt; then - dosym pbput /usr/bin/pbputs - fi - - dodoc README - doman pastebinit.1 utils/*.1 - - if [[ -d po/mo ]]; then - insinto /usr/share/locale - doins -r po/mo/* - fi - - insinto /usr/share - doins -r pastebin.d -} diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest deleted file mode 100644 index e7dae3ff3cac..000000000000 --- a/app-text/pdf2oo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pdf2oo-20090715.tar.gz 14765 BLAKE2B b84b34f4c932468d26ca6f53b596f762ec098fedfee22f1dc568e27a41c7ea9df32cc645a1f2ffd1469441ef579a11f31840fd9ed536853aacdef1f1593f4aeb SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5 diff --git a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild deleted file mode 100644 index 9db50ba4886a..000000000000 --- a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Converts pdf files to odf" -HOMEPAGE="https://sourceforge.net/projects/pdf2oo/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="app-arch/zip - >=app-text/poppler-0.12.3-r3[utils] - virtual/imagemagick-tools" - -S=${WORKDIR}/${PN} - -src_install() { - dobin pdf2oo - dodoc README -} diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest index 035901446ec3..635713743a4f 100644 --- a/app-text/pdfarranger/Manifest +++ b/app-text/pdfarranger/Manifest @@ -1,3 +1,2 @@ -DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390 -DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552 -DIST pdfarranger-1.7.1.tar.gz 236699 BLAKE2B b82a1f2309cc326bfba33458aaccee5396597a5c937c67baba767632cadddfae4f7ad21e0c86300c889f8e6d5f7dba9c6483b11bc97c83077e5ab01596b76617 SHA512 1adb5700b6497db95c3f727d1c18fc7b98ecc382cf15bc58bb7ce784d094e0d8cd45a26241e06a593eeb7601aa9f32ebba7d7f0f3a816e9384be09102eb0b4db +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.7.1.ebuild b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild index c10d59ca8463..44ebd2bc40e7 100644 --- a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild +++ b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild @@ -1,13 +1,13 @@ -# 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 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 optfeature xdg-utils desktop +inherit distutils-r1 optfeature xdg desktop -DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages." +DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages" HOMEPAGE="https://github.com/jeromerobert/pdfarranger" SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -18,7 +18,7 @@ IUSE="" RDEPEND=" app-text/poppler[introspection,cairo] - dev-python/pikepdf[${PYTHON_USEDEP}] + >=dev-python/pikepdf-6.0.0[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP},cairo] dev-python/python-dateutil[${PYTHON_USEDEP}] @@ -27,6 +27,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-python/python-distutils-extra[${PYTHON_USEDEP}] + dev-util/intltool " src_install() { @@ -37,15 +38,6 @@ src_install() { } pkg_postinst() { + xdg_pkg_postinst optfeature "image file import" media-gfx/img2pdf - - 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/pdfarranger/pdfarranger-1.7.0.ebuild b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild index 7fe6453a815f..5bb0d5ee7a7a 100644 --- a/app-text/pdfarranger/pdfarranger-1.7.0.ebuild +++ b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild @@ -1,33 +1,31 @@ -# 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 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 optfeature xdg-utils desktop +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) +inherit distutils-r1 optfeature xdg desktop -DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages." +DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages" HOMEPAGE="https://github.com/jeromerobert/pdfarranger" SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" RDEPEND=" app-text/poppler[introspection,cairo] 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}] -" +DEPEND="${RDEPEND}" src_install() { distutils-r1_src_install @@ -37,15 +35,6 @@ src_install() { } pkg_postinst() { + xdg_pkg_postinst optfeature "image file import" media-gfx/img2pdf - - 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/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild deleted file mode 100644 index 628b8bc4e6f5..000000000000 --- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 optfeature xdg-utils desktop - -DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages." -HOMEPAGE="https://github.com/jeromerobert/pdfarranger" -SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND=" - app-text/poppler[introspection,cairo] - dev-python/pikepdf[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] -" -DEPEND="${RDEPEND} - dev-python/python-distutils-extra[${PYTHON_USEDEP}] -" - -src_install() { - distutils-r1_src_install - for x in 16 32 48 256 scalable - do doicon -s ${x} data/icons/hicolor/${x}*/* - done -} - -pkg_postinst() { - optfeature "image file import" media-gfx/img2pdf - - 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/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml index a7d27c20e52a..fcea8993d2bb 100644 --- a/app-text/pdfgrep/metadata.xml +++ b/app-text/pdfgrep/metadata.xml @@ -9,6 +9,6 @@ <flag name="unac">Removing accents and ligatures before search</flag> </use> <upstream> - <remote-id type="gitlab">pdfgrep</remote-id> + <remote-id type="gitlab">pdfgrep/pdfgrep</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild index 444d6258b3d7..22c87a31ea4d 100644 --- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild +++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="+pcre test unac" RESTRICT="!test? ( test )" diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest index f8c634b6d05a..bc4be7f0c4ab 100644 --- a/app-text/pdfminer/Manifest +++ b/app-text/pdfminer/Manifest @@ -1 +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/metadata.xml b/app-text/pdfminer/metadata.xml index be0a94d38c11..4246c8804ba1 100644 --- a/app-text/pdfminer/metadata.xml +++ b/app-text/pdfminer/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="pypi">pdfminer</remote-id> + <remote-id type="github">pdfminer/pdfminer.six</remote-id> + <remote-id type="pypi">pdfminer.six</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild deleted file mode 100644 index 7e7b3e5ce079..000000000000 --- a/app-text/pdfminer/pdfminer-20191020.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..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 new file mode 100644 index 000000000000..cbc3e5638e44 --- /dev/null +++ b/app-text/pdfminer/pdfminer-20220506.ebuild @@ -0,0 +1,42 @@ +# 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 + +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/releases/download/${PV}/${MY_P}.tar.gz" +SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${P}.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_tests pytest + +python_prepare_all() { + sed -i -e "s:package.__version__:${PV}:" setup.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use examples && emake -C samples all +} + +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-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/metadata.xml b/app-text/pdfsandwich/metadata.xml index fa3120d44e54..cd9cb5c73a76 100644 --- a/app-text/pdfsandwich/metadata.xml +++ b/app-text/pdfsandwich/metadata.xml @@ -6,19 +6,19 @@ <name>Tupone Alfredo</name> </maintainer> <longdescription> -pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which -contain only images (no text) will be processed by optical character -recognition (OCR) and the text will be added to each page invisibly -"behind" the images. + pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which + contain only images (no text) will be processed by optical character + recognition (OCR) and the text will be added to each page invisibly + "behind" the images. -pdfsandwich is a command line tool which is supposed to be useful to -OCR scanned books or journals. It is able to recognize the page layout -even for multicolumn text. + pdfsandwich is a command line tool which is supposed to be useful to + OCR scanned books or journals. It is able to recognize the page layout + even for multicolumn text. -Essentially, pdfsandwich is a wrapper script which calls the following -binaries: unpaper, convert, gs, and tesseract. It supports -parallel processing on multiprocessor systems. -</longdescription> + Essentially, pdfsandwich is a wrapper script which calls the following + binaries: unpaper, convert, gs, and tesseract. It supports + parallel processing on multiprocessor systems. + </longdescription> <upstream> <remote-id type="sourceforge">pdfsandwich</remote-id> </upstream> diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild index c42e82306713..83d06fbb2794 100644 --- a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild +++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +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" @@ -26,11 +27,14 @@ DOCS=( changelog ) PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) QA_FLAGS_IGNORED="/usr/bin/${PN}" +QA_TEXTRELS="/usr/bin/${PN}" src_prepare() { sed -i \ -e "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" \ Makefile || die + # Bug #866043 + filter-lto default } diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest index 7842f625de51..028f6a4638e8 100644 --- a/app-text/pdftk/Manifest +++ b/app-text/pdftk/Manifest @@ -1 +1 @@ -DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431 +DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21 diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml index 0761a7190d4a..81ba34ef8d7e 100644 --- a/app-text/pdftk/metadata.xml +++ b/app-text/pdftk/metadata.xml @@ -9,4 +9,7 @@ <email>java@gentoo.org</email> <name>Java</name> </maintainer> +<upstream> + <remote-id type="gitlab">pdftk-java/pdftk</remote-id> +</upstream> </pkgmetadata> diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.2.2.ebuild deleted file mode 100644 index 5600e30323a7..000000000000 --- a/app-text/pdftk/pdftk-3.2.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="gcj-free version of pdftk written in Java" -HOMEPAGE="https://gitlab.com/pdftk-java/pdftk" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/" -else - SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - S="${WORKDIR}/pdftk-v${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" - -JAVA_PKG_STRICT="yes" -EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6" -JAVA_ANT_REWRITE_CLASSPATH="true" - -CDEPEND=" - dev-java/bcprov:0 - dev-java/commons-lang:3.6" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8" - -src_install() { - java-pkg_newjar "build/jar/pdftk.jar" - java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk -} diff --git a/app-text/pdftk/pdftk-3.3.3-r2.ebuild b/app-text/pdftk/pdftk-3.3.3-r2.ebuild new file mode 100644 index 000000000000..fce7d1225234 --- /dev/null +++ b/app-text/pdftk/pdftk-3.3.3-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3" +JAVA_TESTING_FRAMEWORKS="junit-4" + +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.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:1.74 + dev-java/commons-lang:3.6 +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} + test? ( + app-text/poppler[cairo] + dev-java/system-rules:0 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND}" + +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-simple_src_install + doman "${PN}.1" +} diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild index 9fe6b13efc09..5054bbcc6777 100644 --- a/app-text/pdftk/pdftk-9999.ebuild +++ b/app-text/pdftk/pdftk-9999.ebuild @@ -1,42 +1,88 @@ -# 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 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" S="${WORKDIR}/pdftk-v${PV}" 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.7" + >=virtual/jre-1.8:* + ${CP_DEPEND}" -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.7" +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 b883eb6230cb..5d37f3e38a90 100644 --- a/app-text/pelican/Manifest +++ b/app-text/pelican/Manifest @@ -1 +1,3 @@ -DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a +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.8.0-sphinx-6.patch b/app-text/pelican/files/pelican-4.8.0-sphinx-6.patch new file mode 100644 index 000000000000..60302f21a072 --- /dev/null +++ b/app-text/pelican/files/pelican-4.8.0-sphinx-6.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/889706 +https://github.com/getpelican/pelican/commit/33aca76d78601f0f0da635c8a14c89bbbc9ff8d6 + +From 33aca76d78601f0f0da635c8a14c89bbbc9ff8d6 Mon Sep 17 00:00:00 2001 +From: Justin Mayer <entroP@gmail.com> +Date: Mon, 1 Aug 2022 12:36:54 +0200 +Subject: [PATCH] Adjust extlinks configuration for Sphinx 5.0+ + +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -23,7 +23,7 @@ + '''.format(last_stable) + + extlinks = { +- 'pelican-doc': ('https://docs.getpelican.com/%s/', '') ++ 'pelican-doc': ('https://docs.getpelican.com/%s/', '%s') + } + + # -- Options for HTML output -------------------------------------------------- + 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/metadata.xml b/app-text/pelican/metadata.xml index ac8365be630a..fd35483237c4 100644 --- a/app-text/pelican/metadata.xml +++ b/app-text/pelican/metadata.xml @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>djc@gentoo.org</email> - <name>Dirkjan Ochtman</name> - </maintainer> + <!-- maintainer-needed --> + <stabilize-allarches/> <upstream> <remote-id type="pypi">pelican</remote-id> <remote-id type="github">getpelican/pelican</remote-id> diff --git a/app-text/pelican/pelican-4.5.3.ebuild b/app-text/pelican/pelican-4.5.3.ebuild deleted file mode 100644 index 65a8c28e8252..000000000000 --- a/app-text/pelican/pelican-4.5.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files" -HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/" -SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc examples markdown" - -RESTRICT="test" -RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}] - >=dev-python/jinja-2.7[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] - dev-python/blinker[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )" -DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )" - -DOCS=( README.rst ) - -distutils_enable_tests nose - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples; then - insinto "/usr/share/doc/${PF}" - docompress -x "/usr/share/doc/${PF}/samples" - doins -r samples - fi - distutils-r1_python_install_all -} diff --git a/app-text/pelican/pelican-4.8.0.ebuild b/app-text/pelican/pelican-4.8.0.ebuild new file mode 100644 index 000000000000..9997cceed563 --- /dev/null +++ b/app-text/pelican/pelican-4.8.0.ebuild @@ -0,0 +1,79 @@ +# 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 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.16[${PYTHON_USEDEP}] + >=dev-python/blinker-1.4[${PYTHON_USEDEP}] + >=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}] + >=dev-python/jinja-2.7[${PYTHON_USEDEP}] + >=dev-python/pygments-2.6[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}] + >=dev-python/pytz-2020.1[${PYTHON_USEDEP}] + >=dev-python/rich-10.1[${PYTHON_USEDEP}] + >=dev-python/unidecode-1.1[${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 +) + +PATCHES=( + "${FILESDIR}"/${P}-sphinx-6.patch +) + +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.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/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild deleted file mode 100644 index ea34fe5b61b9..000000000000 --- a/app-text/pelican/pelican-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 git-r3 - -DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files" -HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/" -EGIT_REPO_URI="https://github.com/getpelican/pelican.git" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - -LICENSE="AGPL-3" -SLOT="0" -IUSE="doc examples markdown" - -RESTRICT="test" -RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}] - >=dev-python/jinja-2.7[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] - dev-python/blinker[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )" -DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )" -DOCS=( README.rst ) - -distutils_enable_tests nose - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples; then - insinto "/usr/share/doc/${PF}" - docompress -x "/usr/share/doc/${PF}/samples" - doins -r samples - fi - distutils-r1_python_install_all -} diff --git a/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch new file mode 100644 index 000000000000..724873090c1c --- /dev/null +++ b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch @@ -0,0 +1,18 @@ +From: Sam James <sam@gentoo.org> +Date: Fri, 30 Sep 2022 21:51:17 +0100 +Subject: [PATCH] Fix -Wimplicit-int + +Fixes build with Clang 16. + +Bug: https://bugs.gentoo.org/871081 +--- a/main.c ++++ b/main.c +@@ -410,7 +410,7 @@ static void dofile(int eflage) + + /*---( main )---------------------------------------------------------------*/ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + struct stat statbuf; + unsigned int statype; diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild index e38782d4b5f2..6ef0fb385c28 100644 --- a/app-text/pep/pep-2.8-r2.ebuild +++ b/app-text/pep/pep-2.8-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs flag-o-matic DESCRIPTION="General purpose filter and file cleaning program" HOMEPAGE="https://hannemyr.com/enjoy/pep.html" SRC_URI="https://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" @@ -15,17 +16,17 @@ KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos" BDEPEND="app-arch/unzip" -S=${WORKDIR} - -# pep does not come with autconf so here's a patch to configure +# pep does not come with autoconf so here's a patch to configure # Makefile with the correct path PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-include.patch + "${FILESDIR}"/${P}-Fix-Wimplicit-int.patch ) src_prepare() { default + # Darwin lacks stricmp and DIRCHAR if [[ ${CHOST} == *-darwin* ]] ; then sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile || die @@ -35,7 +36,7 @@ src_prepare() { src_compile() { # make man page too - make Doc/pep.1 || die "make man page failed" + emake Doc/pep.1 emake CC="$(tc-getCC)" } 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 fd125b72037e..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 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="nls readline" RDEPEND=" @@ -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 acbde749fbab..6060bd9aa55e 100644 --- a/app-text/po4a/Manifest +++ b/app-text/po4a/Manifest @@ -1,3 +1,3 @@ -DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81 -DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997 -DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633 +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.60-man.patch b/app-text/po4a/files/po4a-0.60-man.patch deleted file mode 100644 index 40927dbda818..000000000000 --- a/app-text/po4a/files/po4a-0.60-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.69-man.patch b/app-text/po4a/files/po4a-0.69-man.patch new file mode 100644 index 000000000000..02cedf7f1ade --- /dev/null +++ b/app-text/po4a/files/po4a-0.69-man.patch @@ -0,0 +1,18 @@ +--- a/Po4aBuilder.pm ++++ b/Po4aBuilder.pm +@@ -234,7 +234,6 @@ + } + $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; + } + unlink "$file" || die; + } diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch index 6dd94aed153d..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 -@@ -233,7 +233,6 @@ +@@ -242,7 +242,6 @@ } - $parser->parse_from_file ($file, $out); + $parser->parse_from_file( $file, $out ); -- system("gzip -9 -f $out") and die; +- system("gzip -9 -n -f $out") and die; unlink "$file" || die; } -@@ -245,7 +244,6 @@ - if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) { - my ($outdir, $section, $outfile) = ($1, $2, $3); - 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; +@@ -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; } - unlink "$file" || die; - } diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.69.ebuild index d2312dd067e5..d45251ad5468 100644 --- a/app-text/po4a/po4a-0.63-r1.ebuild +++ b/app-text/po4a/po4a-0.69.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PLOCALES="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" +EAPI="8" +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_CN zh_HK zh_Hant" inherit perl-module plocale @@ -12,32 +12,33 @@ 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 ~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 )" RDEPEND="app-text/opensp dev-libs/libxslt 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 dev-perl/YAML-Tiny - sys-devel/gettext - dev-perl/Pod-Parser" + sys-devel/gettext" DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 +BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build + sys-devel/gettext test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base )" -PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch ) +PATCHES=( "${FILESDIR}"/${P}-man.patch ) DIST_TEST="do" diff --git a/app-text/po4a/po4a-0.62-r1.ebuild b/app-text/po4a/po4a-0.70.ebuild index d2312dd067e5..5b80c728dbb4 100644 --- a/app-text/po4a/po4a-0.62-r1.ebuild +++ b/app-text/po4a/po4a-0.70.ebuild @@ -1,43 +1,44 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PLOCALES="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" +EAPI="8" +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 ~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 )" RDEPEND="app-text/opensp dev-libs/libxslt 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 dev-perl/YAML-Tiny - sys-devel/gettext - dev-perl/Pod-Parser" + sys-devel/gettext" DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 +BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build + sys-devel/gettext test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base )" -PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch ) +PATCHES=( "${FILESDIR}"/${PN}-man.patch ) DIST_TEST="do" diff --git a/app-text/po4a/po4a-0.57-r1.ebuild b/app-text/po4a/po4a-0.71.ebuild index e05dec8567cb..397bab6b1bee 100644 --- a/app-text/po4a/po4a-0.57-r1.ebuild +++ b/app-text/po4a/po4a-0.71.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PLOCALES="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 sv uk vi zh_CN zh_HK" +EAPI="8" +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,35 +12,34 @@ 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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +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 )" RDEPEND="app-text/opensp dev-libs/libxslt 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 dev-perl/YAML-Tiny - sys-devel/gettext - dev-perl/Pod-Parser" + sys-devel/gettext" DEPEND="${RDEPEND}" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 +BDEPEND="app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build + sys-devel/gettext test? ( app-text/docbook-sgml-dtd:4.1 + dev-perl/Test-Pod virtual/latex-base )" PATCHES=( "${FILESDIR}"/${PN}-man.patch ) -PERL_RM_FILES=( - t/09-html.t -) DIST_TEST="do" src_prepare() { diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest index f5d3e309a7d7..ca377eb20e35 100644 --- a/app-text/podofo/Manifest +++ b/app-text/podofo/Manifest @@ -1 +1,5 @@ -DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc +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/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.8-r1.ebuild index 74c9b102939b..151d7e2aabf0 100644 --- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild +++ b/app-text/podofo/podofo-0.9.8-r1.ebuild @@ -1,7 +1,7 @@ -# 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 LUA_COMPAT=( lua5-{1..4} ) @@ -9,32 +9,36 @@ inherit cmake flag-o-matic lua-single toolchain-funcs DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" HOMEPAGE="https://sourceforge.net/projects/podofo/" -SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz" +SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz + https://github.com/podofo/podofo/commit/d0e9f5d503b0cb79516ec9bff989f3d7d625b678.patch -> ${P}-bug-888463.patch" LICENSE="GPL-2 LGPL-2.1" -SLOT="0/${PV%_*}" +SLOT="0/${PV}" KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86" IUSE="+boost idn debug test +tools" -RESTRICT="!test? ( test )" +RESTRICT="test" REQUIRED_USE="${LUA_REQUIRED_USE} test? ( tools )" RDEPEND="${LUA_DEPS} idn? ( net-dns/libidn:= ) - dev-libs/openssl:0= + dev-libs/openssl:= media-libs/fontconfig:= media-libs/freetype:2= - virtual/jpeg:0= - media-libs/libpng:0= - media-libs/tiff:0= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= sys-libs/zlib:=" DEPEND="${RDEPEND} - test? ( dev-util/cppunit )" + test? ( dev-util/cppunit ) +" + BDEPEND="virtual/pkgconfig - boost? ( dev-util/boost-build )" + boost? ( dev-libs/boost )" PATCHES=( "${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch + "${DISTDIR}"/${P}-bug-888463.patch ) DOCS="AUTHORS ChangeLog TODO" @@ -70,47 +74,6 @@ src_prepare() { [[ -n ${sed_args} ]] && \ { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; } - # Bug #439784: Add missing unistd include for close() and unlink(). - sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \ - test/unit/TestUtils.cpp || die - - # TODO: fix these test cases - # ColorTest.cpp:62:Assertion - # Test name: ColorTest::testDefaultConstructor - # expected exception not thrown - # - Expected: PdfError - sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \ - -i test/unit/ColorTest.h || die - - # ColorTest.cpp:42:Assertion - # Test name: ColorTest::testHexNames - # assertion failed - # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A - sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \ - -i test/unit/ColorTest.h || die - - # Bug #352125: test failure, depending on installed fonts - # ##Failure Location unknown## : Error - # Test name: FontTest::testFonts - # uncaught exception of type PoDoFo::PdfError - # - ePdfError_UnsupportedFontFormat - sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \ - -i test/unit/FontTest.h || die - - # Test name: EncodingTest::testDifferencesEncoding - # equality assertion failed - # - Expected: 1 - # - Actual : 0 - sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \ - -i test/unit/EncodingTest.h || die - # Bug #407015: fix to compile with Lua 5.2+ case "${ELUA}" in lua5-1|luajit) @@ -139,9 +102,11 @@ src_configure() { -DLUA_VERSION="$(lua_get_version)" -DWANT_BOOST=$(usex boost ON OFF) -DHAVE_LIBIDN=$(usex idn ON OFF) + # We use libidn for unicode support instead + -DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF) -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON) - ) + ) cmake_src_configure mkdir -p "${S}/test/TokenizerTest/objects" || die diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest index dfa49f62de3a..d5bb2a09ed73 100644 --- a/app-text/poppler-data/Manifest +++ b/app-text/poppler-data/Manifest @@ -1,2 +1,2 @@ -DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3 -DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32 +DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885 +DIST poppler-data-0.4.12.tar.gz 4504754 BLAKE2B 0d34ff1fcc9120b5db2baded9d931ca37128106eecdd54892d0256f9736f799d52eacd4017741797432048def914dd13150c6e3bf8d9ea5b8597a799a497d1c7 SHA512 75f201e4c586ba47eb9a48a33ef6663fe353d0694b602feb7db282d73da7f0daffb0ff7e18e4a6cb40324305efa2413df562666939f4214e2dfd7ff00288f3de diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild deleted file mode 100644 index 09992c6a315c..000000000000 --- a/app-text/poppler-data/poppler-data-0.4.10.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -LICENSE="BSD GPL-2 MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="" - -src_install() { - emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install - - # bug 409361 - dodir /usr/share/poppler/cMaps - cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die - find ../cMap -type f -exec ln -s {} . \; || die -} diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild deleted file mode 100644 index bbc24bd33be5..000000000000 --- a/app-text/poppler-data/poppler-data-0.4.11.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - -LICENSE="BSD GPL-2 MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 - - # 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 new file mode 100644 index 000000000000..735eb5a9ab48 --- /dev/null +++ b/app-text/poppler-data/poppler-data-0.4.12.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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/Manifest b/app-text/poppler/Manifest index a8210d6bd517..04cd4849cc7a 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,10 @@ -DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8 -DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211 -DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55 +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-21.04.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch deleted file mode 100644 index 8781bbec5bbc..000000000000 --- a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch +++ /dev/null @@ -1,117 +0,0 @@ -From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001 -From: Theo Anderson <telans@posteo.de> -Date: Wed, 14 Apr 2021 10:16:11 +1200 -Subject: [PATCH] build: respect cflags - -Signed-off-by: Theo Anderson <telans@posteo.de> ---- - cmake/modules/PopplerMacros.cmake | 77 ++----------------------------- - 1 file changed, 4 insertions(+), 73 deletions(-) - -diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index fe1182da..b77eaa3e 100644 ---- a/cmake/modules/PopplerMacros.cmake -+++ b/cmake/modules/PopplerMacros.cmake -@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE RelWithDebInfo) - endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - --if(CMAKE_COMPILER_IS_GNUCXX) -- # set the default compile warnings - set(_warn "-Wall -Wextra -Wpedantic") - set(_warn "${_warn} -Wno-unused-parameter") - set(_warn "${_warn} -Wcast-align") - set(_warn "${_warn} -Wformat-security") - set(_warn "${_warn} -Wframe-larger-than=65536") -- set(_warn "${_warn} -Wlogical-op") - set(_warn "${_warn} -Wmissing-format-attribute") - set(_warn "${_warn} -Wnon-virtual-dtor") - set(_warn "${_warn} -Woverloaded-virtual") -@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) - - set(DEFAULT_COMPILE_WARNINGS "${_warn}") - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") -- -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") -- -+ -+if(CMAKE_COMPILER_IS_GNUCXX) - poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) - if(GCC_HAS_AS_NEEDED) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") -@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX) - endif(GCC_HAS_AS_NEEDED) - endif (CMAKE_COMPILER_IS_GNUCXX) - --if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") --# set the default compile warnings -- set(_warn "-Wall -Wextra -Wpedantic") -- set(_warn "${_warn} -Wno-unused-parameter") -- set(_warn "${_warn} -Wcast-align") -- set(_warn "${_warn} -Wformat-security") -- set(_warn "${_warn} -Wframe-larger-than=65536") -- set(_warn "${_warn} -Wmissing-format-attribute") -- set(_warn "${_warn} -Wnon-virtual-dtor") -- set(_warn "${_warn} -Woverloaded-virtual") -- set(_warn "${_warn} -Wmissing-declarations") -- set(_warn "${_warn} -Wundef") -- set(_warn "${_warn} -Wzero-as-null-pointer-constant") -- set(_warn "${_warn} -Wshadow") -- set(_warn "${_warn} -Wweak-vtables") -- -- # set extra warnings -- set(_warnx "${_warnx} -Wconversion") -- -- set(DEFAULT_COMPILE_WARNINGS "${_warn}") -- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") -- -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") -- --endif() -- --if(CMAKE_C_COMPILER MATCHES "icc") -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") --endif(CMAKE_C_COMPILER MATCHES "icc") -- -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") --- -2.31.1 - 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-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild deleted file mode 100644 index ccde4b8643bb..000000000000 --- a/app-text/poppler/poppler-21.07.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2005-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake 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 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - 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 ~x64-solaris ~x86-solaris" - SLOT="0/111" # 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" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - cjk? ( app-text/poppler-data ) -" -DEPEND+=" - boost? ( dev-libs/boost ) -" - -DOCS=( AUTHORS NEWS README.md README-XPDF ) - -PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" -) - -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 [[ ${CC} == 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 - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF - -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) - -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) - -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) - -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF - ) - 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-21.08.0.ebuild b/app-text/poppler/poppler-21.08.0.ebuild deleted file mode 100644 index be72663ad68d..000000000000 --- a/app-text/poppler/poppler-21.08.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2005-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake 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 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - 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 ~x64-solaris ~x86-solaris" - SLOT="0/112" # 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" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - cjk? ( app-text/poppler-data ) -" -DEPEND+=" - boost? ( dev-libs/boost ) -" - -DOCS=( AUTHORS NEWS README.md README-XPDF ) - -PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" -) - -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 [[ ${CC} == 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 - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DBUILD_MANUAL_TESTS=OFF - -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) - -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) - -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) - -DENABLE_UTILS=$(usex utils) - -DENABLE_QT6=OFF - ) - 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-21.09.0.ebuild b/app-text/poppler/poppler-24.02.0.ebuild index 20065b9bb13c..224aa760e772 100644 --- a/app-text/poppler/poppler-21.09.0.ebuild +++ b/app-text/poppler/poppler-24.02.0.ebuild @@ -1,70 +1,97 @@ -# Copyright 2005-2021 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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=/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + + TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - 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 ~x64-solaris ~x86-solaris" - SLOT="0/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + 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/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 )" -DEPEND=" - media-libs/fontconfig - media-libs/freetype +COMMON_DEPEND=" + >=media-libs/fontconfig-2.13 + >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) + >=dev-libs/glib-2.64:2 + >=x11-libs/cairo-1.16 + introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) + 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.19:0 ) + nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) - tiff? ( media-libs/tiff:0 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) + tiff? ( media-libs/tiff:= ) " -RDEPEND="${DEPEND} +RDEPEND="${COMMON_DEPEND} cjk? ( app-text/poppler-data ) " -DEPEND+=" - boost? ( dev-libs/boost ) +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 + >=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}-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 @@ -84,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.03.0.ebuild b/app-text/poppler/poppler-24.03.0.ebuild new file mode 100644 index 000000000000..719b3b8646b8 --- /dev/null +++ b/app-text/poppler/poppler-24.03.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="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 ~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 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.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 ) + nss? ( >=dev-libs/nss-3.49 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml: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 ) + test? ( + qt5? ( + dev-qt/qttest:5 + dev-qt/qtwidgets: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-24.04.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild new file mode 100644 index 000000000000..83006151fd51 --- /dev/null +++ b/app-text/poppler/poppler-24.04.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="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 ~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 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.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 ) + nss? ( >=dev-libs/nss-3.49 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml: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 ) + test? ( + qt5? ( + dev-qt/qttest:5 + dev-qt/qtwidgets: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-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 20065b9bb13c..fe2ff39083f0 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,70 +1,97 @@ -# Copyright 2005-2021 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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=/usr/share/openpgp-keys/aacid.asc + inherit verify-sig + + TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410" SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - 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 ~x64-solaris ~x86-solaris" - SLOT="0/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + 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 +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 )" -DEPEND=" - media-libs/fontconfig - media-libs/freetype +COMMON_DEPEND=" + >=media-libs/fontconfig-2.13 + >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) + >=dev-libs/glib-2.64:2 + >=x11-libs/cairo-1.16 + introspection? ( >=dev-libs/gobject-introspection-1.72:= ) ) curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) + 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.19:0 ) + 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 ) - tiff? ( media-libs/tiff:0 ) + qt6? ( dev-qt/qtbase:6[gui,xml] ) + tiff? ( media-libs/tiff:= ) " -RDEPEND="${DEPEND} +RDEPEND="${COMMON_DEPEND} cjk? ( app-text/poppler-data ) " -DEPEND+=" - boost? ( dev-libs/boost ) +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 + >=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}-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 @@ -84,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/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild index a717ead48443..4c07540fcae0 100644 --- a/app-text/ps2eps/ps2eps-1.68.ebuild +++ b/app-text/ps2eps/ps2eps-1.68.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/metadata.xml b/app-text/ps2pkm/metadata.xml index 52546db07960..34452b8a1eb9 100644 --- a/app-text/ps2pkm/metadata.xml +++ b/app-text/ps2pkm/metadata.xml @@ -5,7 +5,7 @@ <email>aballier@gentoo.org</email> <name>Alexis Ballier</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>tex@gentoo.org</email> <name>Gentoo TeX Project</name> </maintainer> diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild index c1d0a1b552da..c2bf98350593 100644 --- a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild +++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild @@ -1,22 +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 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/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 ~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/metadata.xml b/app-text/pspdftool/metadata.xml index b7a70000aecb..8ee0a222965a 100644 --- a/app-text/pspdftool/metadata.xml +++ b/app-text/pspdftool/metadata.xml @@ -3,8 +3,8 @@ <pkgmetadata> <!--maintainer-needed--> <longdescription lang="en"> -Pspdftool is a tool for preprinting preparation of documents. It supports PostScript and PDF files and allows users do several transformations (for example rotation, scale, miror ...) and pages selections. -</longdescription> + Pspdftool is a tool for preprinting preparation of documents. It supports PostScript and PDF files and allows users do several transformations (for example rotation, scale, miror ...) and pages selections. + </longdescription> <upstream> <remote-id type="sourceforge">pspdftool</remote-id> </upstream> 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/pspresent/files/pspresent-1.3-makefile.patch b/app-text/pspresent/files/pspresent-1.3-makefile.patch new file mode 100644 index 000000000000..363a52c57285 --- /dev/null +++ b/app-text/pspresent/files/pspresent-1.3-makefile.patch @@ -0,0 +1,39 @@ +--- a/Makefile ++++ b/Makefile +@@ -4,28 +4,16 @@ + # + + # You may need to change these paths +-X11_CFLAGS=-I/usr/X11R6/include +-X11_LDLIBS=-L/usr/X11R6/lib -lX11 ++X11_CFLAGS = $(shell $(PKG_CONFIG) --cflags x11) ++X11_LDLIBS = $(shell $(PKG_CONFIG) --libs x11) + + # Remove the following two lines to disable XINERAMA support +-XINERAMA_CFLAGS=-DHAVE_LIBXINERAMA +-XINERAMA_LDLIBS=-lXext -lXinerama ++ifdef USE_XINERAMA ++XINERAMA_CFLAGS = -DHAVE_LIBXINERAMA $(shell $(PKG_CONFIG) --cflags xinerama) ++XINERAMA_LDLIBS = $(shell $(PKG_CONFIG) --libs xinerama) ++endif + +-CC = gcc +-CFLAGS = -Wall -O2 $(X11_CFLAGS) $(XINERAMA_CFLAGS) ++CPPFLAGS += $(X11_CFLAGS) $(XINERAMA_CFLAGS) + LDLIBS = $(X11_LDLIBS) $(XINERAMA_LDLIBS) + +-TARGET = pspresent +-OBJS = pspresent.o gs.o ps.o +- +-$(TARGET): $(OBJS) +- $(CC) -o $(TARGET) $(OBJS) $(LDLIBS) +- +-clean: +- rm $(TARGET) $(OBJS) +- +-.SUFFIXES: +-.SUFFIXES: .c .o +- +-.c.o: +- $(CC) $(CFLAGS) -o $@ -c $< ++pspresent: gs.o ps.o diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r2.ebuild index 20931af5b1d4..167d8e647c8a 100644 --- a/app-text/pspresent/pspresent-1.3-r1.ebuild +++ b/app-text/pspresent/pspresent-1.3-r2.ebuild @@ -1,38 +1,32 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="A tool to display full-screen PostScript presentations" -SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/" -SLOT="0" -LICENSE="GPL-2" +SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" -IUSE="xinerama" +LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc x86" +IUSE="xinerama" -RDEPEND="x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - app-text/ghostscript-gpl" +RDEPEND=" + app-text/ghostscript-gpl + x11-libs/libX11 + xinerama? ( x11-libs/libXinerama )" DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -src_prepare() { - default - if ! use xinerama ; then - sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile" - fi - sed -i Makefile \ - -e 's|= -Wall -O2|+= -Wall|g' \ - -e 's| -o | $(LDFLAGS)&|g' \ - || die "sed Makefile" -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - emake CC=$(tc-getCC) +src_configure() { + tc-export CC PKG_CONFIG + use xinerama && export USE_XINERAMA=1 } src_install() { diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r5.ebuild index fbbb6af016ad..72c02ff901a4 100644 --- a/app-text/pstotext/pstotext-1.9-r4.ebuild +++ b/app-text/pstotext/pstotext-1.9-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,9 +12,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz" LICENSE="PSTT" SLOT="0" KEYWORDS="amd64 ~hppa ppc ppc64 x86" -IUSE="" -DEPEND="app-arch/ncompress" RDEPEND="app-text/ghostscript-gpl" PATCHES=( @@ -22,8 +20,7 @@ PATCHES=( "${FILESDIR}"/${PV}-flags.patch ) -src_prepare() { - default +src_configure() { tc-export CC } diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest index 76920dff8ac6..32a27964115b 100644 --- a/app-text/psutils/Manifest +++ b/app-text/psutils/Manifest @@ -1 +1,2 @@ +DIST psutils-2.09.tar.gz 1231162 BLAKE2B 237c26aaf5d9567177cd092d2651aa4562599776118bc4b7bdc717c03935fbddf94e28e037c603b54cee178687135e88dd9593c4d6bad952e1afcb2838e2bc17 SHA512 962c182a4cd71fbc77892806f9e46985306e75f726a58e218718bda20fdada72e9622bb55cef70ed92709b9c1c227a6542096be9605002f4c476edf529ccd4c1 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3 diff --git a/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch new file mode 100644 index 000000000000..0f70648dd600 --- /dev/null +++ b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch @@ -0,0 +1,16 @@ +--- a/pserror.c ++++ b/pserror.c +@@ -22,11 +22,11 @@ extern char *program ; /* Defined by mai + #define MAX_COLUMN 78 /* maximum column to print upto */ + + void message(int flags, char *format, ...) + { + va_list args ; +- static column = 0 ; /* current screen column for message wrap */ ++ static int column = 0 ; /* current screen column for message wrap */ + char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */ + char *bufptr = msgbuf ; /* message buffer pointer */ + + if ( (flags & MESSAGE_NL) && column != 0 ) { /* new line if not already */ + putc('\n', stderr) ; + diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-ldflags.patch deleted file mode 100644 index 124768062a43..000000000000 --- a/app-text/psutils/files/psutils-1.17-ldflags.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: psutils/Makefile.unix -=================================================================== ---- psutils.orig/Makefile.unix -+++ psutils/Makefile.unix -@@ -39,7 +39,7 @@ MANEXT = 1 - MANDIR = /usr/local/share/man/man$(MANEXT) - - CC = gcc --CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall -+CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall - - BIN = psbook psselect pstops epsffit psnup \ - psresize -@@ -65,30 +65,24 @@ pserror.o: psutil.h patchlev.h pserror.h - epsffit.o: epsffit.c pserror.h patchlev.h - - epsffit: epsffit.o pserror.o -- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o - - psnup: psnup.o psutil.o psspec.o pserror.o -- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o - - psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c - - psresize: psresize.o psutil.o pserror.o psspec.o -- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o - - psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c - - psbook: psbook.o psutil.o pserror.o -- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o - - psbook.o: psutil.h patchlev.h pserror.h psbook.c - - psselect: psselect.o psutil.o pserror.o -- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o - - psselect.o: psutil.h patchlev.h pserror.h psselect.c - - pstops: pstops.o psutil.o psspec.o pserror.o -- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o - - pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c - diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch new file mode 100644 index 000000000000..8e8f03208f78 --- /dev/null +++ b/app-text/psutils/files/psutils-1.17-makefile.patch @@ -0,0 +1,210 @@ +--- a/Makefile.unix ++++ b/Makefile.unix +@@ -25,10 +25,10 @@ + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = $(DESTDIR)$(EPREFIX)/usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils ++PERL = "/usr/bin/env perl" + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,10 +36,9 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = $(DESTDIR)$(EPREFIX)/usr/share/man/man$(MANEXT) + +-CC = gcc +-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall ++CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall + + BIN = psbook psselect pstops epsffit psnup \ + psresize +@@ -65,30 +64,24 @@ + epsffit.o: epsffit.c pserror.h patchlev.h + + epsffit: epsffit.o pserror.o +- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o + + psnup: psnup.o psutil.o psspec.o pserror.o +- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o + + psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c + + psresize: psresize.o psutil.o pserror.o psspec.o +- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o + + psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c + + psbook: psbook.o psutil.o pserror.o +- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o + + psbook.o: psutil.h patchlev.h pserror.h psbook.c + + psselect: psselect.o psutil.o pserror.o +- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o + + psselect.o: psutil.h patchlev.h pserror.h psselect.c + + pstops: pstops.o psutil.o psspec.o pserror.o +- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o + + pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c + +@@ -99,116 +92,116 @@ + cp $? $@ + + psmerge: psmerge.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixfmps: fixfmps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixmacps: fixmacps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixpsditps: fixpsditps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixpspps: fixpspps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixscribeps: fixscribeps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixtpps: fixtpps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwfwps: fixwfwps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwpps: fixwpps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixwwps: fixwwps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + fixdlsrps: fixdlsrps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + extractres: extractres.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + + includeres: includeres.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ + $(CHMOD) $(BINMODE) $@ + + epsffit.$(MANEXT): epsffit.man +- $(PERL) maketext MAN="$(MANPAGES)" $? > $@ ++ perl maketext MAN="$(MANPAGES)" $? > $@ + + psnup.$(MANEXT): psnup.man +- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psresize.$(MANEXT): psresize.man +- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psbook.$(MANEXT): psbook.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + psselect.$(MANEXT): psselect.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + pstops.$(MANEXT): pstops.man +- $(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ + + psmerge.$(MANEXT): psmerge.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixfmps.$(MANEXT): fixfmps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixmacps.$(MANEXT): fixmacps.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ + + fixpsditps.$(MANEXT): fixpsditps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixpspps.$(MANEXT): fixpspps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixscribeps.$(MANEXT): fixscribeps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixtpps.$(MANEXT): fixtpps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwfwps.$(MANEXT): fixwfwps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwpps.$(MANEXT): fixwpps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixwwps.$(MANEXT): fixwwps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + fixdlsrps.$(MANEXT): fixdlsrps.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + extractres.$(MANEXT): extractres.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + includeres.$(MANEXT): includeres.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ ++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ + + getafm.$(MANEXT): getafm.man +- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ ++ perl maketext "MAN=$(MANPAGES)" $? > $@ + + clean: + rm -f *.o diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml index edfe97231997..bdd03acf530b 100644 --- a/app-text/psutils/metadata.xml +++ b/app-text/psutils/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>tex@gentoo.org</email> - <name>Gentoo TeX Project</name> -</maintainer> + <maintainer type="project"> + <email>tex@gentoo.org</email> + <name>Gentoo TeX Project</name> + </maintainer> + <upstream> + <remote-id type="github">rrthomas/psutils</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild deleted file mode 100644 index a2df5ca8d372..000000000000 --- a/app-text/psutils/psutils-1.17-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="PostScript Utilities" -HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/" -SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz" - -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" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}/${P}.orig" - -src_prepare() { - eapply "${FILESDIR}/${P}-ldflags.patch" - eapply "${FILESDIR}/${P}-no-fixmacps.patch" - sed \ - -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \ - "${S}/Makefile.unix" > "${S}/Makefile" - default -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dodir /usr/{bin,share/man} - emake DESTDIR="${D}" install - dodoc README -} diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild new file mode 100644 index 000000000000..54201ea6112f --- /dev/null +++ b/app-text/psutils/psutils-1.17-r5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="PostScript Utilities" +HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/" +SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz" +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 ~x64-solaris" + +BDEPEND="dev-lang/perl" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-no-fixmacps.patch + "${FILESDIR}"/${P}-clang-implicit-int.patch +) + +src_compile() { + emake -f Makefile.unix CC="$(tc-getCC)" +} + +src_install() { + dodir /usr/{bin,share/man} + emake -f Makefile.unix DESTDIR="${D}" install + dodoc README +} diff --git a/app-text/psutils/psutils-2.09.ebuild b/app-text/psutils/psutils-2.09.ebuild new file mode 100644 index 000000000000..660720704b57 --- /dev/null +++ b/app-text/psutils/psutils-2.09.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="PostScript Utilities" +HOMEPAGE="https://github.com/rrthomas/psutils http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/" +SRC_URI="https://github.com/rrthomas/psutils/releases/download/v${PV}/${P}.tar.gz" + +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 ~x64-solaris" + +# Newer libpaper needed for fork which provides 'paper' +RDEPEND=" + >=app-text/libpaper-1.2.3 + >=dev-lang/perl-5.14 + dev-perl/IPC-Run3 +" +BDEPEND="${RDEPEND}" diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest deleted file mode 100644 index 08cfb9abe240..000000000000 --- a/app-text/pytextile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580 diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml deleted file mode 100644 index 9fcb3d2c7ea1..000000000000 --- a/app-text/pytextile/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator. - Textile simplifies the work of creating (X)HTML.</longdescription> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">textile</remote-id> - <remote-id type="github">textile/python-textile</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild deleted file mode 100644 index fc7f0aecbd1d..000000000000 --- a/app-text/pytextile/pytextile-4.0.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_P="python-textile-${PV}" - -DESCRIPTION="A Python port of Textile, A humane web text generator" -HOMEPAGE="https://github.com/textile/python-textile" -SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" - -RDEPEND=" - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -distutils_enable_tests pytest - -src_prepare() { - default - # remove useless --cov arg injection - rm pytest.ini || die - # remove useless pytest-runner dep - sed -e "s/pytest-runner//g" -i setup.py || die -} - -python_test() { - local deselect=( - # tests that need network access - tests/test_getimagesize.py - tests/test_imagesize.py - tests/test_textile.py - ) - epytest ${deselect[@]/#/--deselect } -} diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest deleted file mode 100644 index 0d554c366130..000000000000 --- a/app-text/q-text-as-data/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2 diff --git a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild deleted file mode 100644 index 9a0608dbb926..000000000000 --- a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="sqlite" - -inherit python-r1 - -DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text" -HOMEPAGE="http://harelba.github.io/q/" -MY_P="q-${PV}" -SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Upstream is wrong -# http://harelba.github.io/q/#requirements -RDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/flake8[${PYTHON_USEDEP}] - ')" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - : # Do not use the Makefile -} - -q_install() { - python_newexe bin/q.py q-text-as-data -} - -src_install() { - python_foreach_impl q_install - newdoc bin/.qrc dot-qrc - dodoc doc/* -} - -pkg_postinst() { - einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;" - einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'." -} diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest index b021b7c1b9cd..c868a806c643 100644 --- a/app-text/qpdf/Manifest +++ b/app-text/qpdf/Manifest @@ -1,4 +1,9 @@ -DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07 -DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106 -DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623 -DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f86c3e33116063b2fff1426aed5ff6e3c581c120771a712a8ed278102e0d41816db207a25dabd84e5b89490d35 SHA512 4e630959abf27d1801e36d0cbd754945ded42ade9299057a6b9a642c7cb2a3f8242e274642f1c33a65b4a5a77562d91dcbe64fd5772d483cbe5edb4a6a389219 +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-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild deleted file mode 100644 index e6c1b1772480..000000000000 --- a/app-text/qpdf/qpdf-10.0.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="http://qpdf.sourceforge.net/" -SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# subslot = libqpdf soname version -SLOT="0/28" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/gnutls:0= - sys-libs/zlib - virtual/jpeg:0= - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - local myeconfargs=( - --disable-implicit-crypto - --enable-crypto-gnutls - --enable-crypto-native - --with-default-crypto=gnutls - --disable-static - $(use_enable ssl crypto-openssl) - $(use_enable test test-compare-images) - ) - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use examples ; then - dobin examples/build/.libs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild deleted file mode 100644 index e6c1b1772480..000000000000 --- a/app-text/qpdf/qpdf-10.1.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="http://qpdf.sourceforge.net/" -SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# subslot = libqpdf soname version -SLOT="0/28" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/gnutls:0= - sys-libs/zlib - virtual/jpeg:0= - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - local myeconfargs=( - --disable-implicit-crypto - --enable-crypto-gnutls - --enable-crypto-native - --with-default-crypto=gnutls - --disable-static - $(use_enable ssl crypto-openssl) - $(use_enable test test-compare-images) - ) - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use examples ; then - dobin examples/build/.libs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild deleted file mode 100644 index e6c1b1772480..000000000000 --- a/app-text/qpdf/qpdf-10.3.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="http://qpdf.sourceforge.net/" -SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# subslot = libqpdf soname version -SLOT="0/28" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/gnutls:0= - sys-libs/zlib - virtual/jpeg:0= - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - local myeconfargs=( - --disable-implicit-crypto - --enable-crypto-gnutls - --enable-crypto-native - --with-default-crypto=gnutls - --disable-static - $(use_enable ssl crypto-openssl) - $(use_enable test test-compare-images) - ) - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use examples ; then - dobin examples/build/.libs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-text/qpdf/qpdf-10.3.2.ebuild b/app-text/qpdf/qpdf-10.3.2.ebuild deleted file mode 100644 index 9b78f115b945..000000000000 --- a/app-text/qpdf/qpdf-10.3.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" -HOMEPAGE="http://qpdf.sourceforge.net/" -SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 Artistic-2 )" -# subslot = libqpdf soname version -SLOT="0/28" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="doc examples ssl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/gnutls:0= - sys-libs/zlib - virtual/jpeg:0= - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - test? ( - app-text/ghostscript-gpl[tiff(+)] - media-libs/tiff - sys-apps/diffutils - ) -" - -DOCS=( ChangeLog README.md TODO ) - -src_configure() { - local myeconfargs=( - --disable-implicit-crypto - --enable-crypto-gnutls - --enable-crypto-native - --with-default-crypto=gnutls - --disable-static - $(use_enable ssl crypto-openssl) - $(use_enable test test-compare-images) - ) - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use examples ; then - dobin examples/build/.libs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} 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 170e1a1035e4..c9267bfaca12 100644 --- a/app-text/qpdfview/Manifest +++ b/app-text/qpdfview/Manifest @@ -1,2 +1,2 @@ -DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66 -DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a +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.4.18-qt-5.15.patch b/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch deleted file mode 100644 index b19f247a7c38..000000000000 --- a/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur qpdfview-0.4.18.orig/sources/model.h qpdfview-0.4.18/sources/model.h ---- a/sources/model.h 2019-07-24 21:18:33.000000000 +0200 -+++ b/sources/model.h 2020-05-29 11:44:33.012891583 +0200 -@@ -27,6 +27,7 @@ - #include <QtPlugin> - #include <QWidget> - #include <QVector> -+#include <QPainterPath> - - class QAbstractItemModel; - class QColor; 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 8cbacb076ed2..8397ee4bec66 100644 --- a/app-text/qpdfview/metadata.xml +++ b/app-text/qpdfview/metadata.xml @@ -1,9 +1,9 @@ <?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 type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> </maintainer> <use> <flag name="fitz"> diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.5.ebuild index c0030735c539..23bf1eb4974d 100644 --- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild +++ b/app-text/qpdfview/qpdfview-0.5.ebuild @@ -1,19 +1,18 @@ -# 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 -PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW" +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" -# bzr revision 2107 -SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +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 )" @@ -43,11 +42,15 @@ 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 - prepare_locale() { + p_locale() { "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed" } @@ -56,7 +59,7 @@ src_prepare() { } plocale_find_changes translations ${PN}_ .ts - plocale_for_each_locale prepare_locale + plocale_for_each_locale p_locale plocale_for_each_disabled_locale rm_help # adapt for prefix diff --git a/app-text/qpdfview/qpdfview-0.4.18.ebuild b/app-text/qpdfview/qpdfview-0.5_p1.ebuild index d180343f34a8..caf4f6353347 100644 --- a/app-text/qpdfview/qpdfview-0.4.18.ebuild +++ b/app-text/qpdfview/qpdfview-0.5_p1.ebuild @@ -1,18 +1,19 @@ -# 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 -PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW" +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" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" +# revision 2161 +SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux" +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 )" @@ -42,13 +43,15 @@ DEPEND="${RDEPEND}" DOCS=( CHANGES CONTRIBUTORS README TODO ) -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 726064 +PATCHES=( + "${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch +) src_prepare() { default local mylrelease="$(qt5_get_bindir)"/lrelease - prepare_locale() { + p_locale() { "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed" } @@ -57,7 +60,7 @@ src_prepare() { } plocale_find_changes translations ${PN}_ .ts - plocale_for_each_locale prepare_locale + plocale_for_each_locale p_locale plocale_for_each_disabled_locale rm_help # adapt for prefix 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 b0e3f1c2ec3e..fe3f1ccb63c1 100644 --- a/app-text/rarian/Manifest +++ b/app-text/rarian/Manifest @@ -1,2 +1 @@ -DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000 -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-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild deleted file mode 100644 index 7e123ebc5c1b..000000000000 --- a/app-text/rarian/rarian-0.8.1-r3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils - -DESCRIPTION="A documentation metadata library" -HOMEPAGE="https://rarian.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz - https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-r3-patches.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libxslt - dev-libs/tinyxml - || ( - sys-apps/util-linux - app-misc/getopt ) -" -DEPEND="${RDEPEND} - !<app-text/scrollkeeper-9999 -" - -DOCS=( ChangeLog NEWS README ) - -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 -) - -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 \ - $(use_enable static-libs static) \ - ${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/Manifest b/app-text/recode/Manifest index 967ebb61d834..4f4570366e0c 100644 --- a/app-text/recode/Manifest +++ b/app-text/recode/Manifest @@ -1 +1,3 @@ -DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c +DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f63b0e0ef061dcff95c15ff4ed82a3b7bb72f6abb29f85588476a76cb5d50151ca9e3f857c2c1c09727ccdd2890 SHA512 365602bf7b20e5362d13d1ab5269419f7f0838fb81dc01c466ea99c38eb1b979f8d707d24ca3dabbd3a0c65cde97704b570007ac60689d88bbafd33351d37d95 +DIST recode-3.7.13.tar.gz 2400432 BLAKE2B 457ba7855aeb5ae8b0cc32ee82b5b61b1b46ba2908406c0c10a76ae242343f421e81038b9bb6784089e8e3e687ecc0f61a6263c24f6b234962f94853e9359734 SHA512 af86754ed2ed1dc414f1dd7ab3564d606abb309766fb02bf085e56241527a74ac7141617956d01b0797e8e426cfb39ec597bd221d8ad58d9246e96b228e65b00 +DIST recode-3.7.14.tar.gz 2297471 BLAKE2B c353c287f0eb8fd461f1a98b47bb6e24067051edf4ef40badb5598b242aad4f560d1097ea826db8dc7f24206a86cc58207090fe746da2be6cd11e5b3d5961567 SHA512 ca0e9aa392f0571cfd1cf9566a15d7651a80edf40d603eadaa4c4ee2d7843ffa9d6074be30a21dac2ab192fe601f8581721d719d055911eeccb455acfe112596 diff --git a/app-text/recode/files/recode-3.7.13-no-help2man.patch b/app-text/recode/files/recode-3.7.13-no-help2man.patch new file mode 100644 index 000000000000..bc493d429e28 --- /dev/null +++ b/app-text/recode/files/recode-3.7.13-no-help2man.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/890256 +https://github.com/rrthomas/recode/commit/dcdd5d26c0c2c49f8113b63186449d6a1e3a509e + +From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001 +From: Reuben Thomas <rrt@sc3d.org> +Date: Fri, 6 Jan 2023 20:11:03 +0100 +Subject: [PATCH] src/Makefile.am: allow build without help2man + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits + bin_PROGRAMS = recode + lib_LTLIBRARIES = librecode.la + noinst_LTLIBRARIES = libmerged.la +-man_MANS = recode.1 ++dist_man_MANS = recode.1 + include_HEADERS = recode.h recodext.h + + H_STEPS = common.h decsteps.h inisteps.h tersteps.h \ +@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS) + # Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise + # we break parallel builds, as libmerged.la can be built twice in parallel, + # which can fail. +-recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT) ++recode.1: main.c $(top_srcdir)/configure.ac + ## Exit gracefully if recode.1 is not writeable, such as during distcheck! + $(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \ + $(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \ + --name="converts files between character sets" \ +- --output=$@ ./recode; \ ++ --output=$@ ./recode$(EXEEXT); \ + fi + + main.o: main.c ../config.status +@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip + stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF) + $(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF) + @echo timestamp > $(srcdir)/$@ +- +-DISTCLEANFILES = recode.1 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,5 +1,5 @@ + # Makefile for Recode regression tests. +-# Copyright © 1996-2022 Free Software Foundation, Inc. ++# Copyright © 1996-2023 Free Software Foundation, Inc. + # François Pinard <pinard@iro.umontreal.ca>, 1988. + + # This program is free software; you can redistribute it and/or modify + diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.12-r1.ebuild index 84f579555f3b..f1022f1199c3 100644 --- a/app-text/recode/recode-3.7.9.ebuild +++ b/app-text/recode/recode-3.7.12-r1.ebuild @@ -1,11 +1,11 @@ -# 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 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit flag-o-matic python-any-r1 toolchain-funcs +inherit autotools flag-o-matic python-any-r1 toolchain-funcs DESCRIPTION="Convert files between various character sets" HOMEPAGE="https://github.com/rrthomas/recode" @@ -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 ~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 ) @@ -34,9 +34,16 @@ BDEPEND=" " python_check_deps() { - if use test ; then - has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1 - fi + python_has_version "dev-python/cython[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf } src_configure() { @@ -45,8 +52,11 @@ src_configure() { # on solaris -lintl is needed to compile [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl" - # --without-included-gettext means we always use system headers - # and library + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + econf \ $(use_enable nls) \ --disable-static @@ -54,5 +64,6 @@ src_configure() { src_install() { default + find "${ED}" -name '*.la' -delete || die } diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild new file mode 100644 index 000000000000..1e3a064b1bd6 --- /dev/null +++ b/app-text/recode/recode-3.7.13.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools flag-o-matic python-any-r1 toolchain-funcs + +DESCRIPTION="Convert files between various character sets" +HOMEPAGE="https://github.com/rrthomas/recode" +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" +IUSE="nls test" +RESTRICT="!test? ( test )" + +RDEPEND="virtual/libiconv" +DEPEND=" + ${RDEPEND} + app-alternatives/lex +" +BDEPEND=" + nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-no-help2man.patch +) + +python_check_deps() { + python_has_version "dev-python/cython[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC LD + + # on solaris -lintl is needed to compile + [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl" + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + econf \ + $(use_enable nls) \ + --disable-static +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-text/recode/recode-3.7.14.ebuild b/app-text/recode/recode-3.7.14.ebuild new file mode 100644 index 000000000000..5c79c92e8c65 --- /dev/null +++ b/app-text/recode/recode-3.7.14.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools flag-o-matic python-any-r1 toolchain-funcs + +DESCRIPTION="Convert files between various character sets" +HOMEPAGE="https://github.com/rrthomas/recode" +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" +IUSE="nls test" +RESTRICT="!test? ( test )" + +RDEPEND="virtual/libiconv" +DEPEND=" + ${RDEPEND} + app-alternatives/lex +" +BDEPEND=" + nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + python_has_version "dev-python/cython[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC LD + + # On Solaris, -lintl is needed to compile + [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl" + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + econf $(use_enable nls) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} 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 7e0fdf2ad557..624ca952093e 100644 --- a/app-text/restview/Manifest +++ b/app-text/restview/Manifest @@ -1 +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/metadata.xml b/app-text/restview/metadata.xml index 1ad1d969aa96..f8194520164f 100644 --- a/app-text/restview/metadata.xml +++ b/app-text/restview/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">restview</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">mgedmin/restview</remote-id> + <remote-id type="pypi">restview</remote-id> + </upstream> </pkgmetadata> 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 3fc4f8ba95de..000000000000 --- a/app-text/restview/restview-2.9.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..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 new file mode 100644 index 000000000000..b26aed69c63b --- /dev/null +++ b/app-text/restview/restview-3.0.0.ebuild @@ -0,0 +1,29 @@ +# 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..11} ) + +inherit distutils-r1 pypi + +DESCRIPTION="reStructuredText viewer" +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}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/readme-renderer[${PYTHON_USEDEP}] +" + +DOCS=( README.rst CHANGES.rst ) + +distutils_enable_tests pytest 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 948f2049b1d1..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-2021 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 ~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 ca711dad946f..86ed0c9de3fc 100644 --- a/app-text/rnc2rng/Manifest +++ b/app-text/rnc2rng/Manifest @@ -1,2 +1,2 @@ -DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378 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/metadata.xml b/app-text/rnc2rng/metadata.xml index 203ef464f5e8..03867676a63c 100644 --- a/app-text/rnc2rng/metadata.xml +++ b/app-text/rnc2rng/metadata.xml @@ -2,9 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>djc@gentoo.org</email> - <name>Dirkjan Ochtman</name> + <email>ulm@gentoo.org</email> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">djc/rnc2rng</remote-id> <remote-id type="pypi">rnc2rng</remote-id> diff --git a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild index e0475ed01e28..6128abda57bf 100644 --- a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild +++ b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild @@ -1,28 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) - -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 +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" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" - -DEPEND="dev-python/rply[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - RESTRICT="!test? ( test )" +RDEPEND="dev-python/rply[${PYTHON_USEDEP}]" +BDEPEND="test? ( ${RDEPEND} )" + python_test() { - "${PYTHON}" test.py + "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}" } diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild index 2c7a835ba983..6128abda57bf 100644 --- a/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild +++ b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild @@ -1,26 +1,24 @@ -# 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 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 +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" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" - -DEPEND="dev-python/rply[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - RESTRICT="!test? ( test )" +RDEPEND="dev-python/rply[${PYTHON_USEDEP}]" +BDEPEND="test? ( ${RDEPEND} )" + python_test() { - "${PYTHON}" test.py + "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}" } diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml index 581faaa017c3..435382f3cbd2 100644 --- a/app-text/rnv/metadata.xml +++ b/app-text/rnv/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>sping@gentoo.org</email> + <name>Sebastian Pipping</name> + </maintainer> <upstream> <remote-id type="sourceforge">rnv</remote-id> </upstream> diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild index 1ca31dcce3d1..2080768a9ae5 100644 --- a/app-text/rnv/rnv-1.7.11-r1.ebuild +++ b/app-text/rnv/rnv-1.7.11-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 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" @@ -26,7 +26,9 @@ src_prepare() { src_configure() { LIBS="-ldl -lm" \ - econf --with-scm="/usr" + econf \ + --with-scm-inc="/usr/include" \ + --with-scm-lib="/usr/$(get_libdir)" } src_install() { diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest new file mode 100644 index 000000000000..5a7001dc6a9c --- /dev/null +++ b/app-text/ronn-ng/Manifest @@ -0,0 +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/metadata.xml b/app-text/ronn-ng/metadata.xml index 62ac5e34fda8..34c0224a9905 100644 --- a/app-text/ronn/metadata.xml +++ b/app-text/ronn-ng/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Ruby Project</name> </maintainer> <upstream> - <remote-id type="github">rtomayko/ronn</remote-id> + <remote-id type="github">apjanke/ronn-ng</remote-id> </upstream> </pkgmetadata> 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-r3.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild new file mode 100644 index 000000000000..52d4f1f76746 --- /dev/null +++ b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby27 ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES 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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~arm64-macos" + +IUSE="" + +RDEPEND+="!app-text/ronn" + +DEPS=" + >=dev-ruby/kramdown-2.1:2 + >=dev-ruby/nokogiri-1.9.0:0 +" + +ruby_add_rdepend " + =dev-ruby/mustache-1* + ${DEPS} +" + +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 + 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 +} + +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() { + all_fakegem_install + + doman man/ronn.1 man/ronn-format.7 +} 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/ronn-0.7.3-r4.ebuild b/app-text/ronn/ronn-0.7.3-r4.ebuild deleted file mode 100644 index 6ac4adfb937d..000000000000 --- a/app-text/ronn/ronn-0.7.3-r4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - -IUSE="" - -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 c439d5104780..663bf3fe4630 100644 --- a/app-text/rpl/Manifest +++ b/app-text/rpl/Manifest @@ -1,2 +1,3 @@ -DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add +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/rpl/rpl-1.6.7.ebuild b/app-text/rpl/rpl-1.6.7.ebuild deleted file mode 100644 index 1cee4fcbd692..000000000000 --- a/app-text/rpl/rpl-1.6.7.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8} ) - -inherit distutils-r1 - -DESCRIPTION="Intelligent recursive search/replace utility" -HOMEPAGE="http://rpl.sourceforge.net/" -SRC_URI="http://deb.debian.org/debian/pool/main/r/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -#python_prepare_all() { -# iconv -f latin1 -t utf8 -o setup.py.new setup.py || die -# mv setup.py.new setup.py || die -# distutils-r1_python_prepare_all -#} -# -#python_install_all() { -# distutils-r1_python_install_all -# doman ${PN}.1 -#} diff --git a/app-text/rpl/rpl-1.9.1.ebuild b/app-text/rpl/rpl-1.9.1.ebuild index fb8fe14b615f..8cbb8fa54646 100644 --- a/app-text/rpl/rpl-1.9.1.ebuild +++ b/app-text/rpl/rpl-1.9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit distutils-r1 diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild index f48b71d62643..09aa4b9a8dd4 100644 --- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild +++ b/app-text/rtf2html/rtf2html-0.2.0-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="RTF to HTML converter" HOMEPAGE="http://rtf2html.sourceforge.net/" -SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/rtf2html/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" 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/metadata.xml b/app-text/sablotron/metadata.xml index 85e4ed814fa2..5e2c2974f79d 100644 --- a/app-text/sablotron/metadata.xml +++ b/app-text/sablotron/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="sourceforge">sablotron</remote-id> + </upstream> </pkgmetadata> 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 ff8bbbe77fc6..c0a6b67afccb 100644 --- a/app-text/scdoc/Manifest +++ b/app-text/scdoc/Manifest @@ -1,2 +1 @@ -DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49 -DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de +DIST scdoc-1.11.3.tar.gz 12768 BLAKE2B c39ed51f9279aa8a08bbd99a3d3780ef37654a37f687c7de340266d9c7a6edceb8f6824baaa34c756440d45bd51611ab28f7f2e42ea632b943f6018d6e5f5a04 SHA512 fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9 diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml index c627ee66d570..4160f5fe1fa2 100644 --- a/app-text/scdoc/metadata.xml +++ b/app-text/scdoc/metadata.xml @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> <maintainer type="person"> - <email>bman@gentoo.org</email> - <name>Aaron Bauman</name> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> </maintainer> <upstream> - <remote-id type="github">swaywm/sway</remote-id> + <remote-id type="sourcehut">~sircmpwn/scdoc</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild deleted file mode 100644 index edae9c69b757..000000000000 --- a/app-text/scdoc/scdoc-1.11.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Standalone tool for generating man pages with a simple syntax" -HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc" - inherit git-r3 -else - SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -src_prepare() { - default - - sed -e 's/-Werror//' \ - -i Makefile || die 'Failed to patch Makefile' -} - -src_compile() { - local MY_HS="./scdoc" - if tc-is-cross-compiler; then - tc-export_build_env - MY_HS="./hostscdoc" - emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \ - CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}" - mv scdoc hostscdoc || die 'Failed to rename host scdoc' - fi - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install -} diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.3.ebuild index 9460e30e3a9a..e8aa2def5372 100644 --- a/app-text/scdoc/scdoc-1.11.0.ebuild +++ b/app-text/scdoc/scdoc-1.11.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 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 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ~ppc64 x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86" fi LICENSE="MIT" @@ -35,10 +35,11 @@ src_compile() { CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}" mv scdoc hostscdoc || die 'Failed to rename host scdoc' fi + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" } src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install + PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install } diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild index d162fe258aaf..938aa8493a7c 100644 --- a/app-text/scdoc/scdoc-9999.ebuild +++ b/app-text/scdoc/scdoc-9999.ebuild @@ -1,7 +1,7 @@ -# 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 toolchain-funcs @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="MIT" @@ -35,10 +35,11 @@ src_compile() { CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}" mv scdoc hostscdoc || die 'Failed to rename host scdoc' fi - emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" + + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" } src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \ - PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install + 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-r1.ebuild deleted file mode 100644 index 84cbc50be67e..000000000000 --- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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}" - -LICENSE="FDL-1.1" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/libxml2-2.4.19" -DEPEND="${RDEPEND} - !<app-text/scrollkeeper-9999-r1" - -S="${WORKDIR}" - -src_unpack() { :; } - -src_configure() { :; } - -src_compile() { :; } - -src_install() { - insinto /usr/share/xml/scrollkeeper/dtds - doins "${DISTDIR}/${DTD_FILE}" -} - -pkg_postinst() { - einfo "Installing catalog..." - - # Install regular DOCTYPE catalog entry - "${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 - - # Install catalog entry for calls like: xmllint --dtdvalid URL ... - "${EROOT}"usr/bin/xmlcatalog --noout --add "system" \ - "${SRC_URI}" \ - "${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 -} diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild new file mode 100644 index 000000000000..850565cc4b1b --- /dev/null +++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DTD_FILE="scrollkeeper-omf.dtd" + +DESCRIPTION="DTD from the Scrollkeeper package" +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" + +RDEPEND=">=dev-libs/libxml2-2.4.19" +DEPEND="${RDEPEND}" + +src_unpack() { :; } + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + insinto /usr/share/xml/scrollkeeper/dtds + doins "${DISTDIR}/${DTD_FILE}" +} + +pkg_postinst() { + einfo "Installing catalog..." + + # Install regular DOCTYPE catalog entry + "${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 + + # Install catalog entry for calls like: xmllint --dtdvalid URL ... + "${EROOT}"/usr/bin/xmlcatalog --noout --add "system" \ + "${SRC_URI}" \ + "${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 +} diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest index a57a7f83880a..0425d328344b 100644 --- a/app-text/sdcv/Manifest +++ b/app-text/sdcv/Manifest @@ -1 +1 @@ -DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442 +DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81 SHA512 6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21 diff --git a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch deleted file mode 100644 index e3583b1a5fb6..000000000000 --- a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch +++ /dev/null @@ -1,112 +0,0 @@ -ommit 4ae420734990ab9f5ccc038262368256b9323f4a -Merge: b66799f 994c1c7 -Author: Evgeniy Dushistov <dushistov@mail.ru> -Date: Wed Dec 23 04:30:13 2020 +0300 - - Merge pull request #67 from doozan/master - - Use binary search for synonyms, fixes #31 - -diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp -index 0af4304..6b1f92b 100644 ---- a/src/stardict_lib.cpp -+++ b/src/stardict_lib.cpp -@@ -833,21 +833,23 @@ bool SynFile::load(const std::string &url, gulong wc) - { - struct stat stat_buf; - if (!stat(url.c_str(), &stat_buf)) { -- MapFile syn; -- if (!syn.open(url.c_str(), stat_buf.st_size)) -+ -+ if (!synfile.open(url.c_str(), stat_buf.st_size)) - return false; -- const gchar *current = syn.begin(); -+ -+ synlist.resize(wc + 1); -+ gchar *p1 = synfile.begin(); -+ - for (unsigned long i = 0; i < wc; i++) { - // each entry in a syn-file is: - // - 0-terminated string - // 4-byte index into .dict file in network byte order -- glib::CharStr lower_string{ g_utf8_casefold(current, -1) }; -- std::string synonym{ get_impl(lower_string) }; -- current += synonym.length() + 1; -- const guint32 idx = g_ntohl(get_uint32(current)); -- current += sizeof(idx); -- synonyms[synonym] = idx; -+ -+ synlist[i] = p1; -+ p1 += strlen(p1) + 1 + 4; - } -+ synlist[wc] = p1; -+ - return true; - } else { - return false; -@@ -856,13 +858,38 @@ bool SynFile::load(const std::string &url, gulong wc) - - bool SynFile::lookup(const char *str, glong &idx) - { -- glib::CharStr lower_string{ g_utf8_casefold(str, -1) }; -- auto it = synonyms.find(get_impl(lower_string)); -- if (it != synonyms.end()) { -- idx = it->second; -- return true; -+ bool bFound = false; -+ glong iTo = synlist.size() - 2; -+ if (iTo <0) return false; -+ -+ if (stardict_strcmp(str, get_key(0)) < 0) { -+ idx = 0; -+ } else if (stardict_strcmp(str, get_key(iTo)) > 0) { -+ idx = INVALID_INDEX; -+ } else { -+ glong iThisIndex = 0; -+ glong iFrom = 0; -+ gint cmpint; -+ while (iFrom <= iTo) { -+ iThisIndex = (iFrom + iTo) / 2; -+ cmpint = stardict_strcmp(str, get_key(iThisIndex)); -+ if (cmpint > 0) -+ iFrom = iThisIndex + 1; -+ else if (cmpint < 0) -+ iTo = iThisIndex - 1; -+ else { -+ bFound = true; -+ break; -+ } -+ } -+ if (!bFound) -+ idx = iFrom; //next -+ else { -+ const gchar *key = get_key(iThisIndex); -+ idx = g_ntohl(get_uint32(key+strlen(key)+1)); -+ } - } -- return false; -+ return bFound; - } - - bool Dict::Lookup(const char *str, glong &idx) -diff --git a/src/stardict_lib.hpp b/src/stardict_lib.hpp -index a629cbe..38f76f4 100644 ---- a/src/stardict_lib.hpp -+++ b/src/stardict_lib.hpp -@@ -102,11 +102,15 @@ public: - class SynFile - { - public: -+ SynFile() {} -+ ~SynFile() {} - bool load(const std::string &url, gulong wc); - bool lookup(const char *str, glong &idx); -+ const gchar *get_key(glong idx) { return synlist[idx]; } - - private: -- std::map<std::string, gulong> synonyms; -+ MapFile synfile; -+ std::vector<gchar *> synlist; - }; - - class Dict : public DictBase 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.3.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild index 8f7ae8fc46d8..3e098b509d52 100644 --- a/app-text/sdcv/sdcv-0.5.3.ebuild +++ b/app-text/sdcv/sdcv-0.5.4.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 @@ -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 )" @@ -30,7 +30,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.5.3-t_list.patch" "${FILESDIR}/${PN}-t_interactive.patch" - "${FILESDIR}/${PN}-synonyms-bin-search.patch" ) src_prepare() { 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 d8abdc835b6a..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-2021 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 ~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/sgrep/files/sgrep-1.94a-clang16.patch b/app-text/sgrep/files/sgrep-1.94a-clang16.patch new file mode 100644 index 000000000000..8892f79bbb01 --- /dev/null +++ b/app-text/sgrep/files/sgrep-1.94a-clang16.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/871036 +--- a/sgrep.h ++++ b/sgrep.h +@@ -20,2 +20,3 @@ + #include <stdlib.h> ++#include <string.h> + #include <assert.h> +@@ -616,2 +617,3 @@ + int create_index(const IndexOptions *options); ++int index_query(IndexOptions *options, int argc, char *argv[]); + int add_region_to_index(struct IndexWriterStruct *writer, diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a-r2.ebuild index 9facab819c5c..de456e40df77 100644 --- a/app-text/sgrep/sgrep-1.94a.ebuild +++ b/app-text/sgrep/sgrep-1.94a-r2.ebuild @@ -1,20 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter" -SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz" HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html" +SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) src_prepare() { default - sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die + + sed -i "s:/usr/lib:${EPREFIX}/etc:g" sgrep.1 || die + + # Clang 16, bug #900533 + eautoreconf } src_configure() { @@ -25,6 +34,7 @@ src_install() { dobin sgrep doman sgrep.1 dodoc AUTHORS ChangeLog NEWS README sample.sgreprc + insinto /etc newins sample.sgreprc sgreprc } diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest index 83f5ccac4a7f..c51069537b76 100644 --- a/app-text/sigil/Manifest +++ b/app-text/sigil/Manifest @@ -1 +1,2 @@ -DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16 +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.7.0.ebuild b/app-text/sigil/sigil-1.7.0.ebuild deleted file mode 100644 index 56f93e6b73f0..000000000000 --- a/app-text/sigil/sigil-1.7.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -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/libpcre:3=[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=( - -DINSTALL_BUNDLED_DICTS=0 - -DUSE_SYSTEM_LIBS=1 - -DSYSTEM_LIBS_REQUIRED=1 - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - 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-2.1.0-r1.ebuild b/app-text/sigil/sigil-2.1.0-r1.ebuild new file mode 100644 index 000000000000..9de727940f0c --- /dev/null +++ b/app-text/sigil/sigil-2.1.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + 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" +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}] + ') + plugins? ( $(python_gen_cond_dep ' + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + 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} + virtual/pkgconfig + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) +" + +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}" + + -DUSE_QT5=$(usex !qt6) + -DINSTALL_BUNDLED_DICTS=0 + -DSYSTEM_LIBS_REQUIRED=1 + -DUSE_SYSTEM_LIBS=1 + ) + # use system-mathjax && mycmakeargs+=( -DMATHJAX3_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/ + + 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 c41fc396803b..000000000000 --- a/app-text/stardict/stardict-3.0.6-r4.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2020 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 - insinto /usr/share/doc/${PF}/dict - doins dict/doc/stardict-textual-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 - insinto /usr/share/doc/${PF}/tools - doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2} - 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 41900b018b60..000000000000 --- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2020 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 ~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 - insinto /usr/share/doc/${PF}/dict - doins dict/doc/stardict-textual-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 - insinto /usr/share/doc/${PF}/tools - doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2} - 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-modules/metadata.xml b/app-text/sword-modules/metadata.xml deleted file mode 100644 index 0f90da8d9af7..000000000000 --- a/app-text/sword-modules/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <stabilize-allarches/> - <use> - <flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag> - </use> -</pkgmetadata> diff --git a/app-text/sword-modules/sword-modules-2.5.ebuild b/app-text/sword-modules/sword-modules-2.5.ebuild deleted file mode 100644 index 072c374759c2..000000000000 --- a/app-text/sword-modules/sword-modules-2.5.ebuild +++ /dev/null @@ -1,580 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language" -HOMEPAGE="https://www.crosswire.org/sword/modules/" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~riscv ~x86" - -LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh" -IUSE="esoteric ${LANGS// / l10n_}" - -RDEPEND=" - || ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) - app-dicts/sword-Personal - esoteric? ( - app-dicts/sword-Phaistos - app-dicts/sword-Sentiment - ) - l10n_af? ( - app-dicts/sword-Afr1953 - ) - l10n_ar? ( - app-dicts/sword-AraNAV - app-dicts/sword-AraSVD - app-dicts/sword-alzat - ) - l10n_az? ( - app-dicts/sword-Azeri - app-dicts/sword-NorthernAzeri - ) - l10n_be? ( - app-dicts/sword-Bela - ) - l10n_bea? ( - app-dicts/sword-BeaMRK - ) - l10n_bg? ( - app-dicts/sword-BulVeren - ) - l10n_br? ( - app-dicts/sword-BretonNT - app-dicts/sword-br_en - ) - l10n_ceb? ( - app-dicts/sword-CebPinadayag - ) - l10n_ch? ( - app-dicts/sword-Chamorro - ) - l10n_chr? ( - app-dicts/sword-Che1860 - ) - l10n_ckb? ( - app-dicts/sword-Sorani - ) - l10n_cop? ( - app-dicts/sword-CopNT - app-dicts/sword-CopSahBible2 - app-dicts/sword-CopSahHorner - app-dicts/sword-CopSahidicMSS - app-dicts/sword-CopSahidica - app-dicts/sword-SahidicBible - ) - l10n_cs? ( - app-dicts/sword-CzeB21 - app-dicts/sword-CzeBKR - app-dicts/sword-CzeCEP - app-dicts/sword-CzeCSP - ) - l10n_cu? ( - app-dicts/sword-CSlElizabeth - ) - l10n_cy? ( - app-dicts/sword-WelBeiblNet - ) - l10n_da? ( - app-dicts/sword-DaNT1819 - app-dicts/sword-DaOT1871NT1907 - app-dicts/sword-DaOT1931NT1907 - ) - l10n_de? ( - app-dicts/sword-GerAlbrecht - app-dicts/sword-GerAugustinus - app-dicts/sword-GerBoLut - app-dicts/sword-GerElb1871 - app-dicts/sword-GerElb1905 - app-dicts/sword-GerGruenewald - app-dicts/sword-GerKingComm - app-dicts/sword-GerLeoNA28 - app-dicts/sword-GerLeoRP18 - app-dicts/sword-GerLutherpredigten - app-dicts/sword-GerMenge - app-dicts/sword-GerNeUe - app-dicts/sword-GerOffBiSt - app-dicts/sword-GerReinhardt - app-dicts/sword-GerSch - app-dicts/sword-GerTafel - app-dicts/sword-GerTextbibel - app-dicts/sword-GerZurcher - app-dicts/sword-MAK - app-dicts/sword-Rieger - ) - l10n_el? ( - app-dicts/sword-GreVamvas - ) - l10n_en? ( - app-dicts/sword-2BabDict - app-dicts/sword-AB - app-dicts/sword-ABP - app-dicts/sword-ABS_Essay_GoodSam_SWB - app-dicts/sword-ACV - app-dicts/sword-AKJV - app-dicts/sword-ASV - app-dicts/sword-Abbott - app-dicts/sword-AbbottSmith - app-dicts/sword-AbbottSmithStrongs - app-dicts/sword-AmTract - app-dicts/sword-Anderson - app-dicts/sword-BBE - app-dicts/sword-BDBGlosses_Strongs - app-dicts/sword-BWE - app-dicts/sword-BaptistConfession1646 - app-dicts/sword-BaptistConfession1689 - app-dicts/sword-Barnes - app-dicts/sword-Burkitt - app-dicts/sword-CBC - app-dicts/sword-CPDV - app-dicts/sword-Catena - app-dicts/sword-Cawdrey - app-dicts/sword-Clarke - app-dicts/sword-Common - app-dicts/sword-Concord - app-dicts/sword-DBD - app-dicts/sword-DRC - app-dicts/sword-DTN - app-dicts/sword-Daily - app-dicts/sword-Darby - app-dicts/sword-DarkNightOfTheSoul - app-dicts/sword-Diaglott - app-dicts/sword-Dodson - app-dicts/sword-EMBReality - app-dicts/sword-EMTV - app-dicts/sword-Easton - app-dicts/sword-Etheridge - app-dicts/sword-Family - app-dicts/sword-Finney - app-dicts/sword-Geneva - app-dicts/sword-Geneva1599 - app-dicts/sword-Godbey - app-dicts/sword-GodsWord - app-dicts/sword-Heretics - app-dicts/sword-Hitchcock - app-dicts/sword-ISBE - app-dicts/sword-ISV - app-dicts/sword-Imitation - app-dicts/sword-Institutes - app-dicts/sword-JCRHoliness - app-dicts/sword-JEAffections - app-dicts/sword-JESermons - app-dicts/sword-JFB - app-dicts/sword-JOChrist - app-dicts/sword-JOCommGod - app-dicts/sword-JOGlory - app-dicts/sword-JOMortSin - app-dicts/sword-JPS - app-dicts/sword-JST - app-dicts/sword-Josephus - app-dicts/sword-Jubilee2000 - app-dicts/sword-KD - app-dicts/sword-KJV - app-dicts/sword-KJVA - app-dicts/sword-KJVPCE - app-dicts/sword-KingComm - app-dicts/sword-LEB - app-dicts/sword-LITV - app-dicts/sword-LO - app-dicts/sword-LawGospel - app-dicts/sword-Leeser - app-dicts/sword-Lightfoot - app-dicts/sword-Luther - app-dicts/sword-MHC - app-dicts/sword-MHCC - app-dicts/sword-MKJV - app-dicts/sword-MLStrong - app-dicts/sword-MollColossians - app-dicts/sword-Montgomery - app-dicts/sword-Murdock - app-dicts/sword-NETfree - app-dicts/sword-NETnotesfree - app-dicts/sword-NETtext - app-dicts/sword-NHEB - app-dicts/sword-NHEBJE - app-dicts/sword-NHEBME - app-dicts/sword-Nave - app-dicts/sword-Noyes - app-dicts/sword-OEB - app-dicts/sword-OEBcth - app-dicts/sword-OSHM - app-dicts/sword-OrthJBC - app-dicts/sword-Orthodoxy - app-dicts/sword-PNT - app-dicts/sword-Packard - app-dicts/sword-Passion - app-dicts/sword-Pilgrim - app-dicts/sword-Practice - app-dicts/sword-QuotingPassages - app-dicts/sword-RKJNT - app-dicts/sword-RNKJV - app-dicts/sword-RWP - app-dicts/sword-RWebster - app-dicts/sword-RecVer - app-dicts/sword-Robinson - app-dicts/sword-Rotherham - app-dicts/sword-SAOA - app-dicts/sword-SME - app-dicts/sword-SPE - app-dicts/sword-Scofield - app-dicts/sword-Smith - app-dicts/sword-Spurious - app-dicts/sword-StrongsGreek - app-dicts/sword-StrongsHebrew - app-dicts/sword-TCR - app-dicts/sword-TDavid - app-dicts/sword-TFG - app-dicts/sword-TSK - app-dicts/sword-Torrey - app-dicts/sword-Twenty - app-dicts/sword-Tyndale - app-dicts/sword-UKJV - app-dicts/sword-Webster - app-dicts/sword-Webster1806 - app-dicts/sword-Webster1913 - app-dicts/sword-Wesley - app-dicts/sword-Westminster - app-dicts/sword-Westminster21 - app-dicts/sword-Weymouth - app-dicts/sword-Worsley - app-dicts/sword-Wycliffe - app-dicts/sword-YLT - ) - l10n_eo? ( - app-dicts/sword-Esperanto - ) - l10n_es? ( - app-dicts/sword-SpaPlatense - app-dicts/sword-SpaRV - app-dicts/sword-SpaRV1865 - app-dicts/sword-SpaRV1909 - app-dicts/sword-SpaRVG - app-dicts/sword-SpaTDP - app-dicts/sword-SpaVNT - ) - l10n_et? ( - app-dicts/sword-Est - ) - l10n_eu? ( - app-dicts/sword-BasHautin - app-dicts/sword-en_eu - ) - l10n_fa? ( - app-dicts/sword-FarHezareNoh - app-dicts/sword-FarOPV - app-dicts/sword-FarTPV - ) - l10n_fi? ( - app-dicts/sword-FinBiblia - app-dicts/sword-FinPR - app-dicts/sword-FinPR92 - app-dicts/sword-FinRK - app-dicts/sword-FinSTLK2017 - ) - l10n_fr? ( - app-dicts/sword-FreBBB - app-dicts/sword-FreBDM1707 - app-dicts/sword-FreBDM1744 - app-dicts/sword-FreBailly - app-dicts/sword-FreCJE - app-dicts/sword-FreCrampon - app-dicts/sword-FreDAW - app-dicts/sword-FreGBM - app-dicts/sword-FreGeneve1669 - app-dicts/sword-FreJND - app-dicts/sword-FreKhan - app-dicts/sword-FreLSN1872 - app-dicts/sword-FreLXX - app-dicts/sword-FreOltramare1874 - app-dicts/sword-FrePGR - app-dicts/sword-FrePilgrim - app-dicts/sword-FreSegond1910 - app-dicts/sword-FreStapfer1889 - app-dicts/sword-FreSynodale1921 - ) - l10n_ga? ( - app-dicts/sword-IriODomhnuill - ) - l10n_gd? ( - app-dicts/sword-ScotsGaelic - ) - l10n_gez? ( - app-dicts/sword-Geez - ) - l10n_got? ( - app-dicts/sword-Wulfila - ) - l10n_grc? ( - app-dicts/sword-ABPGRK - app-dicts/sword-Antoniades - app-dicts/sword-Byz - app-dicts/sword-Elzevir - app-dicts/sword-GreekHebrew - app-dicts/sword-LXX - app-dicts/sword-MorphGNT - app-dicts/sword-Nestle1904 - app-dicts/sword-OxfordTR - app-dicts/sword-SBLGNT - app-dicts/sword-SBLGNTApp - app-dicts/sword-TNT - app-dicts/sword-TR - app-dicts/sword-Tisch - app-dicts/sword-VarApp - app-dicts/sword-WHNU - app-dicts/sword-f35 - ) - l10n_gv? ( - app-dicts/sword-ManxGaelic - ) - l10n_he? ( - app-dicts/sword-Aleppo - app-dicts/sword-HebDelitzsch - app-dicts/sword-HebModern - app-dicts/sword-HebrewGreek - app-dicts/sword-MapM - app-dicts/sword-OSHB - app-dicts/sword-SP - app-dicts/sword-SPDSS - app-dicts/sword-SPMT - app-dicts/sword-SPVar - app-dicts/sword-WLC - ) - l10n_hi? ( - app-dicts/sword-HinERV - ) - l10n_hr? ( - app-dicts/sword-CroSaric - ) - l10n_ht? ( - app-dicts/sword-Haitian - ) - l10n_hu? ( - app-dicts/sword-HunIMIT - app-dicts/sword-HunKNB - app-dicts/sword-HunKar - app-dicts/sword-HunRUF - app-dicts/sword-HunUj - ) - l10n_hy? ( - app-dicts/sword-ArmEastern - app-dicts/sword-ArmWestern - ) - l10n_it? ( - app-dicts/sword-ItDizGreco - app-dicts/sword-ItNomiBibbia - app-dicts/sword-ItaDio - app-dicts/sword-ItaRive - ) - l10n_ja? ( - app-dicts/sword-JapBungo - app-dicts/sword-JapDenmo - app-dicts/sword-JapKougo - app-dicts/sword-JapMeiji - app-dicts/sword-JapRaguet - ) - l10n_kek? ( - app-dicts/sword-Kekchi - ) - l10n_kk? ( - app-dicts/sword-Kaz - ) - l10n_km? ( - app-dicts/sword-KhmerNT - ) - l10n_ko? ( - app-dicts/sword-KorHKJV - app-dicts/sword-KorRV - ) - l10n_kpg? ( - app-dicts/sword-Kapingamarangi - ) - l10n_ktu? ( - app-dicts/sword-KtuVb - ) - l10n_la? ( - app-dicts/sword-VulgClementine - app-dicts/sword-VulgConte - app-dicts/sword-VulgGlossa - app-dicts/sword-VulgHetzenauer - app-dicts/sword-VulgSistine - app-dicts/sword-Vulgate - app-dicts/sword-Vulgate_HebPs - app-dicts/sword-la_en - ) - l10n_ln? ( - app-dicts/sword-LinVB - ) - l10n_lt? ( - app-dicts/sword-LtKBB - ) - l10n_lv? ( - app-dicts/sword-Latvian - app-dicts/sword-LvGluck8 - ) - l10n_mg? ( - app-dicts/sword-Mg1865 - ) - l10n_mi? ( - app-dicts/sword-Maori - ) - l10n_ml? ( - app-dicts/sword-Mal1910 - ) - l10n_mn? ( - app-dicts/sword-MonKJV - ) - l10n_my? ( - app-dicts/sword-BurCBCM - app-dicts/sword-BurJudson - ) - l10n_nb? ( - app-dicts/sword-NorBroed - app-dicts/sword-Norsk - ) - l10n_nd? ( - app-dicts/sword-Ndebele - ) - l10n_nl? ( - app-dicts/sword-DutKant - app-dicts/sword-DutKingComm - app-dicts/sword-DutSVV - app-dicts/sword-DutSVVA - app-dicts/sword-NlCanisius1939 - ) - l10n_nn? ( - app-dicts/sword-NorSMB - ) - l10n_pl? ( - app-dicts/sword-PolGdanska - app-dicts/sword-PolUGdanska - ) - l10n_pon? ( - app-dicts/sword-PohnOld - app-dicts/sword-Pohnpeian - ) - l10n_pot? ( - app-dicts/sword-PotLykins - ) - l10n_ppk? ( - app-dicts/sword-Uma - ) - l10n_prs? ( - app-dicts/sword-Dari - ) - l10n_pt? ( - app-dicts/sword-PorAR - app-dicts/sword-PorAlmeida1911 - app-dicts/sword-PorBLivre - app-dicts/sword-PorBLivreTR - app-dicts/sword-PorCap - app-dicts/sword-PorIBP - ) - l10n_rmq? ( - app-dicts/sword-Calo - ) - l10n_ro? ( - app-dicts/sword-RomCor - ) - l10n_ru? ( - app-dicts/sword-RusCARS - app-dicts/sword-RusCARSA - app-dicts/sword-RusCARSADICT - app-dicts/sword-RusCARSDict - app-dicts/sword-RusCARST - app-dicts/sword-RusCARSTDICT - app-dicts/sword-RusMakarij - app-dicts/sword-RusSynodal - app-dicts/sword-RusSynodalLIO - app-dicts/sword-RusVZh - ) - l10n_sl? ( - app-dicts/sword-SloKJV - app-dicts/sword-SloOjacano - app-dicts/sword-SloStritar - ) - l10n_sml? ( - app-dicts/sword-sml_BL_2008 - ) - l10n_sn? ( - app-dicts/sword-Shona - ) - l10n_so? ( - app-dicts/sword-SomKQA - ) - l10n_sq? ( - app-dicts/sword-Alb - ) - l10n_sr? ( - app-dicts/sword-SrKDEkavski - app-dicts/sword-SrKDIjekav - ) - l10n_sv? ( - app-dicts/sword-Swe1917 - app-dicts/sword-Swe1917Of - app-dicts/sword-SweFolk1998 - app-dicts/sword-SweKarlXII - app-dicts/sword-SweKarlXII1873 - ) - l10n_sw? ( - app-dicts/sword-Swahili - ) - l10n_syr? ( - app-dicts/sword-Peshitta - ) - l10n_th? ( - app-dicts/sword-ThaiKJV - ) - l10n_tl? ( - app-dicts/sword-TagAngBiblia - app-dicts/sword-Tagalog - ) - l10n_tlh? ( - app-dicts/sword-KLV - app-dicts/sword-KLVen_iklingon - app-dicts/sword-KLViklingon_en - ) - l10n_tr? ( - app-dicts/sword-TurHADI - app-dicts/sword-TurNTB - ) - l10n_tsg? ( - app-dicts/sword-Tausug - ) - l10n_ug? ( - app-dicts/sword-UyCyr - ) - l10n_uk? ( - app-dicts/sword-UkrKulish - app-dicts/sword-Ukrainian - ) - l10n_ur? ( - app-dicts/sword-UrduGeo - app-dicts/sword-UrduGeoDeva - app-dicts/sword-UrduGeoRoman - ) - l10n_vi? ( - app-dicts/sword-FVDPVietAnh - app-dicts/sword-VieRobinson - app-dicts/sword-VieStrongsGreek - app-dicts/sword-Viet - app-dicts/sword-VietLCCMN - app-dicts/sword-VietLCCMNCT - app-dicts/sword-VietNVB - ) - l10n_vls? ( - app-dicts/sword-vlsJoNT - ) - l10n_zh? ( - app-dicts/sword-ChiNCVs - app-dicts/sword-ChiNCVt - app-dicts/sword-ChiSB - app-dicts/sword-ChiUn - app-dicts/sword-ChiUnL - app-dicts/sword-ChiUns - app-dicts/sword-ZhEnglish - app-dicts/sword-ZhHanzi - app-dicts/sword-ZhPinyin - ) -" diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild index 60349d5cfaf7..13eb01ab413e 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-2021 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://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~riscv x86 ~ppc-macos" +KEYWORDS="amd64 ~arm64 ~loong ~ppc ~riscv x86 ~ppc-macos" IUSE="clucene curl debug doc icu" RDEPEND="sys-libs/zlib diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest index 5b3ea2712360..be0bcf1f3e44 100644 --- a/app-text/t1utils/Manifest +++ b/app-text/t1utils/Manifest @@ -1,2 +1 @@ -DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch deleted file mode 100644 index db6f19549e5e..000000000000 --- a/app-text/t1utils/files/t1utils-1.41-memmem.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8 -Author: Eddie Kohler <ekohler@gmail.com> -Date: Wed Aug 16 12:37:34 2017 -0400 - - Check for memmem declaration; sometimes it is not declared by default. - -diff --git a/configure.ac b/configure.ac -index 5b4e3ff..b4dc4fb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,6 +19,7 @@ dnl strerror()? - dnl - - AC_REPLACE_FUNCS([strerror memmem]) -+AC_CHECK_DECLS([memmem]) - - - dnl -@@ -88,7 +89,7 @@ char* strerror(int errno); - #endif - - /* Prototype memmem if we don't have it. */ --#if !HAVE_MEMMEM -+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM - void* memmem(const void* haystack, size_t haystack_len, - const void* needle, size_t needle_len); - #endif diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml index 81930151803a..248f19d5be68 100644 --- a/app-text/t1utils/metadata.xml +++ b/app-text/t1utils/metadata.xml @@ -5,7 +5,7 @@ <email>aballier@gentoo.org</email> <name>Alexis Ballier</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>fonts@gentoo.org</email> <name>Fonts</name> </maintainer> diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild deleted file mode 100644 index 072c9c1ef29f..000000000000 --- a/app-text/t1utils/t1utils-1.41-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -LICENSE="BSD" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - !<media-libs/freetype-1.4_pre20080316" - -PATCHES=( - "${FILESDIR}"/${P}-memmem.patch -) -DOCS=( NEWS.md README.md ) - -src_prepare() { - default - eautoreconf -} diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild index 896f2c6e4720..28e57fb49920 100644 --- a/app-text/t1utils/t1utils-1.42.ebuild +++ b/app-text/t1utils/t1utils-1.42.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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 c77d8897bdec..6147418b0d58 100644 --- a/app-text/teckit/teckit-2.5.10.ebuild +++ b/app-text/teckit/teckit-2.5.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/teseq/metadata.xml b/app-text/teseq/metadata.xml index 85e4ed814fa2..f2d895595ee5 100644 --- a/app-text/teseq/metadata.xml +++ b/app-text/teseq/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="savannah">teseq</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild index d883e9719cd0..2026d8203407 100644 --- a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild +++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+osd" RDEPEND="!app-text/tessdata_best diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest index 0266650c7a4e..316b6b3f4802 100644 --- a/app-text/tesseract/Manifest +++ b/app-text/tesseract/Manifest @@ -1,2 +1,4 @@ -DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 -DIST tesseract-5.0.0_beta20210815.tar.gz 1914265 BLAKE2B eadefb46a84fcc73d3da7a1780d1e0669840183266176021871e57ca55c79e9b56a78334414732b9024ae911cee522069c3170bf71af877c46c1ffae37c88b3f SHA512 4b78af9119c35d783e47523b41ee8bbf63913f8c122e94b6e6538a4cbab8e751df9f00f3a50d48e8a7beb948c6b23794e2481721696bf3e0f284de8aa6e9e8e7 +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/files/tesseract-5.3.0-gcc-13.patch b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch new file mode 100644 index 000000000000..959948aa677c --- /dev/null +++ b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch @@ -0,0 +1,25 @@ +https://github.com/tesseract-ocr/tesseract/commit/2025b53de6b3d97285d7c5f80497493007c586c3 + +From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 30 Jan 2023 11:27:07 -0800 +Subject: [PATCH] Fix build with gcc 13 by including <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is +no longer transitively included [1]. Explicitly include it for +int32_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/ccutil/params.h ++++ b/src/ccutil/params.h +@@ -21,6 +21,7 @@ + + #include <tesseract/export.h> // for TESS_API + ++#include <cstdint> + #include <cstdio> + #include <cstring> + #include <string> + diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild index 2351e1f1609e..bca9d3973c0e 100644 --- a/app-text/tesseract/tesseract-4.1.1.ebuild +++ b/app-text/tesseract/tesseract-5.3.0.ebuild @@ -1,23 +1,23 @@ -# 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 multilib-minimal toolchain-funcs -DESCRIPTION="An OCR Engine, originally developed at HP, now open source." +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" +SLOT="0/5" KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="doc jpeg opencl openmp png static-libs tiff training webp" +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:0=[${MULTILIB_USEDEP}] + media-libs/tiff:=[${MULTILIB_USEDEP}] media-libs/leptonica:=[tiff] ) training? ( @@ -35,7 +35,11 @@ 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 +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -55,6 +59,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.0.0_beta20210815.ebuild b/app-text/tesseract/tesseract-5.3.2.ebuild index 0cd624612031..aff1d194ec10 100644 --- a/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild +++ b/app-text/tesseract/tesseract-5.3.2.ebuild @@ -1,14 +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 autotools multilib-minimal toolchain-funcs -DESCRIPTION="An OCR Engine, originally developed at HP, now open source." +DESCRIPTION="An OCR Engine, originally developed at HP, now open source" HOMEPAGE="https://github.com/tesseract-ocr" -BETA_PV=$(ver_rs 3-4 "-") -SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${BETA_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0/5" @@ -18,7 +17,7 @@ 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:0=[${MULTILIB_USEDEP}] + media-libs/tiff:=[${MULTILIB_USEDEP}] media-libs/leptonica:=[tiff] ) training? ( @@ -36,9 +35,7 @@ DEPEND="${COMMON_DEPEND} app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt - doc? ( app-doc/doxygen )" - -S=${WORKDIR}/${PN}-${BETA_PV} + doc? ( app-text/doxygen )" pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/app-text/tesseract/tesseract-5.3.3.ebuild b/app-text/tesseract/tesseract-5.3.3.ebuild new file mode 100644 index 000000000000..aff1d194ec10 --- /dev/null +++ b/app-text/tesseract/tesseract-5.3.3.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-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 3e7941c6798e..4c31653fca31 100644 --- a/app-text/tesseract/tesseract-9999.ebuild +++ b/app-text/tesseract/tesseract-9999.ebuild @@ -1,25 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools git-r3 multilib-minimal toolchain-funcs -DESCRIPTION="An OCR Engine, originally developed at HP, now open source." +DESCRIPTION="An OCR Engine, originally developed at HP, now open source" HOMEPAGE="https://github.com/tesseract-ocr" EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="" -IUSE="doc 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:0=[${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 @@ -55,7 +50,7 @@ multilib_src_configure() { local myeconfargs=( --enable-shared --disable-graphics - $(use_enable opencl) + $(use_enable float32) $(use_enable openmp) $(use_enable static-libs static) ) diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml index edfe97231997..5e7a2226a9ce 100644 --- a/app-text/texi2html/metadata.xml +++ b/app-text/texi2html/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>tex@gentoo.org</email> - <name>Gentoo TeX Project</name> -</maintainer> + <maintainer type="project"> + <email>tex@gentoo.org</email> + <name>Gentoo TeX Project</name> + </maintainer> + <upstream> + <remote-id type="savannah-nongnu">texi2html</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild index 6a6e7f94de22..3901e29fb5c1 100644 --- a/app-text/texi2html/texi2html-5.0-r1.ebuild +++ b/app-text/texi2html/texi2html-5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~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/files/texlive-core-2021-cairo-strings.patch b/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch new file mode 100644 index 000000000000..07ca8933facf --- /dev/null +++ b/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/853121 +https://bugs.gentoo.org/726200 +--- a/libs/cairo/m4/float.m4 ++++ b/libs/cairo/m4/float.m4 +@@ -22,23 +22,24 @@ AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], + # file, the target platform stores float words in big-endian order. If grep + # finds "seesnoon", float words are in little-endian order. If neither value + # is found, the user is instructed to specify the ordering. + + ax_cv_c_float_words_bigendian=unknown +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++AC_LINK_IFELSE([AC_LANG_SOURCE([[ + +-double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; ++double d __attribute__((used)) = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; ++int main() { return 0; } + + ]])], [ + + # allow users to override default 'strings' with 'llvm-strings' + # or ${CHOST}-strings. + AC_CHECK_TOOL([STRINGS], [strings]) +-if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then ++if $STRINGS - conftest | grep noonsees >/dev/null ; then + ax_cv_c_float_words_bigendian=yes + fi +-if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then ++if $STRINGS - conftest | grep seesnoon >/dev/null ; then + if test "$ax_cv_c_float_words_bigendian" = unknown; then + ax_cv_c_float_words_bigendian=no + else + ax_cv_c_float_words_bigendian=unknown + fi + diff --git a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch new file mode 100644 index 000000000000..8d5f421544f8 --- /dev/null +++ b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch @@ -0,0 +1,221 @@ +https://bugs.gentoo.org/874546 +https://bugs.gentoo.org/882245 + +https://github.com/TeX-Live/texlive-source/commit/3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a +https://github.com/TeX-Live/texlive-source/commit/60b60503b21ea43c68d1ffbe214141a79a36190b +https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7 + +From 3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Sat, 5 Nov 2022 15:43:53 +0000 +Subject: [PATCH] stdlib.h to placate clang16 + +git-svn-id: svn://tug.org/texlive/trunk/Build/source@64941 c570f23f-e606-0410-a88d-b1316a301751 +--- a/texk/dvisvgm/configure ++++ b/texk/dvisvgm/configure +@@ -23415,6 +23415,7 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdio.h> ++ #include <stdlib.h> + #include <ghostscript/iapi.h> + int main () { + gsapi_revision_t r; +--- a/texk/dvisvgm/configure.ac ++++ b/texk/dvisvgm/configure.ac +@@ -94,6 +94,7 @@ else + # query Ghostscript version + AC_MSG_CHECKING([Ghostscript version]) + AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h> ++ #include <stdlib.h> + #include <ghostscript/iapi.h> + int main () { + gsapi_revision_t r; +--- a/texk/kpathsea/configure ++++ b/texk/kpathsea/configure +@@ -14633,7 +14633,8 @@ then : + else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-int fork() { exit(1); } ++#include <stdlib.h> ++ int fork() { exit(1); } + int vfork() { exit(1); } + extern char *getcwd(); + char path[100]; +--- a/texk/kpathsea/configure.ac ++++ b/texk/kpathsea/configure.ac +@@ -45,7 +45,8 @@ if test "x$ac_cv_func_getcwd" = xyes; then + # We only need to run this if we have getcwd. + AC_CACHE_CHECK([whether getcwd uses fork or vfork], + [kb_cv_func_getcwd_forks], +- [AC_RUN_IFELSE([AC_LANG_PROGRAM([[int fork() { exit(1); } ++ [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h> ++ int fork() { exit(1); } + int vfork() { exit(1); } + extern char *getcwd(); + char path[100];]], + +From 60b60503b21ea43c68d1ffbe214141a79a36190b Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Sun, 6 Nov 2022 22:15:26 +0000 +Subject: [PATCH] void main, void args, more clang16 from sam + +git-svn-id: svn://tug.org/texlive/trunk/Build/source@64953 c570f23f-e606-0410-a88d-b1316a301751 +--- /dev/null ++++ b/libs/freetype2/TLpatches/patch-04-void-main +@@ -0,0 +1,13 @@ ++diff --git a/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/libs/freetype2/freetype-src/builds/unix/freetype2.m4 ++index 0cafc8e8c..51843f5fa 100644 ++--- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4 +++++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4 ++@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2], ++ #include <stdlib.h> ++ ++ int ++-main() +++main(void) ++ { ++ FT_Library library; ++ FT_Error error; +--- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4 ++++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4 +@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2], + #include <stdlib.h> + + int +-main() ++main(void) + { + FT_Library library; + FT_Error error; +--- /dev/null ++++ b/libs/gd/TLpatches/patch-03-void-main +@@ -0,0 +1,13 @@ ++diff --git a/libs/gd/libgd-src/tests/xpm/bug00185.c b/libs/gd/libgd-src/tests/xpm/bug00185.c ++index 3056ed950..37659d6a4 100644 ++--- a/libs/gd/libgd-src/tests/xpm/bug00185.c +++++ b/libs/gd/libgd-src/tests/xpm/bug00185.c ++@@ -5,7 +5,7 @@ ++ ++ /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */ ++ int ++-main() +++main(void) ++ { ++ gdImagePtr im; ++ char *path; +--- a/libs/gd/libgd-src/tests/xpm/bug00185.c ++++ b/libs/gd/libgd-src/tests/xpm/bug00185.c +@@ -5,7 +5,7 @@ + + /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */ + int +-main() ++main(void) + { + gdImagePtr im; + char *path; +--- a/texk/ps2pk/basename.c ++++ b/texk/ps2pk/basename.c +@@ -6,11 +6,12 @@ + * AUTHOR: Piet Tutelaers + * VERSION: 1.0 (Sept. 1995) + */ ++#include <stdlib.h> /* exit() */ + #include <stdio.h> /* printf() */ + #include "basics.h" /* fatal() */ + #include "filenames.h" /* basename() */ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + if (argc < 2 || argc > 3) + fatal("Usage: basename string [suffix]\n"); +--- a/utils/m-tx/mtx-src/prepmx.c ++++ b/utils/m-tx/mtx-src/prepmx.c +@@ -769,7 +769,7 @@ Static void topOfPMXfile(void) + } + + +-main(int argc, Char *argv[]) ++int main(int argc, Char *argv[]) + { /* ---- Main program ------------------------ */ + PASCAL_MAIN(argc, argv); + strcpy(this_version, version); +--- /dev/null ++++ b/utils/pmx/TLpatches/patch-01-main-ret +@@ -0,0 +1,13 @@ ++diff --git a/utils/pmx/pmx-src/libf2c/main.c b/utils/pmx/pmx-src/libf2c/main.c ++index 453974904..f485a0cd0 100644 ++--- a/utils/pmx/pmx-src/libf2c/main.c +++++ b/utils/pmx/pmx-src/libf2c/main.c ++@@ -106,7 +106,7 @@ char **xargv; ++ #ifdef KR_headers ++ main(argc, argv) int argc; char **argv; ++ #else ++-main(int argc, char **argv) +++int main(int argc, char **argv) ++ #endif ++ { ++ xargc = argc; +--- a/utils/pmx/pmx-src/libf2c/main.c ++++ b/utils/pmx/pmx-src/libf2c/main.c +@@ -106,7 +106,7 @@ char **xargv; + #ifdef KR_headers + main(argc, argv) int argc; char **argv; + #else +-main(int argc, char **argv) ++int main(int argc, char **argv) + #endif + { + xargc = argc; + +From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Thu, 2 Feb 2023 22:57:47 +0000 +Subject: [PATCH] avoid implicit wait and exit declarations for C99 + +git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751 +--- a/texk/xdvik/configure ++++ b/texk/xdvik/configure +@@ -15455,6 +15455,9 @@ else + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif ++#ifdef HAVE_SYS_WAIT_H ++#include <sys/wait.h> ++#endif + #ifdef HAVE_VFORK_H + #include <vfork.h> + #endif +@@ -15476,7 +15479,7 @@ main () + + while (wait(&status) != child) + ; +- exit( ++ _exit( + /* Was there some problem with vforking? */ + child < 0 + +--- a/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 ++++ b/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4 +@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK], + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif ++#ifdef HAVE_SYS_WAIT_H ++#include <sys/wait.h> ++#endif + #ifdef HAVE_VFORK_H + #include <vfork.h> + #endif]], +@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK], + + while (wait(&status) != child) + ; +- exit( ++ _exit( + /* Was there some problem with vforking? */ + child < 0 + diff --git a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch new file mode 100644 index 000000000000..4b026177b686 --- /dev/null +++ b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch @@ -0,0 +1,98 @@ +https://bugs.gentoo.org/775170 +https://tug.org/svn/texlive?view=revision&revision=61639 +--- a/texk/web2c/web2c/Makefile.in ++++ b/texk/web2c/web2c/Makefile.in +@@ -127,8 +127,7 @@ + libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS) + am_fixwrites_OBJECTS = fixwrites.$(OBJEXT) + fixwrites_OBJECTS = $(am_fixwrites_OBJECTS) +-am__DEPENDENCIES_1 = +-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1) ++fixwrites_DEPENDENCIES = $(web2c_LDADD) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -138,11 +137,11 @@ + makecpool_LDADD = $(LDADD) + am_splitup_OBJECTS = splitup.$(OBJEXT) + splitup_OBJECTS = $(am_splitup_OBJECTS) +-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1) ++splitup_DEPENDENCIES = $(web2c_LDADD) + am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \ + main.$(OBJEXT) + web2c_OBJECTS = $(am_web2c_OBJECTS) +-web2c_DEPENDENCIES = ++web2c_DEPENDENCIES = libweb2c.a + SCRIPTS = $(dist_noinst_SCRIPTS) + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +@@ -416,7 +415,7 @@ + main.c \ + web2c.h + +-web2c_LDADD = -L. -lweb2c ++web2c_LDADD = libweb2c.a + fixwrites_SOURCES = \ + fixwrites.c + +--- a/texk/web2c/web2c/Makefile.in ++++ b/texk/web2c/web2c/Makefile.in +@@ -127,7 +127,6 @@ + libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS) + am_fixwrites_OBJECTS = fixwrites.$(OBJEXT) + fixwrites_OBJECTS = $(am_fixwrites_OBJECTS) +-fixwrites_DEPENDENCIES = $(web2c_LDADD) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -137,11 +136,9 @@ + makecpool_LDADD = $(LDADD) + am_splitup_OBJECTS = splitup.$(OBJEXT) + splitup_OBJECTS = $(am_splitup_OBJECTS) +-splitup_DEPENDENCIES = $(web2c_LDADD) + am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \ + main.$(OBJEXT) + web2c_OBJECTS = $(am_web2c_OBJECTS) +-web2c_DEPENDENCIES = libweb2c.a + SCRIPTS = $(dist_noinst_SCRIPTS) + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +@@ -395,6 +392,7 @@ + AM_CFLAGS = $(WARNING_CFLAGS) + EXTRA_LIBRARIES = libweb2c.a + BUILT_SOURCES = w2c/config.h ++# + DISTCLEANFILES = w2c/config.h web2c-parser.output + noinst_HEADERS = coerce.h + dist_noinst_SCRIPTS = convert +@@ -415,14 +413,17 @@ + main.c \ + web2c.h + ++web2c_DEPENDENCIES = # don't build libweb2c.a in parallel + web2c_LDADD = libweb2c.a + fixwrites_SOURCES = \ + fixwrites.c + ++fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel + fixwrites_LDADD = $(web2c_LDADD) + splitup_SOURCES = \ + splitup.c + ++splitup_DEPENDENCIES = # don't build libweb2c.a in parallel + splitup_LDADD = $(web2c_LDADD) + makecpool_SOURCES = \ + makecpool.c +@@ -973,11 +974,8 @@ + fi + + $(libweb2c_a_OBJECTS): w2c/config.h +- + $(web2c_OBJECTS): web2c-parser.h stamp-lib +- + $(fixwrites_OBJECTS): stamp-lib +- + $(splitup_OBJECTS): stamp-lib + + stamp-lib: + diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml index 24e17b73aba6..692dea1fc9d2 100644 --- a/app-text/texlive-core/metadata.xml +++ b/app-text/texlive-core/metadata.xml @@ -14,4 +14,7 @@ <flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag> <flag name="xindy">Add support for Xindy: A general-purpose index processor.</flag> </use> + <upstream> + <remote-id type="github">TeX-Live/texlive-source</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/texlive-core/texlive-core-2021-r1.ebuild b/app-text/texlive-core/texlive-core-2021-r6.ebuild index 58d08c4cf2bf..7dae7935c65b 100644 --- a/app-text/texlive-core/texlive-core-2021-r1.ebuild +++ b/app-text/texlive-core/texlive-core-2021-r6.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 TL_SOURCE_VERSION=20210325 -inherit flag-o-matic toolchain-funcs libtool texlive-common +# autotools/reautoconf in src_prepare only needed for Cairo patch +inherit autotools flag-o-matic toolchain-funcs libtool texlive-common MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source @@ -16,9 +17,9 @@ HOMEPAGE="https://tug.org/texlive/" SLOT="0" LICENSE="GPL-2 LPPL-1.3c TeX" -SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/${MY_P}.tar.xz - https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz - https://dev.gentoo.org/~zlogene/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=" @@ -61,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/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/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/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 ~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 @@ -96,9 +97,9 @@ COMMON_DEPEND="${MODULAR_X_DEPEND} >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib:= - app-text/libpaper - dev-libs/gmp:0 - dev-libs/mpfr:0= + app-text/libpaper:= + dev-libs/gmp:= + dev-libs/mpfr:= >=dev-libs/ptexenc-1.3.8 xetex? ( >=app-text/teckit-2.5.3 @@ -110,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}" @@ -163,10 +164,16 @@ src_prepare() { texk/web2c/configure || die eapply "${WORKDIR}"/patches + eapply "${FILESDIR}"/${P}-cairo-strings.patch + eapply "${FILESDIR}"/${P}-slibtool.patch + eapply "${FILESDIR}"/${P}-clang-16.patch default elibtoolize + + # Drop this on 2022 bump! + "${B}"/reautoconf libs/cairo || die } src_configure() { @@ -182,6 +189,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 \ @@ -263,12 +273,13 @@ 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 # Mimic updmap --syncwithtrees to enable only fonts installed # Code copied from updmap script - for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do + for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do texlive-common_is_file_present_in_texmf "${i}" || echo "${i}" done > "${T}/updmap_update" { @@ -282,6 +293,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 @@ -351,6 +363,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-r7.ebuild b/app-text/texlive-core/texlive-core-2021-r7.ebuild new file mode 100644 index 000000000000..bd89b0fca8e3 --- /dev/null +++ b/app-text/texlive-core/texlive-core-2021-r7.ebuild @@ -0,0 +1,397 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +TL_SOURCE_VERSION=20210325 + +# autotools/reautoconf in src_prepare only needed for Cairo patch +inherit autotools 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/~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=" + 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 +" +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 +" +# 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/~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/~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/~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" +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 + >=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 + xetex? ( + >=app-text/teckit-2.5.3 + media-libs/fontconfig + ) + xindy? ( dev-lisp/clisp:= ) + media-libs/freetype:2 + >=dev-libs/icu-50:= + >=dev-libs/kpathsea-6.3.2:=" + +BDEPEND="sys-apps/ed + app-alternatives/lex + virtual/pkgconfig" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + >=app-text/ps2pkm-1.8_p20170524 + >=app-text/dvipsk-5.997 + >=dev-tex/bibtexu-3.71_p20170524 + 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 + )" + +S="${WORKDIR}/${P}_build" +B="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die "failed to create build dir" +} + +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 + mv "${i}" "${RELOC_TARGET}/${i%/*}" || die + done < "${T}/reloclist" + + mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files" + + cd "${B}" || die + + sed -i \ + -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \ + texk/web2c/configure || die + + 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" + + # 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 + + # 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 \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${S}" \ + --with-system-freetype2 \ + --with-system-zlib \ + --with-system-libpng \ + --with-system-teckit \ + --with-teckit-includes="${EPREFIX}"/usr/include/teckit \ + --with-system-kpathsea \ + --with-kpathsea-includes="${EPREFIX}"/usr/include \ + --with-system-icu \ + --with-system-ptexenc \ + --with-system-harfbuzz \ + --with-system-icu \ + --with-system-graphite2 \ + --with-system-cairo \ + --with-system-pixman \ + --with-system-zziplib \ + --with-system-libpaper \ + --with-system-gmp \ + --with-system-gd \ + --with-system-mpfr \ + --without-texinfo \ + --disable-dialog \ + --disable-multiplatform \ + --enable-chktex \ + --enable-epsfwin \ + --enable-detex \ + --enable-dvi2tty \ + --enable-mftalkwin \ + --enable-regiswin \ + --enable-shared \ + --enable-tektronixwin \ + --enable-unitermwin \ + --enable-vlna \ + --with-ps=gs \ + --disable-psutils \ + --disable-t1utils \ + --enable-ipc \ + --disable-biber \ + --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-build-in-source-tree \ + --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) +} + +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 + # 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 + texlive-common_is_file_present_in_texmf "${i}" || echo "${i}" + done > "${T}/updmap_update" + { + 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() { + 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 + 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 "${B}/texk" || die + dodoc ChangeLog README + + docinto dviljk + cd "${B}/texk/dviljk" || die + dodoc ChangeLog README NEWS + + docinto makeindexk + cd "${B}/texk/makeindexk" || die + dodoc ChangeLog NOTES README + + docinto web2c + cd "${B}/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 -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die + # Remove bundled and invalid updmap.cfg + rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die + + texlive-common_handle_config_files + + keepdir /usr/share/texmf-site + + # 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() { + etexmf-update + + einfo "Regenerating TeX formats" + fmtutil-sys --all &> /dev/null + + 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_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" + ewarn "in order to avoid possible problems" +} diff --git a/app-text/texlive-core/texlive-core-2023-r1.ebuild b/app-text/texlive-core/texlive-core-2023-r1.ebuild new file mode 100644 index 000000000000..5132353ada60 --- /dev/null +++ b/app-text/texlive-core/texlive-core-2023-r1.ebuild @@ -0,0 +1,487 @@ +# 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 + 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_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 ~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 + )" + +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} +" + +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 + ) +" + +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 + + sed -i \ + -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,$(pkg-config kpathsea --variable=includedir)\"," \ + texk/web2c/configure || die + + local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}" + eapply "${patch_dir}" + + default + + elibtoolize +} + +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 + + # 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 + cd "${BUILDDIR}" || die + ECONF_SOURCE="${S}" \ + econf -C \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${BUILDDIR}" \ + --with-system-freetype2 \ + --with-system-zlib \ + --with-system-libpng \ + --with-system-teckit \ + --with-teckit-includes="${EPREFIX}"/usr/include/teckit \ + --with-system-kpathsea \ + --with-kpathsea-includes="${EPREFIX}"/usr/include \ + --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 \ + --without-texinfo \ + --disable-dialog \ + --disable-multiplatform \ + --enable-chktex \ + --enable-epsfwin \ + --enable-detex \ + --enable-dvi2tty \ + --enable-mftalkwin \ + --enable-regiswin \ + --enable-shared \ + --enable-tektronixwin \ + --enable-unitermwin \ + --enable-vlna \ + --with-ps=gs \ + --disable-psutils \ + --disable-t1utils \ + --enable-ipc \ + --disable-biber \ + --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-build-in-source-tree \ + --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) \ + "${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 "${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 -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die + # Remove bundled and invalid updmap.cfg + rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die + + rm -f "${ED}/usr/bin/"{,u}ptex + + [[ -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 + # 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 + + 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" + ewarn "in order to avoid possible problems" +} 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..31dfa7b9c7bf --- /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 ~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 + )" + +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 b1eedb0fe042..446fbb70cc7a 100644 --- a/app-text/texlive/texlive-2021.ebuild +++ b/app-text/texlive/texlive-2021-r1.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" @@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/" LICENSE="metapackage" 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 ~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..71996e8da38f --- /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 ~riscv ~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/tidy-html5/Manifest b/app-text/tidy-html5/Manifest deleted file mode 100644 index 816c0efd3750..000000000000 --- a/app-text/tidy-html5/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1 -DIST tidy-html5-5.7.28.tar.gz 670474 BLAKE2B f1f030bda478f09f1786b34f62ac547249cbfe9d7d06aa7a3a07fb993ee64cf9911d04e4c487c9854e86493da08ef8ca5ee65faf0ce6473cd5914c74ad8c9251 SHA512 557cae0c00d581c9272649e0b3c143b70bc1941a59c497dd0b7266d70b3b2ff652dea075a855737d2d02ea58bb57d9403d61287c1ae40ec0281e7801991b57d7 diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild deleted file mode 100644 index e4bc1edc7095..000000000000 --- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents" -HOMEPAGE="https://www.html-tidy.org/" -SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -RDEPEND="!app-text/htmltidy" - -DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md ) - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - cmake_src_configure -} diff --git a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild deleted file mode 100644 index f3f78ced3cec..000000000000 --- a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents" -HOMEPAGE="https://www.html-tidy.org/" -SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -RDEPEND="!app-text/htmltidy" - -DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md ) - -src_configure() { - local mycmakeargs=( - -DTIDY_CONSOLE_SHARED=yes - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - cmake_src_configure -} diff --git a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28.ebuild deleted file mode 100644 index 2ac01ddec292..000000000000 --- a/app-text/tidy-html5/tidy-html5-5.7.28.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents" -HOMEPAGE="https://www.html-tidy.org/" -SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -RDEPEND="!app-text/htmltidy" - -DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md ) - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - cmake_src_configure -} diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r2.ebuild index 25b60f40b1ef..97256a448ef4 100644 --- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild +++ b/app-text/tkinfo/tkinfo-2.8-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Info Browser in TK" HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/" @@ -12,18 +12,14 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86" RDEPEND="dev-lang/tk" -DEPEND="sys-apps/sed" - -DOCS=( README ) src_prepare() { default - sed -i \ - -e "1 s:^.*:#!/usr/bin/wish:" tkinfo || \ - die "sed tkinfo failed" + sed -e "1 s:^.*:#!/usr/bin/env wish:" \ + -i tkinfo || die "sed tkinfo failed" } src_install() { - dobin "${PN}" - doman "${PN}.1" + dobin tkinfo + doman tkinfo.1 } diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild deleted file mode 100644 index 818ec72240da..000000000000 --- a/app-text/tkman/tkman-2.2-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=5 - -inherit desktop epatch - -DESCRIPTION="TkMan man and info page browser" -HOMEPAGE="http://tkman.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="~amd64 ppc sparc x86" -IUSE="" - -DEPEND=" - >=app-text/rman-3.1 - >=dev-lang/tcl-8.4:0 - >=dev-lang/tk-8.4:0 - " -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.2-gentoo.diff \ - "${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540 -} - -src_install() { - local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman ) - local HTML_DOCS=( manual.html ) - - dodir /usr/bin - default - - doicon contrib/TkMan.gif - - domenu "${FILESDIR}"/tkman.desktop -} diff --git a/app-text/tkman/tkman-2.2-r3.ebuild b/app-text/tkman/tkman-2.2-r3.ebuild new file mode 100644 index 000000000000..8340230d824c --- /dev/null +++ b/app-text/tkman/tkman-2.2-r3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Graphical, hypertex man and info page browser" +HOMEPAGE="https://sourceforge.net/projects/tkman/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ppc sparc x86" + +DEPEND=" + >=app-text/rman-3.1 + >=dev-lang/tcl-8.4:= + >=dev-lang/tk-8.4:= +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2-gentoo.diff \ + "${FILESDIR}"/${PN}-CVE-2008-5137.diff +) + +src_install() { + local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman ) + local HTML_DOCS=( manual.html ) + + dodir /usr/bin + default + + doicon contrib/TkMan.gif + + domenu "${FILESDIR}"/tkman.desktop +} diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest index c21c96fe2361..9ddc07d64b74 100644 --- a/app-text/trang/Manifest +++ b/app-text/trang/Manifest @@ -1 +1 @@ -DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26 +DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d diff --git a/app-text/trang/files/trang-20181222-build-fixes.patch b/app-text/trang/files/trang-20181222-build-fixes.patch new file mode 100644 index 000000000000..ef7118c650a1 --- /dev/null +++ b/app-text/trang/files/trang-20181222-build-fixes.patch @@ -0,0 +1,31 @@ +https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/javacc.dir/ + +Description: update local Java path +--- a/build.xml ++++ b/build.xml +@@ -1,6 +1,6 @@ + <project name="jing-trang" default="jar"> + +-<property name="lib.dir" value="lib"/> ++<property name="lib.dir" value="/usr/share/java"/> + <property name="build.dir" value="${basedir}/build"/> + <property name="doc.dir" value="${basedir}/doc"/> + +--- a/build.xsl ++++ b/build.xsl +@@ -23,15 +23,6 @@ + <target name="dummy"/> + <target name="init"> + <mkdir dir="{$build}"/> +- <exec executable="git"> +- <arg value="submodule"/> +- <arg value="update"/> +- <arg value="--init"/> +- <arg value="--recursive"/> +- </exec> +- <copy todir="{$doc}"> +- <fileset dir="relaxng.org/jclark" includes="**"/> +- </copy> + </target> + <xsl:for-each select="modules/module"> + <xsl:apply-templates select="document(concat('mod/', .,'/mod.xml'), .)/module"> diff --git a/app-text/trang/files/trang-20181222-unicode-data-path.patch b/app-text/trang/files/trang-20181222-unicode-data-path.patch new file mode 100644 index 000000000000..e1aaf5452f47 --- /dev/null +++ b/app-text/trang/files/trang-20181222-unicode-data-path.patch @@ -0,0 +1,15 @@ +Adapted from Debian. +https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/unicode.patch/ + +Description: update unicode path +--- a/mod/regex/mod.xml ++++ b/mod/regex/mod.xml +@@ -46,7 +46,7 @@ + failonerror="yes"> + <arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/> + <arg value="${build.dir}/mod/regex/gensrc/main"/> +- <arg value="${lib.dir}/UnicodeData-3.1.0.txt"/> ++ <arg value="@GENTOO_PORTAGE_EPREFIX@/usr/share/unicode-data/UnicodeData.txt"/> + <classpath> + <pathelement location="${build.dir}/mod/regex-gen/classes/main"/> + <pathelement location="${build.dir}/mod/util/classes/main"/> 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/trang/trang-20151127.ebuild b/app-text/trang/trang-20181222.ebuild index 55c73618b101..1bd1c56592c4 100644 --- a/app-text/trang/trang-20151127.ebuild +++ b/app-text/trang/trang-20181222.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846" - -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 prefix DESCRIPTION="Multi-format schema converter based on RELAX NG" HOMEPAGE="http://thaiopensource.com/relaxng/trang.html" -SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/jing-${P} + LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" @@ -17,26 +17,32 @@ KEYWORDS="amd64 x86" COMMON_DEP=" dev-java/xerces:2 dev-java/xml-commons-resolver:0" - RDEPEND=" - >=virtual/jre-1.7 + >=virtual/jre-1.8:* ${COMMON_DEP}" - DEPEND=" - >=virtual/jdk-1.7 + >=virtual/jdk-1.8:* dev-java/javacc:0 dev-java/saxon:6.5 dev-java/testng:0 ${COMMON_DEP}" - -S="${WORKDIR}/jing-${PN}-${COMMIT}" +BDEPEND="app-i18n/unicode-data" EANT_ANT_TASKS="testng" EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver" JAVA_ANT_REWRITE_CLASSPATH="yes" JAVA_PKG_BSFIX_NAME="build.xsl" -java_prepare() { +PATCHES=( + "${FILESDIR}"/${PN}-20181222-build-fixes.patch + "${FILESDIR}"/${PN}-20181222-unicode-data-path.patch +) + +src_prepare() { + default + + eprefixify mod/regex/mod.xml + java-pkg_clean echo "<version>${PV}</version>" > version.xml || die } @@ -47,7 +53,7 @@ src_configure() { # Because this crazy package uses XSLT, we need to escape this. sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die - EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}usr/share/javacc/lib" + EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}/usr/share/javacc/lib" export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5) } @@ -56,19 +62,10 @@ src_compile() { EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile } -src_install() { - java-pkg_dojar build/${PN}.jar - java-pkg_dolauncher ${PN} \ - --main com.thaiopensource.relaxng.translate.Driver - - docinto html - dodoc build/*.html -} - src_test() { - java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd - java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd - java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd + java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd || die + java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd || die + java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd || die md5sum -c <<EOF || die "Failed to verify md5sum" 4bcb454ade46c0188f809d2e8ce15315 ${FILESDIR}/test.xml @@ -77,3 +74,12 @@ d096c1fb462902e10a3440a604a21664 test/test.xsd fce355ca962cb063d7baa5d7fd571bcf test/test.dtd.xsd EOF } + +src_install() { + java-pkg_dojar build/${PN}.jar + java-pkg_dolauncher ${PN} \ + --main com.thaiopensource.relaxng.translate.Driver + + docinto html + dodoc build/*.html +} diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest index 22f905698518..f7761a570ad0 100644 --- a/app-text/tree/Manifest +++ b/app-text/tree/Manifest @@ -1 +1,2 @@ -DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695 +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/metadata.xml b/app-text/tree/metadata.xml index d8a49607812a..df2247ec43bd 100644 --- a/app-text/tree/metadata.xml +++ b/app-text/tree/metadata.xml @@ -6,7 +6,9 @@ <name>Jonas Stein</name> </maintainer> <upstream> - <changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog> + <changelog>https://gitlab.com/OldManProgrammer/unix-tree/-/blob/master/CHANGES</changelog> + <remote-id type="gitlab">OldManProgrammer/unix-tree</remote-id> + <remote-id type="github">Old-Man-Programmer/tree</remote-id> </upstream> <longdescription>Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild deleted file mode 100644 index 98111d9ab0f7..000000000000 --- a/app-text/tree/tree-1.8.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs flag-o-matic bash-completion-r1 - -DESCRIPTION="Lists directories recursively, and produces an indented listing of files" -HOMEPAGE="http://mama.indstate.edu/users/ice/tree/" -SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_prepare() { - sed -i -e 's:LINUX:__linux__:' tree.c || die - mv doc/tree.1.fr doc/tree.fr.1 - 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 \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin tree - doman doc/tree*.1 - einstalldocs - newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN} -} diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild new file mode 100644 index 000000000000..dd393b5c6efc --- /dev/null +++ b/app-text/tree/tree-2.1.0.ebuild @@ -0,0 +1,31 @@ +# 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.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 + newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN} +} 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.1.1.ebuild b/app-text/tree/tree-2.1.1.ebuild new file mode 100644 index 000000000000..dd393b5c6efc --- /dev/null +++ b/app-text/tree/tree-2.1.1.ebuild @@ -0,0 +1,31 @@ +# 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.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 + newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN} +} 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 f86a90004523..a6a15aa046a2 100644 --- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild +++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools - DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter" -HOMEPAGE="http://tug.org/texlive/" -SRC_URI="https://dev.gentoo.org/~zlogene/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 ~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. @@ -26,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 f06ad0f6aa3c..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-2020 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 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 9cd951b4e07b..3b4bb7d6b4b4 100644 --- a/app-text/txt2tags/Manifest +++ b/app-text/txt2tags/Manifest @@ -1 +1 @@ -DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b +DIST txt2tags-3.9.tar.gz 252334 BLAKE2B 2052af87989b636cc3ed99b3fa8f884abbb175a19af709396b96ede9f10afca4d6764651b3c35ce60e52dad687b8f9b7b7b31f6d01a23a58c7c328a084067f7b SHA512 f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml index 69b8e695a28a..adc2a73b4e28 100644 --- a/app-text/txt2tags/metadata.xml +++ b/app-text/txt2tags/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> + <stabilize-allarches/> <upstream> + <remote-id type="github">txt2tags/txt2tags</remote-id> <remote-id type="google-code">txt2tags</remote-id> + <remote-id type="pypi">txt2tags</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.9.ebuild index 8a244a869e9b..a493a4969d04 100644 --- a/app-text/txt2tags/txt2tags-3.7.ebuild +++ b/app-text/txt2tags/txt2tags-3.9.ebuild @@ -1,17 +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 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup" HOMEPAGE="https://txt2tags.org" SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 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 + "${EPYTHON}" run.py || die "Tests failed with ${EPYTHON}" +} diff --git a/app-text/u2ps/metadata.xml b/app-text/u2ps/metadata.xml index 675a0172f421..3f66d443492f 100644 --- a/app-text/u2ps/metadata.xml +++ b/app-text/u2ps/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> + <remote-id type="github">arsv/u2ps</remote-id> <remote-id type="sourceforge">u2ps.berlios</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild index fee2c8d8d145..7915104bafe9 100644 --- a/app-text/unac/unac-1.8.0.ebuild +++ b/app-text/unac/unac-1.8.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest index 17c2bd98c4ee..371e03985fd8 100644 --- a/app-text/unpaper/Manifest +++ b/app-text/unpaper/Manifest @@ -1 +1 @@ -DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c +DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484 diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml index b31f89c81133..e62ed22a3e73 100644 --- a/app-text/unpaper/metadata.xml +++ b/app-text/unpaper/metadata.xml @@ -1,9 +1,9 @@ <?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">Flameeyes/unpaper</remote-id> - <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to> - </upstream> + <!--maintainer-needed--> + <upstream> + <remote-id type="github">unpaper/unpaper</remote-id> + <bugs-to>https://github.com/unpaper/unpaper/issues</bugs-to> + </upstream> </pkgmetadata> diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild index 7b1433f52f43..77d0a4fbc40a 100644 --- a/app-text/unpaper/unpaper-6.1-r1.ebuild +++ b/app-text/unpaper/unpaper-7.0.0.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit meson if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git" - inherit git-r3 autotools + inherit git-r3 else SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" fi DESCRIPTION="Post-processor for scanned and photocopied book pages" @@ -17,18 +19,13 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper" LICENSE="GPL-2" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=">=media-video/ffmpeg-2:0=[encode]" -DEPEND="dev-libs/libxslt +DEPEND="${RDEPEND}" +BDEPEND=" app-text/docbook-xsl-ns-stylesheets - virtual/pkgconfig - ${RDEPEND}" - -# gcc can generate slightly different code that leads to slightly different -# images. Wait until we get a better testsuite. -RESTRICT="test" - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} + dev-libs/libxslt + dev-python/sphinx + test? ( dev-python/pytest ) +" diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild index cb59b6c27de1..a26b83763386 100644 --- a/app-text/unpaper/unpaper-9999.ebuild +++ b/app-text/unpaper/unpaper-9999.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit meson if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git" - inherit git-r3 autotools + inherit git-r3 else SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Post-processor for scanned and photocopied book pages" @@ -17,18 +19,13 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper" LICENSE="GPL-2" SLOT="0" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=">=media-video/ffmpeg-2:0=[encode]" -DEPEND="dev-libs/libxslt +DEPEND="${RDEPEND}" +BDEPEND=" app-text/docbook-xsl-ns-stylesheets - virtual/pkgconfig - ${RDEPEND}" - -# gcc can generate slightly different code that leads to slightly different -# images. Wait until we get a better testsuite. -RESTRICT="test" - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} + dev-libs/libxslt + dev-python/sphinx + test? ( dev-python/pytest ) +" diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml index aaab041e8885..a85206b18af2 100644 --- a/app-text/unrtf/metadata.xml +++ b/app-text/unrtf/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>robbat2@gentoo.org</email> -</maintainer> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="savannah">unrtf</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild index ff1b58b9c25c..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-2020 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 ~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-function-definitions-clang16.patch b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch new file mode 100644 index 000000000000..2ed3dd572be0 --- /dev/null +++ b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch @@ -0,0 +1,134 @@ +Clang16 will not allow implicit function declaration, implicit int etc. by default. +This patch overhauls the source code to build with clan16 defaults. + +Bug: https://bugs.gentoo.org/874960 + +Original patch by Pascal Jäger <pascal.jaeger@leimstift.de>, +minor adjustments by Hanno Böck. + +diff -Naurp a/inews/clientlib.c b/inews/clientlib.c +--- a/inews/clientlib.c 1996-06-06 21:41:07.000000000 +0200 ++++ b/inews/clientlib.c 2022-11-26 18:32:09.383423565 +0100 +@@ -14,6 +14,7 @@ static char *sccsid = "@(#)clientlib.c 1 + #include "../config.h" + #endif + ++#include <arpa/inet.h> + #include <stdio.h> + #ifndef FOR_NN + #include <sys/types.h> +@@ -52,6 +53,7 @@ static char *sccsid = "@(#)clientlib.c 1 + #endif + + #include "nntp.h" ++#include "clientlib.h" + + FILE *ser_rd_fp = NULL; + FILE *ser_wr_fp = NULL; +@@ -133,7 +135,7 @@ char *file; + * for reading and writing to server. + */ + +-server_init(machine) ++int server_init(machine) + char *machine; + { + int sockt_rd, sockt_wr; +@@ -194,7 +196,7 @@ char *machine; + * Errors: Printed via perror. + */ + +-get_tcp_socket(machine) ++int get_tcp_socket(machine) + char *machine; + { + int s; +@@ -218,7 +220,6 @@ char *machine; + * fails. + */ + if( (hp = gethostbyname( machine ) ) == NULL ) { +- unsigned long inet_addr(); + static struct hostent def; + static struct in_addr defaddr; + static char *alist[1]; +@@ -344,7 +345,7 @@ char *machine; + * Errors: Printed via nerror. + */ + +-get_dnet_socket(machine) ++int get_dnet_socket(machine) + char *machine; + { + int s, area, node; +@@ -427,7 +428,7 @@ char *machine; + * Side effects: None. + */ + +-handle_server_response(response, server) ++int handle_server_response(response, server) + int response; + char *server; + { +@@ -502,7 +503,7 @@ char *string; + * Side effects: Talks to server, changes contents of "string". + */ + +-get_server(string, size) ++int get_server(string, size) + char *string; + int size; + { +diff -Naurp a/inews/clientlib.h b/inews/clientlib.h +--- a/inews/clientlib.h 1996-06-06 21:41:07.000000000 +0200 ++++ b/inews/clientlib.h 2022-11-26 18:27:59.711248861 +0100 +@@ -9,3 +9,7 @@ extern int server_init(); + extern void put_server(); + extern int get_server(); + extern void close_server(); ++ ++extern int get_tcp_socket(char *machine); ++extern int get_server(char *string, int size); ++extern int handle_server_response(int response, char *server); +diff -Naurp a/inews/inews.c b/inews/inews.c +--- a/inews/inews.c 2004-01-29 03:14:19.000000000 +0100 ++++ b/inews/inews.c 2022-11-26 18:32:26.200435328 +0100 +@@ -39,15 +39,20 @@ static char *sccsid = "@(#)inews.c 1.16 + + #include "conf.h" + #include "nntp.h" ++#include "clientlib.h" + + + #define MAX_SIGNATURE 6 + ++int strneql(char *a, char *b, int n); ++void gen_frompath(void); ++int valid_header(register char *h); ++ + extern FILE *ser_wr_fp; + + char host_name[256]; + +-main(argc, argv) ++int main(argc, argv) + int argc; + char *argv[]; + { +@@ -254,7 +259,7 @@ append_signature() + * a From: line in it. + */ + +-gen_frompath() ++void gen_frompath() + { + char *full_name; + char *cp; +@@ -330,7 +335,7 @@ gen_frompath() + * Side effects: None. + */ + +-strneql(a, b, n) ++int strneql(a, b, n) + register char *a, *b; + int n; + { 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/files/uudeview-0.5.20-format-string-warning-inews.patch b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch new file mode 100644 index 000000000000..de53717a3cbe --- /dev/null +++ b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch @@ -0,0 +1,11 @@ +--- a/inews/inews.c 2022-11-26 18:44:03.788039229 +0100 ++++ b/inews/inews.c 2022-11-26 18:44:47.376080190 +0100 +@@ -303,7 +303,7 @@ + putc(*cp, ser_wr_fp); + else { /* Stupid & hack. God damn it. */ + putc(toupper(passwd->pw_name[0]), ser_wr_fp); +- fprintf(ser_wr_fp, passwd->pw_name+1); ++ fprintf(ser_wr_fp, "%s", passwd->pw_name+1); + } + + fprintf(ser_wr_fp, ")\r\n"); diff --git a/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch new file mode 100644 index 000000000000..7cbc584f5b47 --- /dev/null +++ b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch @@ -0,0 +1,24 @@ +Description: Fix potential security issue (arbitrary string being passed + as a format string to fprintf). +Author: Andrew Shadura <andrewsh@debian.org> + +--- a/unix/uuenview.c ++++ b/unix/uuenview.c +@@ -310,7 +310,7 @@ SendMkCommand (char **rcptlist, char *to + } + + if ((*rcptlist = (char *) malloc (strlen (towhom) + 16)) == NULL) { +- fprintf (stderr, "error: Out of memory allocating %d bytes\n", ++ fprintf (stderr, "error: Out of memory allocating %zd bytes\n", + strlen (towhom)+16); + _FP_free (command); + return NULL; +@@ -483,7 +483,7 @@ AttachFiles (char *towhom, char *subject + if (_FP_stristr (input, "multipart") != NULL) { + /* it is already a multipart posting. grab the boundary */ + if ((ptr = _FP_stristr (input, "boundary=")) != NULL) { +- fprintf(thepipe, input); ++ fprintf(thepipe, "%s", input); + strcpy (boundary, ParseValue (ptr)); + hadmulti = 1; + } diff --git a/app-text/uudeview/metadata.xml b/app-text/uudeview/metadata.xml index 85e4ed814fa2..4da67a4f4b42 100644 --- a/app-text/uudeview/metadata.xml +++ b/app-text/uudeview/metadata.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>hanno@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild index 72fc9d499c88..6e3b8d57277d 100644 --- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild +++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ PATCHES=( DOCS=( HISTORY INSTALL README ) src_prepare() { - sed -i "s/^\tar r/\t$(tc-getAR) r/" uulib/Makefile.in || die + sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die default mv configure.{in,ac} || die diff --git a/app-text/uudeview/uudeview-0.5.20-r3.ebuild b/app-text/uudeview/uudeview-0.5.20-r3.ebuild new file mode 100644 index 000000000000..903bd6b43754 --- /dev/null +++ b/app-text/uudeview/uudeview-0.5.20-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 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 +) + +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/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 fb996f7ee814..dfc67e995979 100644 --- a/app-text/vgrep/Manifest +++ b/app-text/vgrep/Manifest @@ -1 +1,2 @@ -DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd +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/metadata.xml b/app-text/vgrep/metadata.xml index 3efa0310a8a1..afe9da646958 100644 --- a/app-text/vgrep/metadata.xml +++ b/app-text/vgrep/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>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to> <remote-id type="github">vrothberg/vgrep</remote-id> diff --git a/app-text/vgrep/vgrep-2.5.1.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild index bc38ee195178..1b3329afca49 100644 --- a/app-text/vgrep/vgrep-2.5.1.ebuild +++ b/app-text/vgrep/vgrep-2.6.0.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 go-module @@ -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/metadata.xml b/app-text/wdiff/metadata.xml index cd21cfd82da6..988be0d02805 100644 --- a/app-text/wdiff/metadata.xml +++ b/app-text/wdiff/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag> </use> + <upstream> + <remote-id type="savannah">wdiff</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild index 4e865d7184db..66179b426012 100644 --- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild +++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Create a diff disregarding formatting" HOMEPAGE="https://www.gnu.org/software/wdiff/" @@ -9,21 +9,23 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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 )" RDEPEND=" sys-apps/diffutils sys-apps/less - sys-libs/ncurses:0=" -DEPEND="${RDEPEND} + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" +BDEPEND=" sys-apps/texinfo - test? ( app-misc/screen )" + test? ( app-misc/screen ) +" src_configure() { - econf \ - $(use_enable experimental) + econf $(use_enable experimental) } src_test() { @@ -31,5 +33,6 @@ src_test() { # when an incompatible screenrc is found touch tests/screenrc || die export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc + default } diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest index 2941facea4bf..2b0b1f67a3c7 100644 --- a/app-text/webgen/Manifest +++ b/app-text/webgen/Manifest @@ -1,2 +1,2 @@ -DIST webgen-1.7.1.gem 201728 BLAKE2B 2ea7d7911b4edf29cb7310a676593a77956b3fffd1a4ca5f69731270e648365fb8293a292b8fdd717444ed8f690dd5f095ac5dd77f5c950253b5de7d6086f966 SHA512 7b58c7d2b8ff6a4feabc1435e6bddbf25b3e4695517c2bd8d97b698a49b6fd61538f1a77bdd4e13f7368fdfbeae9f007dfc09ecfcde4eb75a366b8e0ccc8c58a 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/metadata.xml b/app-text/webgen/metadata.xml index 96be9c2520c6..d5f698f7f2d7 100644 --- a/app-text/webgen/metadata.xml +++ b/app-text/webgen/metadata.xml @@ -10,4 +10,7 @@ <flag name="highlight">Enable syntax highlighting for certain plugins</flag> <flag name="markdown">Markdown support</flag> </use> + <upstream> + <remote-id type="github">gettalong/webgen</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/webgen/webgen-1.7.2.ebuild b/app-text/webgen/webgen-1.7.2.ebuild index 6dd141bf8cc1..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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby30 ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="task" RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc" @@ -43,6 +43,12 @@ all_ruby_prepare() { # 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() { diff --git a/app-text/webgen/webgen-1.7.1.ebuild b/app-text/webgen/webgen-1.7.3.ebuild index 143a53059e74..c630a650eedd 100644 --- a/app-text/webgen/webgen-1.7.1.ebuild +++ b/app-text/webgen/webgen-1.7.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -USE_RUBY="ruby26" +EAPI=8 +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_RECIPE_DOC="task" RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc" @@ -28,6 +28,7 @@ ruby_add_bdepend "doc? ( dev-ruby/rdoc ) 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 )" @@ -43,6 +44,12 @@ all_ruby_prepare() { # 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() { diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest index ded79d65d8d0..e957693da79a 100644 --- a/app-text/wgetpaste/Manifest +++ b/app-text/wgetpaste/Manifest @@ -1,3 +1,2 @@ -DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6 -DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f -DIST wgetpaste-2.32.tar.gz 16626 BLAKE2B a8628a47edec5797f011fdf648cccf4147043bb699fe6ebfc38b66d1bbff1840147613e1de1a2abf1048b83247e9a16026bed4174be605f99e59035cf7c64f9f SHA512 57f6194c864adf3eabffe46163d1c83a5c2c30affc4c353fee5cafe6aaf19cfa306e134cb5dd216577eb34cc93eee66b28297e5a1d4fa92d78d38597170d40bb +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.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch deleted file mode 100644 index 0af9a6f855d7..000000000000 --- a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <zlin@exherbo.org> -Date: Tue, 23 Jul 2019 00:16:19 +0200 -Subject: [PATCH] Fix handling of bpaste urls. - ---- - wgetpaste | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/wgetpaste b/wgetpaste -index 585fcd9..99eb7f1 100755 ---- a/wgetpaste -+++ b/wgetpaste -@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb - xml+velocity xml xquery xslt xtend yaml" - EXPIRATIONS_pinnwand="1day 1week 1month never" - POST_pinnwand="submit=Paste! % % lexer expiry % code" --REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|' -+REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" -+REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' - - ### errors - die() { -@@ -550,11 +551,15 @@ postdata() { - - # get url from response from server - geturl() { -- local regex -+ local regex location - regex=REGEX_URL_$ENGINE -+ location=REGEX_LOC_$ENGINE - if [[ -n ${!regex} ]]; then - [[ needstdout = $1 ]] && return 0 - sed -n -e "${!regex}" <<< "$*" -+ elif [[ -n ${!location} ]]; then -+ [[ needstdout = $1 ]] && return 1 -+ sed -n -e "s|^.*Location: ${!location}|p" <<< "$*" - else - [[ needstdout = $1 ]] && return 1 - sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*" diff --git a/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch b/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch deleted file mode 100644 index b4d57f843c96..000000000000 --- a/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wgetpaste b/wgetpaste -index 0f8219b..ed0bdac 100755 ---- a/wgetpaste -+++ b/wgetpaste -@@ -110,6 +110,8 @@ Python Python%Interactive/Traceback Ruby Ruby%HTML%(ERB) SQL XML" - LANGUAGE_VALUES_dpaste="% Apache Bash Css Diff DjangoTemplate Haskell JScript Python PythonConsole \ - Ruby Rhtml Sql Xml" - EXPIRATIONS_dpaste=$(printf "%s " {1..365}) -+escape_description_dpaste() { echo "$*"; } -+escape_input_dpaste() { echo "$*"; } - POST_dpaste() { - local title="${2}" - local syntax="${3}" 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/files/wgetpaste-2.33-tests.patch b/app-text/wgetpaste/files/wgetpaste-2.33-tests.patch new file mode 100644 index 000000000000..41d0bece7962 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-tests.patch @@ -0,0 +1,83 @@ +https://github.com/zlin/wgetpaste/pull/38 + +From 3470bbe651c2264a7f985f3b86f67a6ff6d0c587 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 22 Nov 2022 01:29:16 +0000 +Subject: [PATCH 1/3] test: respect TMPDIR in mktemp (pass --tmpdir) + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/test/test.sh ++++ b/test/test.sh +@@ -7,7 +7,7 @@ + # Don't assume the test is being run from the same directory as the script + TEST_DIR="$(dirname "$0")" + TEST_FILE="$TEST_DIR/test.txt" +-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test.XXXXX)" ++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test.XXXXX)" + # Services to hard skip + # Pre-declare as map to maintain type even if empty + # key -> value := service -> reason +--- a/test/test_ansi.sh ++++ b/test/test_ansi.sh +@@ -9,7 +9,7 @@ + TEST_DIR="$(dirname "$0")" + ANSI_FILE="$TEST_DIR/red.txt" + NOANSI_FILE="$TEST_DIR/red_no_ansi.txt" +-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test_ansi.XXXXX)" ++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test_ansi.XXXXX)" + # Services to hard skip + # Pre-declare as map to maintain type even if empty + # key -> value := service -> reason + +From 0c3cc1a5286c95a5bcd6408035f6c230350c1565 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 22 Nov 2022 01:29:40 +0000 +Subject: [PATCH 2/3] test: use portable bash shebang + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/test/test.sh ++++ b/test/test.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#!/usr/bin/env bash + + # wgetpaste test script + # Exit code: number of mismatched downloads or 1 for general failure +--- a/test/test_ansi.sh ++++ b/test/test_ansi.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#!/usr/bin/env bash + + # wgetpaste test script (stripping ANSI codes) + # Based on test/test.sh + +From 8d1cf7a8d0ce9ff21a8e1dc66169b04e4f8fc852 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 22 Nov 2022 01:29:55 +0000 +Subject: [PATCH 3/3] test: normalise copyright header + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/test/test.sh ++++ b/test/test.sh +@@ -2,7 +2,7 @@ + + # wgetpaste test script + # Exit code: number of mismatched downloads or 1 for general failure +-# Copyright (C) 2021 xxc3nsoredxx ++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com> + + # Don't assume the test is being run from the same directory as the script + TEST_DIR="$(dirname "$0")" +--- a/test/test_ansi.sh ++++ b/test/test_ansi.sh +@@ -3,7 +3,7 @@ + # wgetpaste test script (stripping ANSI codes) + # Based on test/test.sh + # Exit code: number of mismatched downloads or 1 for general failure +-# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com> ++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com> + + # Don't assume the test is being run from the same directory as the script + TEST_DIR="$(dirname "$0")" + diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml index 5c01cb523170..0ecaea5e3d91 100644 --- a/app-text/wgetpaste/metadata.xml +++ b/app-text/wgetpaste/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>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> + <maintainer type="person" proxied="yes"> + <email>xxc3ncoredxx@gmail.com</email> + <name>Oskari Pirhonen</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <stabilize-allarches/> <upstream> diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild deleted file mode 100644 index 3f189edaa450..000000000000 --- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Command-line interface to various pastebins" -HOMEPAGE="http://wgetpaste.zlin.dk/" -SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+ssl" - -RDEPEND="net-misc/wget[ssl?]" - -PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" ) - -src_prepare() { - sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die - default -} - -src_install() { - dobin ${PN} - insinto /usr/share/zsh/site-functions - doins _wgetpaste -} diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild deleted file mode 100644 index 95f415fdbb80..000000000000 --- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Command-line interface to various pastebins" -HOMEPAGE="http://wgetpaste.zlin.dk/" - -COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22" -SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux ~x64-macos" -IUSE="+ssl" - -RDEPEND="net-misc/wget[ssl?]" - -S="${WORKDIR}/${PN}-${COMMIT_HASH}" - -PATCHES=( "${FILESDIR}/wgetpaste-2.30-fix-dpaste-escapes.patch" ) - -src_prepare() { - sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die - default -} - -src_install() { - dobin ${PN} - insinto /usr/share/zsh/site-functions - doins _wgetpaste -} diff --git a/app-text/wgetpaste/wgetpaste-2.32.ebuild b/app-text/wgetpaste/wgetpaste-2.32.ebuild deleted file mode 100644 index d738ebaa2c55..000000000000 --- a/app-text/wgetpaste/wgetpaste-2.32.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line interface to various pastebins" -HOMEPAGE="http://wgetpaste.zlin.dk/" - -SRC_URI="https://github.com/zlin/wgetpaste/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+ssl" - -RDEPEND="net-misc/wget[ssl?]" - -src_prepare() { - sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die - default -} - -src_install() { - dobin ${PN} - insinto /usr/share/zsh/site-functions - doins _wgetpaste -} diff --git a/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild new file mode 100644 index 000000000000..89f63061351c --- /dev/null +++ b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild @@ -0,0 +1,62 @@ +# 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 +) + +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.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..9eb248cf9574 --- /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/metadata.xml b/app-text/wiki2beamer/metadata.xml index d20f47202bfa..4a0c808679e4 100644 --- a/app-text/wiki2beamer/metadata.xml +++ b/app-text/wiki2beamer/metadata.xml @@ -6,6 +6,7 @@ <name>Sebastian Pipping</name> </maintainer> <upstream> + <remote-id type="github">wiki2beamer/wiki2beamer</remote-id> <remote-id type="sourceforge">wiki2beamer</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild index f6424c6632c6..7534224bd844 100644 --- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild +++ b/app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild new file mode 100644 index 000000000000..577ba3e01b4c --- /dev/null +++ b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools + +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 a9f43a1e673e..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-2019 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 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/wscr/metadata.xml b/app-text/wscr/metadata.xml index 3061be5b02dd..1c5a4ea70c90 100644 --- a/app-text/wscr/metadata.xml +++ b/app-text/wscr/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription lang="en">WSCR is a program to solve word jumbles, print all -permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words -or a user-specified wordlist file</longdescription> + <!-- maintainer-needed --> + <longdescription lang="en"> + WSCR is a program to solve word jumbles, print all permutations of a + string, and print pseudo-anagrams. It will use /usr/dict/words or a + user-specified wordlist file + </longdescription> </pkgmetadata> diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild index b0d8920b953b..b035e8ba14fa 100644 --- a/app-text/wscr/wscr-1.2-r2.ebuild +++ b/app-text/wscr/wscr-1.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit toolchain-funcs DESCRIPTION="A Lightweight and Fast Anagram Solver" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" LICENSE="public-domain" SLOT="0" diff --git a/app-text/wv/files/wv-1.2.9-C99-decls.patch b/app-text/wv/files/wv-1.2.9-C99-decls.patch new file mode 100644 index 000000000000..b200055cf5b8 --- /dev/null +++ b/app-text/wv/files/wv-1.2.9-C99-decls.patch @@ -0,0 +1,101 @@ +--- a/field.c ++++ b/field.c +@@ -25,6 +25,7 @@ + #include <stdlib.h> + #include <ctype.h> + #include <string.h> ++#include <strings.h> + #include <time.h> + + #include "wv.h" +--- a/md5.c ++++ b/md5.c +@@ -57,7 +57,7 @@ + #include "md5.h" + + /* forward declaration */ +-static void Transform (); ++static void Transform (UINT4 *buf, UINT4 *in); + + static unsigned char PADDING[64] = { + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +@@ -103,8 +103,7 @@ + } + + void +-wvMD5Init (mdContext) +- wvMD5_CTX *mdContext; ++wvMD5Init (wvMD5_CTX *mdContext) + { + mdContext->i[0] = mdContext->i[1] = (UINT4) 0; + +@@ -117,10 +116,7 @@ + } + + void +-wvMD5Update (mdContext, inBuf, inLen) +- wvMD5_CTX *mdContext; +- unsigned char *inBuf; +- unsigned int inLen; ++wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen) + { + UINT4 in[16]; + int mdi; +@@ -155,8 +151,7 @@ + } + + void +-wvMD5Final (mdContext) +- wvMD5_CTX *mdContext; ++wvMD5Final (wvMD5_CTX *mdContext) + { + UINT4 in[16]; + int mdi; +@@ -198,9 +193,7 @@ + /* Basic MD5 step. Transform buf based on in. + */ + static void +-Transform (buf, in) +- UINT4 *buf; +- UINT4 *in; ++Transform (UINT4 *buf, UINT4 *in) + { + UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; + +--- a/md5.h ++++ b/md5.h +@@ -48,9 +48,9 @@ + unsigned char digest[16]; /* actual digest after MD5Final call */ + } wvMD5_CTX; + +-void wvMD5Init (); +-void wvMD5Update (); +-void wvMD5Final (); ++void wvMD5Init (wvMD5_CTX *mdContext); ++void wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen); ++void wvMD5Final (wvMD5_CTX *mdContext); + + /* + ********************************************************************** +--- a/wvConfig.c ++++ b/wvConfig.c +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> ++#include <strings.h> + #include <math.h> + #include <ctype.h> + #include "wv.h" +--- a/wvparse.c ++++ b/wvparse.c +@@ -35,6 +35,9 @@ + #include <gsf/gsf-input-stdio.h> + #include <gsf/gsf-utils.h> + ++int wvOLEDecode_gsf (wvParseStruct * ps, GsfInput *path, wvStream ** mainfd, wvStream ** tablefd0, ++ wvStream ** tablefd1, wvStream ** data, wvStream ** summary); ++ + int + wvInit (void) + { diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r3.ebuild index 4c6e750d78d5..c2a286d095f4 100644 --- a/app-text/wv/wv-1.2.9-r2.ebuild +++ b/app-text/wv/wv-1.2.9-r3.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable" -SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz" HOMEPAGE="http://wvware.sourceforge.net/" +SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz" -IUSE="tools wmf" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -SLOT="0" LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="tools wmf" RDEPEND=" >=dev-libs/glib-2:2 @@ -19,24 +20,32 @@ RDEPEND=" sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 - tools? ( app-text/texlive-core - dev-texlive/texlive-latex ) - wmf? ( >=media-libs/libwmf-0.2.2 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" + tools? ( + app-text/texlive-core + dev-texlive/texlive-latex + ) + wmf? ( >=media-libs/libwmf-0.2.2 )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-format-security.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-C99-decls.patch +) src_prepare() { default + # remove -ansi flag, since it disables POSIX + # function declarations (bug #874396) + sed -i -e 's/-ansi//' configure || die + if ! use tools; then sed -i -e '/bin_/d' GNUmakefile.am || die sed -i -e '/SUBDIRS/d' GNUmakefile.am || die sed -i -e '/\/GNUmakefile/d' configure.ac || die sed -i -e '/wv[[:upper:]]/d' configure.ac || die + sed -i -e 's/-ansi//' configure.ac || die # automake-1.13 fix, bug #467620 sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die @@ -46,17 +55,13 @@ src_prepare() { } src_configure() { - econf \ - --disable-static \ - $(use_with wmf libwmf) + econf $(use_with wmf libwmf) } src_install() { default find "${ED}" -name '*.la' -delete || die - rm -f "${ED}"/usr/share/man/man1/wvConvert.1 - if use tools; then - dosym /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 - fi + rm -f "${ED}"/usr/share/man/man1/wvConvert.1 || die + use tools && dosym wvWare.1 /usr/share/man/man1/wvConvert.1 } diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r3.ebuild index 0bd111c40a1e..136b69d8ce8c 100644 --- a/app-text/wv2/wv2-0.4.2-r2.ebuild +++ b/app-text/wv2/wv2-0.4.2-r3.ebuild @@ -1,39 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic +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 +RDEPEND="dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib )" -DEPEND=" - ${RDEPEND}" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-glib.patch "${FILESDIR}"/${P}-libgsf.patch ) + DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO ) src_configure() { - # due to ICU 59 requiring C++11 now + # Due to ICU 59 requiring C++11 now append-cxxflags -std=c++11 local mycmakeargs=( -DWITH_ZLIB=$(usex zlib) ) - cmake-utils_src_configure + + cmake_src_configure } 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 e47be22b3be4..f2d6b0f70140 100644 --- a/app-text/xapers/xapers-0.9.0.ebuild +++ b/app-text/xapers/xapers-0.9.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2016-2021 Gentoo Authors +# Copyright 2016-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +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 e55f75c3864f..9baffa3dacb6 100644 --- a/app-text/xapian-omega/Manifest +++ b/app-text/xapian-omega/Manifest @@ -1,5 +1,4 @@ -DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7 -DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679 -DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4 -DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c -DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43 +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/metadata.xml b/app-text/xapian-omega/metadata.xml index 489e730c1c90..115e9d64a669 100644 --- a/app-text/xapian-omega/metadata.xml +++ b/app-text/xapian-omega/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild deleted file mode 100644 index c3cf578974f8..000000000000 --- a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -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}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86" -IUSE="" - -DEPEND="~dev-libs/xapian-1.4.18:0/30 - dev-lang/perl - dev-libs/libpcre - sys-libs/zlib" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" install - - # Protect /etc/omega.conf - echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega - 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/* "${D}"/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.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild index 51e7f7c7a19d..3dbebdbb01ed 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +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: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}" 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 @@ -32,7 +33,7 @@ src_install() { # Directory containing OmegaScript templates: keepdir /var/lib/omega/templates - mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die # Directory to write Omega logs to: keepdir /var/log/omega diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild index 51e7f7c7a19d..a9a75d694991 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +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: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}" 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 @@ -32,7 +33,7 @@ src_install() { # Directory containing OmegaScript templates: keepdir /var/lib/omega/templates - mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die # Directory to write Omega logs to: keepdir /var/log/omega diff --git a/app-text/xapian-omega/xapian-omega-1.4.15.ebuild b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild index f76f70d1acab..1e0983f89c26 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.15.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +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}" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -DEPEND="dev-libs/xapian: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}" 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 @@ -32,7 +33,7 @@ src_install() { # Directory containing OmegaScript templates: keepdir /var/lib/omega/templates - mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die # Directory to write Omega logs to: keepdir /var/log/omega diff --git a/app-text/xapian-omega/xapian-omega-1.4.16.ebuild b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild index f76f70d1acab..1e0983f89c26 100644 --- a/app-text/xapian-omega/xapian-omega-1.4.16.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +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}" +SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -DEPEND="dev-libs/xapian: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}" 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 @@ -32,7 +33,7 @@ src_install() { # Directory containing OmegaScript templates: keepdir /var/lib/omega/templates - mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die # Directory to write Omega logs to: keepdir /var/log/omega diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest index 9c6fdafff110..925b44be4da5 100644 --- a/app-text/xchm/Manifest +++ b/app-text/xchm/Manifest @@ -1 +1 @@ -DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6 +DIST xchm-1.36.tar.gz 882212 BLAKE2B 8f11457664748fa3effb23102b23ee59c3184a408f6defa3bc7d7bf90c97357a74d33f5da6b7098011a1c23a9f3dd9a523076e367aa9547c9d72f25296b6c787 SHA512 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65 diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.36.ebuild index 4f682b41d68d..4abfca557e5d 100644 --- a/app-text/xchm/xchm-1.32.ebuild +++ b/app-text/xchm/xchm-1.36.ebuild @@ -1,9 +1,9 @@ -# 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 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit desktop wxwidgets xdg-utils @@ -23,6 +23,7 @@ DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" src_configure() { + setup-wxwidgets econf $(use_enable nls) } diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild deleted file mode 100644 index b652fcfc7a2e..000000000000 --- a/app-text/xchm/xchm-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools desktop wxwidgets xdg-utils - -DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files" -HOMEPAGE="https://github.com/rzvncj/xCHM/" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rzvncj/xCHM/" -else - SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -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_prepare() { - default - eautoreconf -} - -src_configure() { - 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/xdvik/Manifest b/app-text/xdvik/Manifest index 5f476a71daf7..b17947255f53 100644 --- a/app-text/xdvik/Manifest +++ b/app-text/xdvik/Manifest @@ -1 +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/files/xdvik-22.87.06-configure-clang16.patch b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch new file mode 100644 index 000000000000..c3b3f0b98bdb --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch @@ -0,0 +1,51 @@ +https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7 + +From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Thu, 2 Feb 2023 22:57:47 +0000 +Subject: [PATCH] avoid implicit wait and exit declarations for C99 + +git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751 +--- a/configure ++++ b/configure +@@ -16406,6 +16406,9 @@ else $as_nop + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif ++#ifdef HAVE_SYS_WAIT_H ++#include <sys/wait.h> ++#endif + #ifdef HAVE_VFORK_H + #include <vfork.h> + #endif +@@ -16427,7 +16430,7 @@ main (void) + + while (wait(&status) != child) + ; +- exit( ++ _exit( + /* Was there some problem with vforking? */ + child < 0 + +--- a/m4/xdvi-func-setsid-in-fork.m4 ++++ b/m4/xdvi-func-setsid-in-fork.m4 +@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK], + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif ++#ifdef HAVE_SYS_WAIT_H ++#include <sys/wait.h> ++#endif + #ifdef HAVE_VFORK_H + #include <vfork.h> + #endif]], +@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK], + + while (wait(&status) != child) + ; +- exit( ++ _exit( + /* Was there some problem with vforking? */ + child < 0 + + diff --git a/app-text/xdvik/xdvik-22.87.03-r3.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild index 113fe335056c..3cfd9e28d9cd 100644 --- a/app-text/xdvik/xdvik-22.87.03-r3.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -1,20 +1,22 @@ -# 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 autotools desktop elisp-common flag-o-matic toolchain-funcs xdg-utils +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" +DESCRIPTION="DVI viewer for X Window System" +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 ~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" -CDEPEND=">=media-libs/freetype-2.9.1-r2:2 +DEPEND=">=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu @@ -30,34 +32,37 @@ CDEPEND=">=media-libs/freetype-2.9.1-r2:2 ) ) dev-libs/kpathsea:=" -DEPEND="sys-devel/flex - virtual/yacc - virtual/pkgconfig - ${CDEPEND}" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} virtual/latex-base - !<app-text/texlive-2007" -S=${WORKDIR}/${P}/texk/xdvik +" +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() { - local i + default + # Make sure system kpathsea headers are used - cd "${WORKDIR}/${P}/texk/kpathsea" - for i in *.h ; do echo "#include_next \"$i\"" > $i; done + cd "${WORKDIR}/${P}/texk/kpathsea" || die + local i + for i in *.h ; do + echo "#include_next \"$i\"" > ${i} || die + done - cd "${WORKDIR}/${P}" - eapply "${FILESDIR}"/${P}-freetype2-config.patch - cd "${S}" + cd "${WORKDIR}/${P}" || die + cd "${S}" || die eautoreconf - - eapply_user } 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)" @@ -76,12 +81,13 @@ src_configure() { --with-system-kpathsea \ --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \ --with-xdvi-x-toolkit="${toolkit}" \ - --x-includes="${SYSROOT}${EPREFIX}"/usr/include \ - --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) + --x-includes="${ESYSROOT}"/usr/include \ + --x-libraries="${ESYSROOT}"/usr/$(get_libdir) } src_compile() { - emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" + emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea + use emacs && elisp-compile xdvi-search.el } @@ -97,12 +103,14 @@ src_install() { 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 + newicon -s 192 "${DISTDIR}"/${PN}_192.png ${PN}.png + make_desktop_entry "xdvi %f" "XDvi" xdvik "Graphics;Viewer" "MimeType=application/x-dvi;" + # Our desktop file is more complete + rm "${ED}/usr/share/applications/xdvi.desktop" || die } pkg_postinst() { - xdg_desktop_database_update + xdg_pkg_postinst if use emacs; then elog "Add" @@ -111,7 +119,3 @@ pkg_postinst() { elog "to your ~/.emacs file" fi } - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild index 87af258ebfd9..a1c78ebba9a1 100644 --- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild +++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz" LICENSE="W3C" SLOT="0" -KEYWORDS="amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" DEPEND="app-text/sgml-common 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/Manifest b/app-text/xiphos/Manifest index cb991a816fdb..fb4e42013ccf 100644 --- a/app-text/xiphos/Manifest +++ b/app-text/xiphos/Manifest @@ -1 +1,2 @@ -DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077 +DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da +DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch new file mode 100644 index 000000000000..8de40e28c64e --- /dev/null +++ b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch @@ -0,0 +1,20 @@ +--- a/cmake/XiphosDependencies.cmake ++++ b/cmake/XiphosDependencies.cmake +@@ -84,7 +84,7 @@ + "gdk-pixbuf-2.0" + "gio-2.0" + "gobject-2.0" +- "libsoup-2.4" ++ "libsoup-3.0" + "pango" + "minizip" + "zlib" +@@ -144,7 +144,7 @@ + # Gtk+-3.0 + Webkit2 + GtkHtml-editor + pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET + "gtk+-3.0" +- "webkit2gtk-4.0" ++ "webkit2gtk-4.1" + ) + endif() + endif (GTK2) diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml index b844aa2c06ed..e8dbfb149a17 100644 --- a/app-text/xiphos/metadata.xml +++ b/app-text/xiphos/metadata.xml @@ -6,6 +6,6 @@ <name>Marek Szuba</name> </maintainer> <upstream> - <remote-id type="sourceforge">gnomesword</remote-id> + <remote-id type="github">crosswire/xiphos</remote-id> </upstream> </pkgmetadata> diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild index 6dab6793c988..b7ac40476986 100644 --- a/app-text/xiphos/xiphos-4.2.1.ebuild +++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild @@ -1,13 +1,14 @@ -# 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 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.gz" +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" @@ -22,9 +23,8 @@ RDEPEND="${COMMON} >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu - gnome-extra/gtkhtml:4.0 >=net-libs/biblesync-1.2.0 - net-libs/webkit-gtk:4 + net-libs/webkit-gtk:4.1 sys-libs/zlib[minizip] x11-libs/gtk+:3" DEPEND="${RDEPEND}" @@ -38,18 +38,16 @@ BDEPEND="${COMMON} 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 + "${FILESDIR}"/${PN}-4.2.1-webkit41.patch ) src_configure() { - # TODO: stop using gtkhtml, it is deprecated (Bug #667914). However, as - # of 4.2.1 it is still required because the WebKit-based editor - # does not support webkit-gtk:4. local mycmakeargs=( -DDBUS=$(usex dbus) -DDEBUG=$(usex debug) - -DGTKHTML=on -DPOSTINST=off ) cmake_src_configure @@ -57,6 +55,17 @@ 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() { diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest index 1f9a7ac7c375..739966069752 100644 --- a/app-text/xlsx2csv/Manifest +++ b/app-text/xlsx2csv/Manifest @@ -1 +1 @@ -DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489 +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/files/xlsx2csv-0.7.8-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch new file mode 100644 index 000000000000..f692a4931522 --- /dev/null +++ b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch @@ -0,0 +1,13 @@ +diff --git a/test/run b/test/run +index 990421c..081729d 100755 +--- a/test/run ++++ b/test/run +@@ -5,7 +5,7 @@ import sys + import subprocess + from io import open + +-PYTHON_VERSIONS = ["2", "3"] ++PYTHON_VERSIONS = ["3"] + + """ + This test uses sys.stdout. diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml index c50d8f0b46da..b8a934ca23f5 100644 --- a/app-text/xlsx2csv/metadata.xml +++ b/app-text/xlsx2csv/metadata.xml @@ -1,10 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">xlsx2csv</remote-id> - <remote-id type="github">dilshod/xlsx2csv</remote-id> - </upstream> + <maintainer type="person"> + <email>github@fischl-online.de</email> + <name>Anton Fischl</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">xlsx2csv</remote-id> + <remote-id type="github">dilshod/xlsx2csv</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild index 73061b4a3f00..fdd7d94e35ef 100644 --- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild +++ b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild @@ -1,25 +1,24 @@ -# 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 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" -DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +inherit distutils-r1 pypi 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" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" BDEPEND="dev-lang/perl" -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( "${FILESDIR}"/"${PN}-0.7.8-tests.patch" ) python_compile_all() { emake -C man @@ -31,5 +30,5 @@ python_test() { python_install_all() { distutils-r1_python_install_all - doman man/${PN}.1 + doman "man/${PN}.1" } diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r2.ebuild index 919ecba3c27c..52f984d793dd 100644 --- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild +++ b/app-text/xml2doc/xml2doc-20030510-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 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 +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" SLOT="0" @@ -16,17 +17,22 @@ KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" DEPEND="dev-libs/libxml2:2" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}" - PATCHES=( # Fix pointer-related bug detected by a QA notice "${FILESDIR}"/${PN}-pointer_fix.patch # Don't strip symbols from binary (bug #152266) "${FILESDIR}"/${P}-makefile.patch - # fix GCC 10 -fno-common change + # Fix GCC 10 -fno-common change "${FILESDIR}"/${P}-gcc10-no-common.patch ) +src_prepare() { + default + + # Clang 16, bug #900539 + eautoreconf +} + src_configure() { tc-export CC econf --disable-pdf diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest new file mode 100644 index 000000000000..33223c01b4c9 --- /dev/null +++ b/app-text/xml2rfc/Manifest @@ -0,0 +1,2 @@ +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/metadata.xml b/app-text/xml2rfc/metadata.xml new file mode 100644 index 000000000000..53c1b948fa53 --- /dev/null +++ b/app-text/xml2rfc/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="pypi">xml2rfc</remote-id> + <remote-id type="github">ietf-tools/xml2rfc</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/xml2rfc/xml2rfc-3.17.4.ebuild b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild new file mode 100644 index 000000000000..4e0aa2aed4e5 --- /dev/null +++ b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild @@ -0,0 +1,51 @@ +# 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/pypdf-3.2.1[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/dict2xml[${PYTHON_USEDEP}] + dev-python/weasyprint[${PYTHON_USEDEP}] + media-fonts/noto[cjk] + ) +" + +RDEPEND=" + >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}] + dev-python/ConfigArgParse[${PYTHON_USEDEP}] + dev-python/intervaltree[${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}] + >=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}] +" + +distutils_enable_tests unittest + +src_prepare() { + default + # Disable broken PdfWriterTests. + sed -i 's/ PdfWriterTests(unittest.TestCase):/ PdfWriterTests:/' test.py || die +} diff --git a/app-text/xml2rfc/xml2rfc-3.18.0.ebuild b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild new file mode 100644 index 000000000000..4e0aa2aed4e5 --- /dev/null +++ b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild @@ -0,0 +1,51 @@ +# 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/pypdf-3.2.1[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/dict2xml[${PYTHON_USEDEP}] + dev-python/weasyprint[${PYTHON_USEDEP}] + media-fonts/noto[cjk] + ) +" + +RDEPEND=" + >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}] + dev-python/ConfigArgParse[${PYTHON_USEDEP}] + dev-python/intervaltree[${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}] + >=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}] +" + +distutils_enable_tests unittest + +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.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild index 16acc93ca983..8b5eb94577e0 100644 --- a/app-text/xmldiff/xmldiff-2.4.ebuild +++ b/app-text/xmldiff/xmldiff-2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS="rdepend" inherit distutils-r1 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 a286b8eb8561..6abdd5883fc8 100644 --- a/app-text/xmlformat/xmlformat-1.04.ebuild +++ b/app-text/xmlformat/xmlformat-1.04.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27" -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 0ff17e1a8107..ecc697cfd008 100644 --- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools multilib flag-o-matic toolchain-funcs +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 @@ -28,9 +28,11 @@ src_prepare() { # 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. - 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 + 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 } diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch new file mode 100644 index 000000000000..7137966b27d2 --- /dev/null +++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch @@ -0,0 +1,37 @@ +(See https://bugs.gentoo.org/828520 too) + +From: Sam James <sam@gentoo.org> +Date: Wed, 10 Nov 2021 04:53:33 +0000 +Subject: [PATCH] Don't hardcode paths to utilities + +The path to e.g. links at build time is not necessarily +the same as the path at runtime. + +TODO: Could chop out the checks from configure but +this package is fragile enough. Leaving it for now. +--- a/xmlto.in ++++ b/xmlto.in +@@ -272,13 +272,13 @@ then + USE_BACKEND=DEFAULT + fi + +-LINKS_PATH=@LINKS@ +-W3M_PATH=@W3M@ +-LYNX_PATH=@LYNX@ +-GCP_PATH=@GCP@ +-SED_PATH=@SED@ +-GREP_PATH=@GREP@ +-ZIP_PATH=@ZIP@ ++LINKS_PATH=$(command -v elinks || command -v links) ++W3M_PATH=$(command -v w3m) ++LYNX_PATH=$(command -v lynx) ++GCP_PATH=$(command -v cp) ++SED_PATH=$(command -v sed) ++GREP_PATH=$(command -v grep) ++ZIP_PATH=$(command -v zip) + + # Process any options + ARGS=$(${GETOPT} \ +-- +2.33.1 + diff --git a/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch new file mode 100644 index 000000000000..b90eea1f42df --- /dev/null +++ b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch @@ -0,0 +1,116 @@ +https://bugs.gentoo.org/869080 + +https://pagure.io/xmlto/c/1375e2df75530cd198bd16ac3de38e2b0d126276?branch=master +https://pagure.io/xmlto/c/412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b?branch=master +https://pagure.io/xmlto/c/8e34f087bf410bcc5fe445933d6ad9bae54f24b5?branch=master +https://pagure.io/xmlto/c/6fa6a0e07644f20abf2596f78a60112713e11cbe?branch=master + +From 1375e2df75530cd198bd16ac3de38e2b0d126276 Mon Sep 17 00:00:00 2001 +From: Thomas Kuehne <thomas@kuehne.cn> +Date: Dec 11 2021 20:45:45 +0000 +Subject: fix -Wimplicit-int for ifsense + + +fixes: +xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int] + 46 | static ifsense; /* sense of last `if' or unless seen */ + | ^~~~~~~ + +Signed-off-by: Thomas Kuehne <thomas@kuehne.cn> + +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -43,7 +43,7 @@ + + static char **selections; /* selection tokens */ + static int nselections; /* number of selections */ +-static ifsense; /* sense of last `if' or unless seen */ ++static int ifsense; /* sense of last `if' or unless seen */ + static char *attribute; /* last attribute scanned */ + + struct stack_t { + + +From 412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b Mon Sep 17 00:00:00 2001 +From: Thomas Kuehne <thomas@kuehne.cn> +Date: Dec 11 2021 20:45:59 +0000 +Subject: fix extra ‘;’ outside of a function + + +Fixes: +xmlif/xmlif.l:240:24: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic] + 240 | int yywrap() {exit(0);}; + | ^ + +Signed-off-by: Thomas Kuehne <thomas@kuehne.cn> + +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -237,7 +237,7 @@ WS [ \t\n]* + + #include "config.h" + +-int yywrap() {exit(0);}; ++int yywrap() {exit(0);} + + main(int argc, char *argv[]) + { + + +From 8e34f087bf410bcc5fe445933d6ad9bae54f24b5 Mon Sep 17 00:00:00 2001 +From: Thomas Kuehne <thomas@kuehne.cn> +Date: Dec 11 2021 20:56:00 +0000 +Subject: Fix return type of main function + + +Fixes: +xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int] + 242 | main(int argc, char *argv[]) + | ^~~~ + +Signed-off-by: Thomas Kuehne <thomas@kuehne.cn> + +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -239,7 +239,7 @@ WS [ \t\n]* + + int yywrap() {exit(0);} + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + int i; + +@@ -265,7 +265,7 @@ main(int argc, char *argv[]) + exit(1); + } + +- yylex(); ++ return yylex(); + } + + /* + +From 6fa6a0e07644f20abf2596f78a60112713e11cbe Mon Sep 17 00:00:00 2001 +From: Thomas Kuehne <thomas@kuehne.cn> +Date: Dec 11 2021 21:03:42 +0000 +Subject: add strings.h import + + +Fixes: +xmlif/xmlif.l:162:13: warning: implicit declaration of function ‘strncasecmp’; did you mean ‘strncmp’? [-Wimplicit-function-declaration] + 162 | if (strncasecmp(selections[i], attr, eqoffset) == 0) + | ^~~~~~~~~~~ + +Signed-off-by: Thomas Kuehne <thomas@kuehne.cn> + +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -37,6 +37,7 @@ + */ + #include <string.h> + #include <stdlib.h> ++#include <strings.h> + + #define TRUE 1 + #define FALSE 0 diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r11.ebuild index 9188b524d598..bf44cdb5d846 100644 --- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild +++ b/app-text/xmlto/xmlto-0.0.28-r11.ebuild @@ -1,7 +1,7 @@ -# 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 autotools @@ -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 ~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 @@ -22,14 +23,18 @@ RDEPEND=" text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra ) " -# We only depend on flex when we patch the input lexer. DEPEND="${RDEPEND}" +# We only depend on lex when we patch the input lexer. +# We touch it in fix-warnings.patch. +BDEPEND="app-alternatives/lex" 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() { @@ -44,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-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild deleted file mode 100644 index 6b8268c5f689..000000000000 --- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~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-1.62.0-r1 - app-text/docbook-xml-dtd:4.2 - app-shells/bash:0 - dev-libs/libxslt - sys-apps/sed - >=sys-apps/coreutils-6.10-r1 - || ( sys-apps/util-linux app-misc/getopt ) - sys-apps/which - text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) - latex? ( dev-texlive/texlive-formatsextra )" -# We only depend on flex when we patch the imput lexer. -DEPEND="${RDEPEND}" - -DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS" - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.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 -} - -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/pdf2oo/metadata.xml b/app-text/xmltoman/metadata.xml index a639e8828d9c..cdc9d054966e 100644 --- a/app-text/pdf2oo/metadata.xml +++ b/app-text/xmltoman/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">pdf2oo</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/files/xournal-0.4.8-c99-fix.patch b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch new file mode 100644 index 000000000000..ee3689cddd70 --- /dev/null +++ b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch @@ -0,0 +1,89 @@ +Bug: https://bugs.gentoo.org/875158 + +Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-1.patch +Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-2.patch +Author: Denis Auroux <auroux@users.sourceforge.net> +Date: Sun Jan 24 15:48:16 2021 -0500 + + Fix implicit function declarations by including config.h in ttsubset/*.c + +--- a/src/ttsubset/list.c ++++ b/src/ttsubset/list.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */ + /* @(#)list.c 1.7 03/02/06 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #include <stdlib.h> + #include <assert.h> + #ifdef MALLOC_TRACE +--- a/src/ttsubset/sft.c ++++ b/src/ttsubset/sft.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)sft.c 1.17 03/01/08 SMI */ + + /* +@@ -43,6 +43,10 @@ + * @version 1.0 + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #include <assert.h> + #include <stdlib.h> + #include <string.h> +--- a/src/ttsubset/ttcr.c ++++ b/src/ttsubset/ttcr.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)ttcr.c 1.7 03/01/08 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #include <sys/types.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> + +Add missing include directives for make_dashed, set_cursor_busy. + +--- a/src/xo-image.c ++++ b/src/xo-image.c +@@ -25,6 +25,8 @@ + #include "xo-support.h" + #include "xo-image.h" + #include "xo-misc.h" ++#include "xo-selection.h" ++#include "xo-paint.h" + + // create pixbuf from buffer, or return NULL on failure + GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen) diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild index 8ea556bd5054..e2a69eb6c2f4 100644 --- a/app-text/xournal/xournal-0.4.8.2016.ebuild +++ b/app-text/xournal/xournal-0.4.8.2016-r1.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=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -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" @@ -23,7 +23,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,23 +36,26 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}"-0.4.8-c99-fix.patch +) src_prepare() { - default_src_prepare + default + if ! use vanilla; then eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch fi } src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install + emake DESTDIR="${D}" install desktop-install dodoc ChangeLog AUTHORS README dodoc -r html-doc/* diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild index 5afafb130f7e..8440bd9546ae 100644 --- a/app-text/xournal/xournal-9999.ebuild +++ b/app-text/xournal/xournal-9999.ebuild @@ -1,7 +1,7 @@ -# 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 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,8 +12,8 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" unset SRC_URI else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~x86" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" fi DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" @@ -21,9 +21,9 @@ HOMEPAGE="http://xournal.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+pdf" +IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,16 +36,23 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_install() { +src_prepare() { default - emake DESTDIR="${D}" desktop-install + if ! use vanilla; then + eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch + fi +} + +src_install() { + emake DESTDIR="${D}" install desktop-install + + dodoc ChangeLog AUTHORS README dodoc -r html-doc/* } diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index b8173784952a..5a40251ff5b3 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1 +1,2 @@ -DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346 +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.0.18-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch deleted file mode 100644 index 120e86ff586f..000000000000 --- a/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt -index b2029d68..2e1d68ba 100644 ---- a/src/xoj-preview-extractor/CMakeLists.txt -+++ b/src/xoj-preview-extractor/CMakeLists.txt -@@ -36,10 +36,6 @@ target_link_libraries (xournal-thumbnailer - - set (THUMBNAILER_BIN "xournal-thumbnailer") - --add_custom_command (TARGET xournal-thumbnailer POST_BUILD -- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN} --) -- - ## Install ## - - install (TARGETS xournal-thumbnailer diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch new file mode 100644 index 000000000000..dc3ecca1bad0 --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch @@ -0,0 +1,53 @@ +From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sat, 26 Feb 2022 19:05:39 +0100 +Subject: [PATCH 2/2] Do not compress manpages, this is done by the package + manager +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + man/CMakeLists.txt | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index 499d9297..974aea4b 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -9,27 +9,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}/src/xournalpp +- COMMAND gzip -n -f -9 ${MAN_PAGE} + DEPENDS ${CMAKE_BINARY_DIR}/src/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) +-- +2.34.1 + diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch new file mode 100644 index 000000000000..0698bc443fda --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch @@ -0,0 +1,31 @@ +From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sat, 26 Feb 2022 19:01:17 +0100 +Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + src/xoj-preview-extractor/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt +index 50d1b410..b653d983 100644 +--- a/src/xoj-preview-extractor/CMakeLists.txt ++++ b/src/xoj-preview-extractor/CMakeLists.txt +@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS + + set (THUMBNAILER_BIN "xournalpp-thumbnailer") + +-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD +- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN} +-) +- + ## Install ## + + install (TARGETS xournalpp-thumbnailer +-- +2.34.1 + 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.0.20.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild deleted file mode 100644 index 1feb81cd876a..000000000000 --- a/app-text/xournalpp/xournalpp-1.0.20.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" - unset SRC_URI -else - KEYWORDS="amd64" - SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz" -fi - -DESCRIPTION="Handwriting notetaking software with PDF annotation support" -HOMEPAGE="https://github.com/xournalpp/xournalpp" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -COMMONDEPEND=" - app-text/poppler[cairo] - dev-libs/glib - dev-libs/libxml2 - dev-libs/libzip:= - media-libs/portaudio[cxx] - media-libs/libsndfile - sys-libs/zlib:= - x11-libs/gtk+:3 -" -RDEPEND="${COMMONDEPEND} -" -DEPEND="${COMMONDEPEND} -" -BDEPEND=" - virtual/pkgconfig - sys-apps/lsb-release -" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.18-nostrip.patch" # bug 745255 -) - -src_prepare() { - cmake_src_prepare -} diff --git a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild new file mode 100644 index 000000000000..77d1e2514686 --- /dev/null +++ b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +else + 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" +HOMEPAGE="https://github.com/xournalpp/xournalpp" + +LICENSE="GPL-2" +SLOT="0" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} + app-text/poppler[cairo] + dev-libs/glib + dev-libs/libxml2 + dev-libs/libzip:= + gnome-base/librsvg + media-libs/portaudio[cxx] + media-libs/libsndfile + sys-libs/zlib:= + x11-libs/gtk+:3 +" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-apps/lsb-release +" + +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.2.3.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild new file mode 100644 index 000000000000..df7aa6c945ea --- /dev/null +++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +else + 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" +HOMEPAGE="https://github.com/xournalpp/xournalpp" + +LICENSE="GPL-2" +SLOT="0" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +COMMON_DEPEND=" + ${LUA_DEPS} + app-text/poppler[cairo] + >=dev-libs/glib-2.32.0 + dev-libs/libxml2 + >=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.18.9:3 +" +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" +BDEPEND=" + virtual/pkgconfig + sys-apps/lsb-release +" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-nostrip.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/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild index a2510c4f8952..df7aa6c945ea 100644 --- a/app-text/xournalpp/xournalpp-9999.ebuild +++ b/app-text/xournalpp/xournalpp-9999.ebuild @@ -1,17 +1,17 @@ -# 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 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" - SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz" + 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,27 +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:= - 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 " -src_prepare() { - cmake_src_prepare +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-nostrip.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/Manifest b/app-text/xpdf/Manifest index af00a43fdcac..5f89e2aa56cf 100644 --- a/app-text/xpdf/Manifest +++ b/app-text/xpdf/Manifest @@ -1,4 +1,5 @@ -DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f +DIST xpdf-4.04.tar.gz 969535 BLAKE2B 981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8 SHA512 a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf +DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab SHA512 4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1 SHA512 91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75 SHA512 c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e 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/files/xpdf-4.04-libpaper-2.patch b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch new file mode 100644 index 000000000000..d6f3df150baf --- /dev/null +++ b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/870217 +https://forum.xpdfreader.com/viewtopic.php?t=42367 +https://github.com/rrthomas/libpaper/issues/29 +--- a/xpdf/GlobalParams.cc ++++ b/xpdf/GlobalParams.cc +@@ -655,7 +655,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) { + base14SysFonts = new GHash(gTrue); + sysFonts = new SysFontList(); + #if HAVE_PAPER_H +- char *paperName; ++ const char *paperName; + const struct paper *paperType; + paperinit(); + if ((paperName = systempapername())) { 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.03.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild index c9761c8e26b8..cf95468f9077 100644 --- a/app-text/xpdf/xpdf-4.03.ebuild +++ b/app-text/xpdf/xpdf-4.04-r1.ebuild @@ -1,9 +1,10 @@ -# 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 desktop xdg +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" @@ -20,7 +21,8 @@ SRC_URI="https://dl.xpdfreader.com/${P}.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" @@ -29,6 +31,7 @@ IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect util BDEPEND=" icons? ( gnome-base/librsvg ) + verify-sig? ( sec-keys/openpgp-keys-xpdf ) " DEPEND=" cups? ( @@ -36,7 +39,7 @@ DEPEND=" net-print/cups ) fontconfig? ( media-libs/fontconfig ) - libpaper? ( app-text/libpaper ) + libpaper? ( app-text/libpaper:= ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 @@ -52,10 +55,18 @@ PATCHES=( "${FILESDIR}"/${PN}-automagic.patch "${FILESDIR}"/${PN}-visibility.patch "${FILESDIR}"/${PN}-shared-libs.patch + "${FILESDIR}"/${PN}-4.04-libpaper-2.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|; @@ -81,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/yelp-tools/Manifest b/app-text/yelp-tools/Manifest index ee27df274d0f..971ba10c714b 100644 --- a/app-text/yelp-tools/Manifest +++ b/app-text/yelp-tools/Manifest @@ -1 +1 @@ -DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628 +DIST yelp-tools-42.1.tar.xz 38936 BLAKE2B 9c068fb6c41fc6a9f22b1ffd632eeb648685b7bd09cad498910ddfa56696218ebaf643c17a6951756c88978bdae82c0622068c43e4f57ff57a96fa6d6b86a95f SHA512 e05a61d18179a9816ec38d1a2335091a3846cf74bb1ecec5374c9a13cc8962d14416208e04eec92f4ee43ec90e1992cc4a263bc4c267caac5d154a15f10d3006 diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml index 7b343b06be8a..ff91c5812f07 100644 --- a/app-text/yelp-tools/metadata.xml +++ b/app-text/yelp-tools/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/yelp-tools</remote-id> + </upstream> </pkgmetadata> diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-42.1.ebuild index 6cef89d63181..2f882d1a7ee2 100644 --- a/app-text/yelp-tools/yelp-tools-40.0.ebuild +++ b/app-text/yelp-tools/yelp-tools-42.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome2 meson python-single-r1 DESCRIPTION="Collection of tools for building and converting documentation" @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools" LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -22,9 +22,7 @@ RDEPEND=" >=gnome-extra/yelp-xsl-3.38 " DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" pkg_setup() { python-single-r1_pkg_setup diff --git a/app-text/yodl/yodl-4.03.00.ebuild b/app-text/yodl/yodl-4.03.00.ebuild index 0f7adc8fbc7a..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-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,23 +16,13 @@ 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 ) " -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then - die "Your compiler doesn't fully support C++17. Use GCC 8 or newer." - elif tc-is-clang && [[ $(clang-major-version) -lt 6 ]]; then - die "Your compiler doesn't fully support C++17. Use Clang 6 or newer." - fi - fi -} - src_prepare() { sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \ -e "/COMPILER =/s/gcc/$(tc-getCC)/" \ diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest index e8c6f8c0893a..3524725f2335 100644 --- a/app-text/zathura-cb/Manifest +++ b/app-text/zathura-cb/Manifest @@ -1 +1,2 @@ -DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8 +DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029 +DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml index e0e23d23393f..2905913bb5c1 100644 --- a/app-text/zathura-cb/metadata.xml +++ b/app-text/zathura-cb/metadata.xml @@ -1,7 +1,13 @@ <?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>nrk@disroot.org</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <maintainer status="active"> <email>mlq@pwmt.org</email> diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild new file mode 100644 index 000000000000..c38af1169e7e --- /dev/null +++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 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-cb.git" + EGIT_BRANCH="develop" +else + KEYWORDS="amd64 arm ~riscv x86" + SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz" +fi + +DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support" +HOMEPAGE="https://pwmt.org/projects/zathura-cb/" + +LICENSE="ZLIB" +SLOT="0" + +RDEPEND="app-arch/libarchive:= + >=app-text/zathura-0.3.9 + dev-libs/girara + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2[jpeg] + x11-libs/gtk+:3" + +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +BDEPEND="virtual/pkgconfig" diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild index dbee873ba606..a20b5eca3b9d 100644 --- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild +++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg-utils optfeature @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="amd64 arm ~riscv x86" - SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz" fi DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support" diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild index de2653af775d..fa6f6f40d74b 100644 --- a/app-text/zathura-cb/zathura-cb-9999.ebuild +++ b/app-text/zathura-cb/zathura-cb-9999.ebuild @@ -1,9 +1,9 @@ -# 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 meson xdg-utils optfeature +inherit meson xdg if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="~amd64 ~arm ~riscv ~x86" - SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz" fi DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support" @@ -20,24 +20,15 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/" LICENSE="ZLIB" SLOT="0" -DEPEND="app-arch/libarchive:= +RDEPEND="app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo - x11-libs/gdk-pixbuf:2 + x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:3" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" BDEPEND="virtual/pkgconfig" - -pkg_postinst() { - xdg_desktop_database_update - - optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg] -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest index feb77d21eaf3..5de3781f22b8 100644 --- a/app-text/zathura-pdf-mupdf/Manifest +++ b/app-text/zathura-pdf-mupdf/Manifest @@ -1 +1,2 @@ -DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97 +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.4.0-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch new file mode 100644 index 000000000000..caa0da05e37c --- /dev/null +++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch @@ -0,0 +1,39 @@ +--- 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,17 +31,15 @@ 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') + libopenjp2 = dependency('libopenjp2') + gumbo = dependency('gumbo') +- tesseract = dependency('tesseract') +- leptonica = dependency('lept') + mujs = dependency('mujs') + + build_dependencies += [ +@@ -50,8 +47,6 @@ else + libjbig2dec, + libopenjp2, + gumbo, +- tesseract, +- leptonica, + mujs + ] + endif diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml index 18a11cea9c40..348798600314 100644 --- a/app-text/zathura-pdf-mupdf/metadata.xml +++ b/app-text/zathura-pdf-mupdf/metadata.xml @@ -1,7 +1,14 @@ <?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>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <maintainer status="active"> <email>mlq@pwmt.org</email> @@ -11,8 +18,7 @@ <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> + <doc lang="en">https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/blob/master/README.md</doc> + <bugs-to>https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild deleted file mode 100644 index c9664c2423f9..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/" - -LICENSE="ZLIB" -SLOT="0" - -DEPEND=">=app-text/mupdf-1.17:= - >=app-text/zathura-0.3.9 - dev-libs/girara - dev-libs/glib:2 - media-libs/jbig2dec:= - media-libs/openjpeg:2= - virtual/jpeg:0 - x11-libs/cairo" - -RDEPEND="${DEPEND}" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - sed -i -e '/mupdfthird/d' meson.build || die "sed failed" - - default -} diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild new file mode 100644 index 000000000000..80d004c0aeca --- /dev/null +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 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" +IUSE="+javascript" + +DEPEND=" + >=app-text/mupdf-1.20.0:=[javascript?] + >=app-text/zathura-0.5.2:= + dev-libs/girara + dev-libs/glib:2 + x11-libs/cairo +" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-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-mupdf/zathura-pdf-mupdf-0.4.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild new file mode 100644 index 000000000000..94db4774090d --- /dev/null +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 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" +IUSE="+javascript" + +DEPEND=" + >=app-text/mupdf-1.20.0:=[javascript?] + >=app-text/zathura-0.5.2:= + dev-libs/girara + dev-libs/glib:2 + x11-libs/cairo +" + +RDEPEND="${DEPEND}" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${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-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild index f3f90d3b0870..53bd172f9007 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg @@ -11,30 +11,36 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz" fi DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/" +HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" LICENSE="ZLIB" SLOT="0" +IUSE="+javascript" -DEPEND=">=app-text/mupdf-1.17:= - >=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 - media-libs/jbig2dec:= - media-libs/openjpeg:2= - virtual/jpeg:0 - x11-libs/cairo" + x11-libs/cairo +" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -src_prepare() { - sed -i -e '/mupdfthird/d' meson.build || die "sed failed" +PATCHES=( + "${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 bfd24e4c371b..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.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde -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 9e8a429671ba..35a79df28eb8 100644 --- a/app-text/zathura-pdf-poppler/metadata.xml +++ b/app-text/zathura-pdf-poppler/metadata.xml @@ -1,21 +1,19 @@ <?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> - <name>Moritz Lipp</name> + <email>mlq@pwmt.org</email> + <name>Moritz Lipp</name> </maintainer> - <maintainer status="active"> - <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> + <maintainer status="active"> + <email>sebastian+dev@ramacher.at</email> + <name>Sebastian Ramacher</name> + </maintainer> + <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.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild index efb6d5f25416..285a4b6a6533 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.1-r1.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 @@ -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 ~riscv x86" SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz" fi @@ -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.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild index ebbe11bcdbf3..4c9b1c46bdfe 100644 --- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild +++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 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,8 +10,8 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git" EGIT_BRANCH="develop" else - KEYWORDS="amd64 arm x86" - SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="PDF plug-in for zathura" @@ -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 1d1d57e3ea67..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-2021 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 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="~amd64 ~arm ~riscv ~x86" - SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="PDF plug-in for zathura" @@ -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-ps/Manifest b/app-text/zathura-ps/Manifest index eba030e6d419..70c1e626dabc 100644 --- a/app-text/zathura-ps/Manifest +++ b/app-text/zathura-ps/Manifest @@ -1 +1 @@ -DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb +DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild index 023f84490bc9..8ccbde58f647 100644 --- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild +++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg-utils @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux" - SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz" fi DESCRIPTION="PostScript plug-in for zathura" diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild index 01488806de7c..52b16b0f9b8d 100644 --- a/app-text/zathura-ps/zathura-ps-9999.ebuild +++ b/app-text/zathura-ps/zathura-ps-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg-utils @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH="develop" else KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" - SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz" + SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz" fi DESCRIPTION="PostScript plug-in for zathura" diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest index 17d373d4aa46..97caafbb2f92 100644 --- a/app-text/zathura/Manifest +++ b/app-text/zathura/Manifest @@ -1,4 +1,4 @@ -DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b -DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7 -DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78 -DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60 +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/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch new file mode 100644 index 000000000000..f3d88a2746d2 --- /dev/null +++ b/app-text/zathura/files/zathura-disable-seccomp-tests.patch @@ -0,0 +1,22 @@ +diff --git a/tests/meson.build b/tests/meson.build +index ac7edb8..68216f3 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -25,17 +25,6 @@ if check.found() + 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', sandbox, +- timeout: 60*60 +- ) +- endif +- + utils = executable('test_utils', ['test_utils.c', 'tests.c'], + dependencies: build_dependencies + test_dependencies, + include_directories: include_directories, diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml index f7b9cf89b9e1..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,8 +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.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild deleted file mode 100644 index cccc28f4066c..000000000000 --- a/app-text/zathura/zathura-0.4.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -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" - KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="ZLIB" -SLOT="0" -IUSE="doc +magic seccomp sqlite synctex test" - -RESTRICT="!test? ( test )" - -DEPEND=">=dev-libs/girara-0.3.3 - >=dev-libs/glib-2.50:2 - >=sys-devel/gettext-0.19.8 - x11-libs/cairo[X] - >=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 )" - -RDEPEND="${DEPEND}" - -BDEPEND="doc? ( dev-python/sphinx ) - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" - -src_configure() { - local emesonargs=( - -Dconvert-icon=disabled - -Dmagic=$(usex magic enabled disabled) - -Dmanpages=$(usex doc enabled 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 -} diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.5.ebuild deleted file mode 100644 index 08b6a2a8e21d..000000000000 --- a/app-text/zathura/zathura-0.4.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx - -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" - KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="ZLIB" -SLOT="0" -IUSE="doc +magic seccomp sqlite synctex test" - -RESTRICT="!test? ( test )" - -DEPEND=">=dev-libs/girara-0.3.3 - >=dev-libs/glib-2.50:2 - >=sys-devel/gettext-0.19.8 - x11-libs/cairo[X] - >=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 )" - -RDEPEND="${DEPEND}" - -BDEPEND="doc? ( dev-python/sphinx ) - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" - -src_configure() { - local emesonargs=( - -Dconvert-icon=disabled - -Dmagic=$(usex magic enabled disabled) - -Dmanpages=$(usex doc enabled 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 -} diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild index 1be1a7793199..bf8c8261af3f 100644 --- a/app-text/zathura/zathura-0.4.7.ebuild +++ b/app-text/zathura/zathura-0.5.2-r4.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,38 +13,44 @@ 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/~turret/distfiles/${PN}/${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.3 +DEPEND=">=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 - magic? ( sys-apps/file ) + sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )" RDEPEND="${DEPEND}" -BDEPEND="doc? ( dev-python/sphinx ) +BDEPEND=" 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) @@ -52,6 +58,11 @@ src_configure() { meson_src_configure } +src_install() { + meson_src_install + doman "${WORKDIR}"/man/zathura* +} + src_test() { virtx meson_src_test } diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.5.2-r5.ebuild index b73544c83c5c..1ad4fe4776d4 100644 --- a/app-text/zathura/zathura-0.4.3.ebuild +++ b/app-text/zathura/zathura-0.5.2-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 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 +inherit meson virtualx xdg DESCRIPTION="A highly customizable and functional document viewer" HOMEPAGE="https://pwmt.org/projects/zathura/" @@ -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://pwmt.org/projects/zathura/download/${P}.tar.xz" - KEYWORDS="amd64 arm 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.2 +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[X] + 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 932897b2939e..3cf03fc8f6e7 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -1,9 +1,9 @@ -# 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 meson virtualx +inherit meson virtualx xdg DESCRIPTION="A highly customizable and functional document viewer" HOMEPAGE="https://pwmt.org/projects/zathura/" @@ -13,38 +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" -IUSE="doc +magic seccomp sqlite synctex test" +SLOT="0/5.6" +IUSE="seccomp sqlite synctex test" RESTRICT="!test? ( test )" -DEPEND=">=dev-libs/girara-0.3.3 +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 - magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) - sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - -RDEPEND="${DEPEND}" + 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 +" -BDEPEND="doc? ( dev-python/sphinx ) - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/zathura-0.5.4-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 +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/gocr/metadata.xml b/app-text/zeal/metadata.xml index 20f8c25eb8ae..af3ff4b585c0 100644 --- a/app-text/gocr/metadata.xml +++ b/app-text/zeal/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-needed --> - <upstream> - <remote-id type="sourceforge">jocr</remote-id> - </upstream> + <!--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 88755cde6230..c0fb797ec0bf 100644 --- a/app-text/zotero-bin/Manifest +++ b/app-text/zotero-bin/Manifest @@ -1 +1,6 @@ -DIST zotero-bin-5.0.96.3.tar.bz2 61236517 BLAKE2B 3de6d41349f9cc405dd3d44e8e456169d58bdd1f4522c31cd168182878839fe8ca6280eff7339bcf3d66c87c7d4f5af55d768551abcff3cd579342cae37b64e3 SHA512 0777ec41bc151b0bd30076f8a7f59e431c3435728b4d85298421ef11aea5b7c1e122d3bb7fcc5551bb8c4472922796d9508a56df7a0913515d8568fcf3ca6fee +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-5.0.96.3.ebuild b/app-text/zotero-bin/zotero-bin-6.0.27.ebuild index 561cabf9e7f0..07c557e6c051 100644 --- a/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild +++ b/app-text/zotero-bin/zotero-bin-6.0.27.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=8 @@ -7,14 +7,18 @@ inherit desktop xdg DESCRIPTION="Helps you collect, organize, cite, and share your research sources" HOMEPAGE="https://www.zotero.org" -SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2" +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" +KEYWORDS="-* ~amd64 ~x86" RDEPEND=" - dev-libs/atk + app-accessibility/at-spi2-core dev-libs/dbus-glib dev-libs/glib dev-libs/nspr @@ -22,6 +26,7 @@ RDEPEND=" media-libs/fontconfig media-libs/freetype sys-apps/dbus + sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 @@ -39,11 +44,15 @@ RDEPEND=" x11-libs/pango " -S="${WORKDIR}/Zotero_linux-x86_64" - -QA_PREBUILT="/opt/zotero/*" +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 @@ -52,15 +61,21 @@ src_prepare() { extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die # fix desktop-file - sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop - sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop + 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 "${S}"/* "${ED}/opt/zotero" || die + cp -a * "${ED}/opt/zotero" || die dosym ../../opt/zotero/zotero usr/bin/zotero diff --git a/app-text/zotero-bin/zotero-bin-6.0.30.ebuild b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild new file mode 100644 index 000000000000..07c557e6c051 --- /dev/null +++ b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 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 +} 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 +} |