[gentoo-commits] repo/gentoo:master commit in: app-text/qpdf/

["Sam James" <sam@gentoo.org>]

commit:     e176e9f5bc41773bb7f831e8e89c4c33ac05d84a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 23:15:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 23:18:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e176e9f5

app-text/qpdf: add 11.0.0, drop 10.6.3-r100

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/qpdf/Manifest                             |  4 +--
 ...{qpdf-10.6.3-r100.ebuild => qpdf-11.0.0.ebuild} | 29 ++++++++--------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 035722761501..dd9f4edd84a6 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,4 +1,4 @@
 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
+DIST qpdf-11.0.0-doc.zip 7049971 BLAKE2B 25191511e4327d99eab8bcd08b1db3a16c5289898034d1ec12d4f551264da489e040b2cac25d34f320898ad5698f2f7578c4ce7c0ec73c682ae2583f341ab996 SHA512 1e393007a4334467668079b4807724d36e9af15f05696f9b512a28b7172a9f74180c684141b3bec9dd973ba37827b159c3fd3adbd1da3061899d9a81cffb5da6
+DIST qpdf-11.0.0.tar.gz 18452218 BLAKE2B bb1dabae56f6ef5ca635ec7a0434387294ff6b6150ed19335243ac8774f4ecb57a7f97b00ef07c0c4f3bdfd2b510b4699324f77405c2342162c37a7860313c56 SHA512 08f1f3cfb3bc1532d04da9a3453dee6c9b411020c0a1dfe112da1961dd4d6dc76d6e89d57cb00b3b8b0cf0848e9fd3032a16c3c591a89b5631d0badfb44ef234

diff --git a/app-text/qpdf/qpdf-10.6.3-r100.ebuild b/app-text/qpdf/qpdf-11.0.0.ebuild
similarity index 59%
rename from app-text/qpdf/qpdf-10.6.3-r100.ebuild
rename to app-text/qpdf/qpdf-11.0.0.ebuild
index 1cc2e3c951f6..eee23faf57a7 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 ~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