gentoo auto-resync : 14:09:2022 - 11:10:10

2 files changed, 13 insertions, 22 deletions

diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index dec25cb20892..02272ef23f57 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,7 @@
 DIST qpdf-10.6.3-doc.zip 6852725 BLAKE2B 407b5994d3c3f80f71e60da12ebecf2c977fecb9e42be1aef32586b7b743bb62acc9662bc02fee174f9738f3e4e43e2769a5df415ae4bb9fb80f16b9d00cfd0e SHA512 780c25df78bc0360a17de85b0701f2e929677b02989d47c6e26b57749dd2315bb21511de9d8d40670a4745254c5c17fcf1c649233be1a0255b5a661f5dcda61b
-DIST qpdf-10.6.3.0cmake1-doc.zip 6894533 BLAKE2B 7c14f3de5225b90fd40ba8200b076c937d431a8dc5064d3ceb308c7d42f3624fe85ada7ed5661b7f3809e58ed8f6d3e55417782ebd6842cd9c60f09f896ce658 SHA512 b6a43476887371039922691c14f40be5d69230868c8f0c49555fb163ba339a6cfbebc7b140bf90d27e66e0fc864e69d8ee08d737ef2edf893447b5e49ee59920
-DIST qpdf-10.6.3.0cmake1.tar.gz 18241584 BLAKE2B 24231d6d5692052d1d4de74e2ccd150fa65efbdef94d2ea0823f9ef569ba7034f3b801ef3071d9d82da57e8c76952a215235190b6b5153b18646d582463ac0fb SHA512 27a8317eadc02370875ecb0f9c1d90e38c1538cde5f58d8a698891250b92525e26c6d523db595bf1ec675d5ddfe215a7483ff67f70febad5e14c808d466b8736
 DIST qpdf-10.6.3.tar.gz 18573584 BLAKE2B 3b6ee845163ab6593ba3d85e8563e4f56f57a831e2bf67fd3a2ccd19aaca47af8c50e03dede233380442384e5bb8fa3fc317a8c54732d2cf3bdfd7d152210a4c SHA512 c584b7443984b0f28eec2fbff054096b9a14a10858dda0c6b370d7a19e34c395ee15a8dc0770d3d85773281cd79944f029fb3bfad55833a2c32ff7e1a751c149
-EBUILD qpdf-10.6.3-r100.ebuild 2277 BLAKE2B 80acb7e8284309501aad91a7f972ebf714951d6ac844935ab87f6367899d52912ed77f885f54ec59b6b686a10794fcf79ad0b1ad48c42d4dcdd0fd4e8f756ba3 SHA512 713f71be6278aa4e87aac0bf484242e250ffa759d8aeb63e6792e19bf40bcc013c62a52a5bedde86b9f42f6f307a9c5db0c5b206c23d8a8b2da5da5bd4d9f359
+DIST qpdf-11.0.0-doc.zip 7049971 BLAKE2B 25191511e4327d99eab8bcd08b1db3a16c5289898034d1ec12d4f551264da489e040b2cac25d34f320898ad5698f2f7578c4ce7c0ec73c682ae2583f341ab996 SHA512 1e393007a4334467668079b4807724d36e9af15f05696f9b512a28b7172a9f74180c684141b3bec9dd973ba37827b159c3fd3adbd1da3061899d9a81cffb5da6
+DIST qpdf-11.0.0.tar.gz 18452218 BLAKE2B bb1dabae56f6ef5ca635ec7a0434387294ff6b6150ed19335243ac8774f4ecb57a7f97b00ef07c0c4f3bdfd2b510b4699324f77405c2342162c37a7860313c56 SHA512 08f1f3cfb3bc1532d04da9a3453dee6c9b411020c0a1dfe112da1961dd4d6dc76d6e89d57cb00b3b8b0cf0848e9fd3032a16c3c591a89b5631d0badfb44ef234
 EBUILD qpdf-10.6.3.ebuild 1855 BLAKE2B 3579d2303c15c8fc84a6bcb804986574f4a7e36f66e69b2411494c8106d6b1874e979809bf828b9a7af410494579da7fad762ff5df374abd0afbb105b7df6175 SHA512 2ceadd6b80689c2ae8a5ddd5e4960f441883005c61d3c6e18d52666421ac747330a6479485a606043e54f2530c8ab1426f6d1d554f7830bdd9d35dc7471f0077
+EBUILD qpdf-11.0.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-10.6.3-r100.ebuild b/app-text/qpdf/qpdf-11.0.0.ebuild
index 1cc2e3c951f6..bd30e1e661fc 100644
--- a/app-text/qpdf/qpdf-10.6.3-r100.ebuild
+++ b/app-text/qpdf/qpdf-11.0.0.ebuild
@@ -5,33 +5,22 @@ EAPI=8
 
 inherit cmake bash-completion-r1
 
-if [[ ${PVR} != 10.6.3-r100 ]] ; then
-	# See https://github.com/qpdf/qpdf/releases/tag/release-qpdf-10.6.3.0cmake1
-	die "Please update the ebuild / be careful with using it, as it's for previewing CMake!"
-fi
-
 DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
 HOMEPAGE="https://qpdf.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz
-#	doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
-# TODO: make SRC_URI generic
-SRC_URI="https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1.tar.gz"
-SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1-doc.zip )"
+# 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 = libqpdf soname version
-SLOT="0/28"
-# Unkeyworded testing version for CMake
-# Do not keyword -- qpdf 11 will be the first released version w/ CMake
-# This version is for packagers to test.
-# https://github.com/qpdf/qpdf/discussions/676
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples gnutls ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib
-	virtual/jpeg:0=
 	ssl? (
 		gnutls? ( net-libs/gnutls:= )
 		!gnutls? ( dev-libs/openssl:= )
@@ -56,7 +45,9 @@ src_configure() {
 	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
 	local mycmakeargs=(
 		-DINSTALL_EXAMPLES=$(usex examples)
-		-DINSTALL_MANUAL=ON
+
+		# Breaks install with USE=-doc in 11.0.0?
+		#-DINSTALL_MANUAL=ON
 	)
 
 	if use ssl ; then