6 files changed, 10 insertions, 132 deletions
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index c8616542fbf8..1cf9e94f082f 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,4 +1,2 @@
-DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
-DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
-DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
+DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index 28c877d0d1a0..2d0a40804a19 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -5,9 +5,6 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<use>
-		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index 8869adee5af0..e53d880756c9 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.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
@@ -10,7 +10,7 @@ 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 ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.0.1-r2.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index 317f5e7d464c..b32b5ca29efb 100644
--- a/app-text/qpdf/qpdf-10.0.1-r2.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.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
@@ -8,13 +8,10 @@ HOMEPAGE="https://sourceforge.net/projects/qpdf/"
 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 ~m68k-mint ~sparc-solaris"
-IUSE="doc examples libressl ssl static-libs test"
-
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,9 +25,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		sys-apps/diffutils
-		media-libs/tiff
 		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
 	)
 "
 
@@ -42,11 +39,11 @@ src_configure() {
 		--enable-crypto-gnutls
 		--enable-crypto-native
 		--with-default-crypto=gnutls
+		--disable-static
 		$(use_enable ssl crypto-openssl)
-		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
 	)
-	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/app-text/qpdf/qpdf-9.0.2-r1.ebuild b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
deleted file mode 100644
index f9ccb71054b6..000000000000
--- a/app-text/qpdf/qpdf-9.0.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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="https://sourceforge.net/projects/qpdf/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/26"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff(+)]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-9.1.1-r2.ebuild b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
deleted file mode 100644
index 037cc0ae6906..000000000000
--- a/app-text/qpdf/qpdf-9.1.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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="https://sourceforge.net/projects/qpdf/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/26"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff(+)]
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}