From 49ac1f4985e3a0c393d70d53825d3ff5ca8b56e9 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 16 Oct 2023 10:19:49 +0100 Subject: [PATCH 1/4] app-text/libpaper: add 2.1.2 Signed-off-by: Sam James --- app-text/libpaper/Manifest | 1 + app-text/libpaper/libpaper-2.1.2.ebuild | 30 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 app-text/libpaper/libpaper-2.1.2.ebuild diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest index 420c5ed927442..23883c1ac6869 100644 --- a/app-text/libpaper/Manifest +++ b/app-text/libpaper/Manifest @@ -3,4 +3,5 @@ DIST libpaper-2.0.12.tar.gz 1304598 BLAKE2B e8a78fc3efc3d0676e8596c0c457f4ebab26 DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcff15acbac126535f526312900650e25fa0a4d68ceebc5d718f5135be22a9f9407d690dc5d5e22eab9dc55b040fc8 SHA512 d603a807c8fdc57b704cdfdc90bedf05c54c8a7b67e8cf52f26298c22a6cee5291fcadc6e67d28b00cf9d68f4890a394e56c8e91f0b97c8edfac4662fe4dc8f0 DIST libpaper-2.1.0.tar.gz 1306128 BLAKE2B 6e44e3d2fcf01faa551b1df401155a96b8612f5372683cf8f62af7af4ec93e748c650a3246a0548c3fea9f48c4f61b21a0a9c6310d4d19aed599b8b165c0bd72 SHA512 0e54084ee4aada1eb87cb8e0423ff23039298b0135c7f1c7c92794ef9010ab0704e5fab94f2e34dfbee2f8c048e11b6acecc04a4f3ac7c772dec5be43f870392 DIST libpaper-2.1.1.tar.gz 1262975 BLAKE2B 1605accd560f34ffc08f556fbab6caae4f945dccf83a08e2a0f1f971915d914450a615bf76db316fce3e32a38e53a6a77751df7617d0271cd1f55eaa7db084e8 SHA512 90fabb586115d99c9fb4d4ecee87ac0d1b2ac17ddf0c89287eb82e21834b0a2bc7cd5049fb73f3e20e4b494c374413c388b28c3274ceb278ce81928e17fde288 +DIST libpaper-2.1.2.tar.gz 1264200 BLAKE2B d931c70ea1b26e57ef5cf120189dbf089d7b122ab195b154e6dc100845f63acd051195662d1b019a2f738ebe65047207b39609f4db0e748eaabc3868f3a2ccb0 SHA512 29c5d8074c10f6413b4eaf779153828e59b4b7353e6b380b37ed6cac04a92dc367da775a62e561b47064728f4173cb526d05a8abd80334ad229ee2a42039ac7b DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc 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 0000000000000..2cae82b147f6f --- /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 +} From 204c6662911a03e54d0c31af152e26e41a9f9f20 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 16 Oct 2023 10:23:56 +0100 Subject: [PATCH 2/4] app-text/qpdf: add 11.6.3 Signed-off-by: Sam James --- app-text/qpdf/Manifest | 2 + app-text/qpdf/qpdf-11.6.3.ebuild | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 app-text/qpdf/qpdf-11.6.3.ebuild diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest index da46c139147c0..462a513f77549 100644 --- a/app-text/qpdf/Manifest +++ b/app-text/qpdf/Manifest @@ -12,3 +12,5 @@ DIST qpdf-11.6.1-doc.zip 6861634 BLAKE2B bc9f566de9bc403e9a81184ef860cf2c3925322 DIST qpdf-11.6.1.tar.gz 18646767 BLAKE2B fd6163963eb192b38ed1e78cba443e9e247e6ff408efd6cb480c81ac3d9d233e00edf9ef0858e51ac755b2b7cea0d8763ac6dda3fe9d54618114b4b3a00d5b15 SHA512 a3ce1a531331a6f7e33244d598118f9463f92f0466fd1f2aa3dcdc6dc2c1db0811d00e5ff16ad33ccc81a702ff8dbec719f56194f944de1e00f5e6cc8ed17a69 DIST qpdf-11.6.2-doc.zip 6863319 BLAKE2B d140a35de156a40dc62ac900f2095d826760d05bdb58c2b6d8ba8ec68d823d9ab5022027d634f82b3a182ec3a842f22f44b659df7355c55e74d8e31a11458a2b SHA512 0d81c3a467833fd66668e2cbc6afef3346cbf2eeb01eaffc532165a19910a000e9e7eea0174e4b930ecd55e423680e39a7b0c8bb6f618e6f9c019058b6bd90ce DIST qpdf-11.6.2.tar.gz 18656098 BLAKE2B e34c40dcea3e6a3a25a3624bff6afea80ee18f4f02c16b2442a8fc622ab0b6eddd1e8660f3c35f4e3115206a34a97c64e53b9aac46e896517ed5c05aed9d341b SHA512 58f8eff51f4bf64a5cbc40af467aa0626f7f25a31222711e06596f9fccd9ecc0d9d7d87cf65e2055d23409d23458e33bc94f303cd797d00af3c6bc5872b3ef28 +DIST qpdf-11.6.3-doc.zip 6864204 BLAKE2B 05a9d44b877ab9eab4548646ec2cd8110a47e594b0b1d364c7a5d25b249efa368f94c0e549da8697f685fde17ce59378a32e6c31f5dcd1731c97a2434cbe5af0 SHA512 0cdeb6d408823a49909d2394a9cedd8ae5d4f9fd4f4dbef70ce60c60401bc9b78b1740669f46b78609f11b0b4c8bdaafe094158e52b9449dca32d6afd3ece377 +DIST qpdf-11.6.3.tar.gz 18660605 BLAKE2B c684dab7544fe6024db26c7538cc2e16319aeb6c023b53ea97ec9c5ae474ac67538a99a80524d924ac0758f0fc7d552dbea1a47df7595b25dbec121738a07ec8 SHA512 afc1d130e10bb527a7425ce39f6d93245c3d9b08002d104fdf0e909b586f80174fa2eed863794f10b76bab86a064b904eebca89902212accc45a68f9430c122e diff --git a/app-text/qpdf/qpdf-11.6.3.ebuild b/app-text/qpdf/qpdf-11.6.3.ebuild new file mode 100644 index 0000000000000..cd7413346d613 --- /dev/null +++ b/app-text/qpdf/qpdf-11.6.3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake bash-completion-r1 + +DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files" +HOMEPAGE="https://qpdf.sourceforge.net/" +# TODO: verify-sig +SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz" +SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )" + +LICENSE="|| ( Apache-2.0 Artistic-2 )" +# Subslot for libqpdf soname version (just represent via major version) +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gnutls ssl test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + sys-libs/zlib + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + ) +" +DEPEND=" + ${RDEPEND} + test? ( + app-text/ghostscript-gpl[tiff(+)] + media-libs/tiff + sys-apps/diffutils + ) +" +BDEPEND=" + dev-lang/perl + doc? ( app-arch/unzip ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # glibc only (bug #899052) + malloc_info +) + +src_configure() { + # 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 + ) + + if use ssl ; then + local crypto_provider=$(usex gnutls GNUTLS OPENSSL) + local crypto_provider_lowercase=${crypto_provider,,} + mycmakeargs+=( + -DDEFAULT_CRYPTO=${crypto_provider_lowercase} + -DREQUIRE_CRYPTO_${crypto_provider}=ON + ) + fi + + cmake_src_configure +} + +src_install() { + if use doc ; then + mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die + fi + + cmake_src_install + + # Completions + dobashcomp completions/bash/qpdf + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_qpdf +} From 450689ae4f85a760ca298c1ab26a02279cd80b3d Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 16 Oct 2023 10:25:16 +0100 Subject: [PATCH 3/4] package.mask: Last rite dev-perl/PathTools Signed-off-by: Sam James --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 7ab64a3915b2d..660fa63727ca0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# Sam James (2023-10-16) +# Part of Perl core and better maintained there - the version on CPAN is out of +# date and incompatible with Perl 5.38. No reverse dependencies. +# Removal on 2023-11-15. +dev-perl/PathTools + # Michał Górny (2023-10-15) # These packages were required by old version of dev-python/jupyterlab # and dev-python/notebook, and are no longer used. From 6a4601492180cce23233e15762156e3682147936 Mon Sep 17 00:00:00 2001 From: Matoro Mahri Date: Sat, 14 Oct 2023 18:53:53 -0400 Subject: [PATCH 4/4] perl-module.eclass: extend DIST_TEST="do" to cover make-based tests For packages using make to run tests rather than Test::Harness, DIST_TEST="do" is ineffective at disabling parallelization. This forces -j1 on these packages when set. Bug: https://bugs.gentoo.org/909051 Signed-off-by: Matoro Mahri Closes: https://github.com/gentoo/gentoo/pull/33354 Signed-off-by: Sam James --- eclass/perl-module.eclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 32cd603c7be55..7bb02abed8c56 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -335,6 +335,7 @@ perl-module_src_test() { local my_test_control local my_test_verbose + local my_test_makeopts [[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn "DIST_TEST_OVERRIDE is set to ${DIST_TEST_OVERRIDE}" my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} @@ -344,6 +345,10 @@ perl-module_src_test() { return 0 fi + if has 'do' ${my_test_control} && ! has 'parallel' ${my_test_control} ; then + my_test_makeopts="-j1" + fi + if has verbose ${my_test_control} ; then my_test_verbose=1 else @@ -383,7 +388,7 @@ perl-module_src_test() { if [[ -f Build ]] ; then ./Build test verbose=${my_test_verbose} || die "test failed" elif [[ -f Makefile ]] ; then - emake test TEST_VERBOSE=${my_test_verbose} + emake ${my_test_makeopts} test TEST_VERBOSE=${my_test_verbose} fi }