gentoo resync : 03.11.2019

4 files changed, 13 insertions, 68 deletions

diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 6320879b6b13..4c5a56080bd7 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,11 @@
-DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
-DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
-DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
-EBUILD qpdf-7.0.0.ebuild 1212 BLAKE2B 0141c83c2b3ba8abed3d974b3a2d827c864f698eedacbfb0d01ceb447db4f30f8061da08ad0507e0f8d81158b19c2ef29e62a8102452d1af2fabe95096e99f68 SHA512 d7c68ba266f88000c5a98360c3ba568ae9f4a4093874b06a4c5ad9faca72abf32c8f4d6a6d1a94dced96063e88e90fa8aa6faa2bff3efdb2a73cc7ae5fb60490
-EBUILD qpdf-7.1.1.ebuild 1221 BLAKE2B b069833afe4b5ee03372ec40fe1831e171048422915228742fd9b3a9242be3157730bea25523f4c7a99295ad1e5b8d0d1de8c6e88be55c718975a9acf4f8e6f4 SHA512 ffbbd94355bc287e545ef723da53c8e1b89e23f49479c08a42209d677ba2d8c0c06af13b4a6c62f78352c7cb602df15d6b90aba23d458ef758edab506eae7aa4
+DIST qpdf-9.0.1.tar.gz 18172693 BLAKE2B ddb389b773b4664c1c3da270f1804f015c8f0a04ed57df7a4a1de9ff80cd47c6fd07c29836573bd6459cde42e8fd3986855a68632495df5363d220d6062669c7 SHA512 1bca5cf39f0019443f744c01ddc93773febca6883063fcec7f3541dd68359d8da44f34cf111cacb3bd9564f10bf1b09ea58173efd3ae06116e5c3832e61e82cc
+DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 EBUILD qpdf-8.2.1.ebuild 1246 BLAKE2B a5a9de3de8d4c2bbd9f36c6977626d1943eb1332f3b592d2fa0ee19107651c6601d51d5ef7987774c3a1a7d3dc1d89aeffa96bb8f70820a40ede9cb6f1bc5659 SHA512 d54a88037debb98c3e85d354a223a4f682fa1ff7d744244c7a9e9cca089141fe92aadcc6f2ef6006ae54911bccb0e107fe5d8739875483f5e26fa7c150db539f
 EBUILD qpdf-8.4.1.ebuild 1255 BLAKE2B 1b3e6004cc12bbc5e1b89d27b7100d963e9bfba4cc50c823cb356a021884196b11f5f43219e71fc74c31f946ea5da701b5fd7512ee852edab13f4268af55203f SHA512 c135d6a5af42997864e7f348f6464f6249d6a018eae0fb9352e7fa8b8c107702077f1e00daa48ff4e49af08c4d612b430ceac2063b3d8c49edd67ac618ca0e40
 EBUILD qpdf-8.4.2.ebuild 1256 BLAKE2B 8733a9c756fd75c166d6de06420795de427b19c60a5e7411dd271f7493c3a5ec493ac4813555587dd8acb429afc611937089c6f29ed3dd5699a4bc83c864f96f SHA512 8e2e971373eb77502adfa95962e5dddacb9ec781080ff5e5b72d2b43e2a9cc158885168f5dbbc191ba688b8dc20ededeaa3057682ab57d50afb80c8f2730f74e
-EBUILD qpdf-9.0.0.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
+EBUILD qpdf-9.0.1.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
+EBUILD qpdf-9.0.2.ebuild 1249 BLAKE2B 422ccd8dfb9eb35c3f27ee2d915f3cd5ff4c1c510d8c50dae6b9167372b0598e53085b3380b46fe432cc5f919a73f59dd3d90a88ddffb2afa557e9ec896f21b3 SHA512 8bcc08655c9b27d8e8d96f6b42a50d103c369b4919991872f7df3eef8bf7e841f2e810adda6498fa9d338b0b8c1db5aa7714ae9fe2e029c6831a506c1e2815eb
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-7.1.1.ebuild b/app-text/qpdf/qpdf-7.1.1.ebuild
deleted file mode 100644
index 7b0bf28566cf..000000000000
--- a/app-text/qpdf/qpdf-7.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/18"
-
-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"
-
-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() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-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' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-9.0.0.ebuild b/app-text/qpdf/qpdf-9.0.1.ebuild
index 32bef49367a9..32bef49367a9 100644
--- a/app-text/qpdf/qpdf-9.0.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.1.ebuild
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index d1bf435cf3c6..98f584a8c41a 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
 HOMEPAGE="http://qpdf.sourceforge.net/"
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 
 # subslot = libqpdf soname version
-SLOT="0/18"
+SLOT="0/26"
 
-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 ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
@@ -34,9 +34,11 @@ RDEPEND="${CDEPEND}
 DOCS=( ChangeLog README.md TODO )
 
 src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -51,5 +53,5 @@ src_install() {
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete || die
 }