gentoo auto-resync : 15:09:2022 - 17:13:11

15 files changed, 94 insertions, 57 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index cdfca2986f4b..81c4e6ba0ec9 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 16ed7edfb01d..7c1252bbe866 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3606 BLAKE2B 26a2e9a35853ca9689ad83d3ed651b616fccba709995254d4643219334be9226a53a396c393941bb628510bcdf10c328f8b39e6ed2c41c8d6e4487a3c38221d7 SHA512 451fc1c89756690ab854f6c0b3dcdd9cc55063013fccd6fff00bae867bbdb9576d53b6286e91a2feee4fcb449e2e85efedb4d6ccbd9f6a8518d760163b31b284
+EBUILD a2ps-4.14-r7.ebuild 3608 BLAKE2B 4cd8a24759e611dbb1cc213ebc8587154f844300a15d134b51bc26acc3e8baf26f624fe60b75d35c40f99813a32a6b5e3bf2f2ecf09ac405a192f8748b6b0901 SHA512 98130fdec528347fca365d35df2a455b8fb2986ffb22648cda7ae09d12c6a4c7a22ef1dbe500bdacdb3e9b6751d7d92a8e5d5a7eca423dfe3d789a2eb8d58314
 MISC metadata.xml 347 BLAKE2B 252d70af1bcfb8685137113cd50913be3154245eeac5cad0d719283c87b81af57a48268df9659968f98b4b1e77be16bf4b1af45cc69fd12c8cdbbe8432d4cb49 SHA512 dde37464c0674ff27febf9293b3ea71272d307ae3a61c7a243f8a61ec4283b004cb5496d121aa25dc143f0664bdb212b294dd471c7c10daa9f2f3f0fe5cdc319
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r7.ebuild
index 614a0ba87c55..5beff0baee31 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r7.ebuild
@@ -17,7 +17,7 @@ IUSE="cjk emacs latex nls static-libs vanilla"
 RESTRICT=test
 
 RDEPEND="app-text/ghostscript-gpl
-	app-text/libpaper
+	app-text/libpaper:=
 	>=app-text/psutils-1.17
 	app-text/wdiff
 	>=sys-apps/coreutils-6.10-r1
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 2a57b79ec0e5..655af94a96c5 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -3,6 +3,6 @@ DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a83
 DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e2935e142d172aa8c560e68250a4110ccb52167988af70e63d86fc3f462a5d521ac45f7b758cb8d1492670930d9b2dc2e196 SHA512 fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
 DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
 DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
-EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5158 BLAKE2B 8c355e6d6286d5d63376d89af80797de3b8975131f56cdcbd68ba7f4694d5cd221e9f375eca2e3ffa205e2d633c404d3b2c5c1766bf2a4c1cd6e4fa4fb5f038e SHA512 d8322a42acc21741207f560f3fbbb4fa1c99ea4cf73742c498b526dc6e6abe6beda369ad5a6463f8ae07a1f5de110ee6ffcc2922cc4ef29b0e0e1818f0fd2873
-EBUILD ghostscript-gpl-9.56.1.ebuild 5083 BLAKE2B 26870317287b429069e77edbbacc337d2d1cff7180c56790923a9c545e7bf523152d80a1ed1e4b7ff6d03421bf21be520f26f5ba6531b71eeee10f80b8e422a3 SHA512 9146bf18ea144fda2c71feb3a20156846b5d25bd64d35dfafe0ddcaaa00444a6c709da9576390e38e315e96a9112e25e1fc0cd7676c5361c47c6ef0e1a93451c
+EBUILD ghostscript-gpl-9.55.0-r2.ebuild 5160 BLAKE2B 3a0c5c1e5652b34ce81b381532fc10116ac320f4ba83607f25ba4935f4de72e98a4bc038bd89189da8a59c913775fc1c6377afd0523332c0642a26d40db652cb SHA512 b7318f81333290182e3f1d190c62580eee1c2552ba97433c3caace56565a06d9a0782cf984f940d58f47981c5ed3ddddcfeaf69ec1c456f93ed9171a7ab63445
+EBUILD ghostscript-gpl-9.56.1-r1.ebuild 5085 BLAKE2B 5d61e791ec990135f1f988b86026b2521d54071df56f32483a50b55372c52b14367381fb332434ce84bd106706c4ce57d70cfbd83d2122c6998cbbc2b541a6c5 SHA512 3a9c4c03fc058309c4d7f46ccdb8883a48b0dc62df2a3281febcf95fbef99dc611cbf0d4ca6f0be686e9f88f3e231e9132a061e7960e8e4f55332b8344a70d11
 MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r2.ebuild
index 2af192b34ec5..41532fc442b0 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r2.ebuild
@@ -32,7 +32,7 @@ for X in ${LANGS} ; do
 done
 
 DEPEND="
-	app-text/libpaper
+	app-text/libpaper:=
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.9:2=
 	>=media-libs/jbig2dec-0.19:=
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r1.ebuild
index 7a14da73aa01..03493a7b380f 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r1.ebuild
@@ -32,7 +32,7 @@ for X in ${LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
 
-DEPEND="app-text/libpaper
+DEPEND="app-text/libpaper:=
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.9:2=
 	>=media-libs/jbig2dec-0.19:=
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 6368b45dbbad..6c9a77e1e993 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,7 +1,5 @@
-DIST libpaper-1.2.3.tar.gz 1221218 BLAKE2B 55b209896e50f177b9dbd04a53a1663846a2d43c91487d62b1161a09416cbeaf3057ec5c79248a3d54eb35a61081d8e1d8fe0fb80304b03bf3a1b5151f21f2c3 SHA512 768e15f57e6c2ab6805c175ba0eebf1d130b8ff16b1c929e6557c5d8ceb7c94ead4e38cfc48021a5059e55cf43595729e8c04c9eee7949bdd516c8267fb7a6af
-DIST libpaper-1.2.4.tar.gz 1221202 BLAKE2B bdcf4372caa045207acdb28c10e7981c3f23f12ef54c989395be2efe38ece51f437fa5bf50618aae7276a864bffc0eef81ab4727b912d63673615f12bf1f2cad SHA512 1baed66c4ecc725f3eae6dda0b4401c17baf23ef846486c1249f075a6e01537c1050d9617e929cff7a38d2b32fd1f8e1e7d7e090eae300434544a92b210a0fca
+DIST libpaper-2.0.0.tar.gz 1221217 BLAKE2B ef2c08ff7dc537734d080a29560a711b196b05a3b0c4b375c8dc73d4dd9588156d325d233e27940fac96a18dfa6bf523128b53eb4c7098e561aa6054efb88408 SHA512 ca5c79969a8c5d56322a6993917d5aa47089bb396a144edd0d9040b0bdde78c8fb59468a3d4063ae1fb323a1b23fb28169616d153de65f9085351b9c9d47f8c0
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.28.ebuild 1148 BLAKE2B b5556a5ae27415083aa89ca18a6f9dc232026a37fae823b9f96ef0325d28f2c1e37e3f34ecee1f4773793fb0b31b7f607ea955c9fa96a88d18a4b90eca8f54be SHA512 07e36537c2278711c602c667e50e72091aef0bbbb79de8a99ed915c7c1f600be4c7d53f7446578b3b1734375a07ab8464e5ab0b342ef50516d1e2b0e7c325d07
-EBUILD libpaper-1.2.3.ebuild 1090 BLAKE2B 7ed2d8f8a1f6d59fcd32ecfe8b3274e5741d54df1ae0abb51b4ad898699f643ba5be865913949badefc1a09d99e0d12fc7a1efad7f2fa0f1632f141f52fea0b5 SHA512 0651db2e5e10c60e6a5e41b223c26504c257912ce89cfc4d6f726f44c18ff9dda3d7c2043fc5f02cb7faaada947d12c93ba0acfa63dd31a821f4a5e950105f9f
-EBUILD libpaper-1.2.4.ebuild 1090 BLAKE2B 7ed2d8f8a1f6d59fcd32ecfe8b3274e5741d54df1ae0abb51b4ad898699f643ba5be865913949badefc1a09d99e0d12fc7a1efad7f2fa0f1632f141f52fea0b5 SHA512 0651db2e5e10c60e6a5e41b223c26504c257912ce89cfc4d6f726f44c18ff9dda3d7c2043fc5f02cb7faaada947d12c93ba0acfa63dd31a821f4a5e950105f9f
+EBUILD libpaper-2.0.0.ebuild 1103 BLAKE2B 814f3db2f19ca6f568b5829633e59c54dac26cd651d9b6f2f53ce3a123b77cf413adacb4ed7191ac26bec12f42d8fe003ad4b9961286f6f18ecbcddfcea6ba79 SHA512 adcebde9da01e686b09366351e49996f4ec823c9b9a5e9aa5f2cbab10270ee4ae8d5bd8b6a00ff97cbc5a8339b10647240fde18daff106bb1e6a81e941fc2ba5
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-1.2.3.ebuild b/app-text/libpaper/libpaper-1.2.3.ebuild
deleted file mode 100644
index df529ad758d3..000000000000
--- a/app-text/libpaper/libpaper-1.2.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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"
-
-# paperspecs is public-domain
-LICENSE="LGPL-3+ public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	sys-apps/help2man
-"
-
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
-
-src_configure() {
-	econf --enable-relocatable
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	dodir /etc
-	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
-		|| die "papersize config failed"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
-	fi
-}
diff --git a/app-text/libpaper/libpaper-1.2.4.ebuild b/app-text/libpaper/libpaper-2.0.0.ebuild
index df529ad758d3..4891072cc566 100644
--- a/app-text/libpaper/libpaper-1.2.4.ebuild
+++ b/app-text/libpaper/libpaper-2.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.
 
 # paperspecs is public-domain
 LICENSE="LGPL-3+ public-domain"
-SLOT="0"
+SLOT="0/$(ver_cut 1)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 02272ef23f57..bd2b0375a94b 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,6 +2,9 @@ DIST qpdf-10.6.3-doc.zip 6852725 BLAKE2B 407b5994d3c3f80f71e60da12ebecf2c977fecb
 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
+DIST qpdf-11.1.0-doc.zip 7053772 BLAKE2B 8e2d377fc40a8206567e82733125b4abf23f07d062e0416ed2f2d9349a3555188cba1b68737cfae8943bcda3b93effdd020548b45d257eb9845fe1b569394000 SHA512 300dca6495ff9770138b7166e584cff1f2d26c60f273030211a895cf0f0147124240c2f22e79fae4f66595b863e2ce9dcdd7e8144c8b64357bf9a9e9b92ca6ea
+DIST qpdf-11.1.0.tar.gz 18452386 BLAKE2B 1df1f148db3132073f5e504b0dc79f8029e7049b334591d5dbd0adb425964d2d97ae5e086a3cbfcd82c82b22491b7b8897db8c3f20dab35feac3657066c6a776 SHA512 4c4daf3e6ae40e57d0d099abb7c9e694b7bec0c6657ffa4dc084f295d57799b8a5cbe5827d346fcbb89fa88a84c4dbd9a5437cc649b617cd479231c9ecc3fb5a
 EBUILD qpdf-10.6.3.ebuild 1855 BLAKE2B 3579d2303c15c8fc84a6bcb804986574f4a7e36f66e69b2411494c8106d6b1874e979809bf828b9a7af410494579da7fad762ff5df374abd0afbb105b7df6175 SHA512 2ceadd6b80689c2ae8a5ddd5e4960f441883005c61d3c6e18d52666421ac747330a6479485a606043e54f2530c8ab1426f6d1d554f7830bdd9d35dc7471f0077
 EBUILD qpdf-11.0.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
+EBUILD qpdf-11.1.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.1.0.ebuild b/app-text/qpdf/qpdf-11.1.0.ebuild
new file mode 100644
index 000000000000..bd30e1e661fc
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 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 ~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
+	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 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local mycmakeargs=(
+		-DINSTALL_EXAMPLES=$(usex examples)
+
+		# Breaks install with USE=-doc in 11.0.0?
+		#-DINSTALL_MANUAL=ON
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+		myconf+=(
+			-DDEFAULT_CRYPTO=${crypto_provider}
+			-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
+}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 383310b0357a..4d8d575cc71d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -191,5 +191,5 @@ DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b
 DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23
 DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
-EBUILD texlive-core-2021-r1.ebuild 11786 BLAKE2B 17f931957a1d6ef0b445a76711c2a40b7a17c4539f3b72babc690697aee763214e378acdded101176acdfef1a232b5d81450d80c272ed2bbf5ff8e9c50c9b0ef SHA512 c743dd882c9d7b4c04f3b5b151b0e505220fe363df91b9bd4ea2e433652ad4e5dcb76a88a3be27f574fe2ff7a97ffd9c211a9ddb139e8ee30e1ffbc9f251da5e
+EBUILD texlive-core-2021-r2.ebuild 11787 BLAKE2B ae5ce4b5d4c3ac4a90859550952e2f301665721061a8c016a4d1306d4ee86bc005652686dc8e5442208dc10844bbbd8238a796c7fae45cda5618cc9f37d68db3 SHA512 84777c8ac15505324fdcdb54b25b31897a5f78e6a9f4de00cfc3ed6fcbc632d7ebd46cbff41d60f15eb8130ef5c2ee305949f1ffe8418a02a5973e67145c532a
 MISC metadata.xml 675 BLAKE2B c3c5ad96f142e46a568b45ee9398a2b787710acfb560bd4403af8c6b140027ee33f0af0e8244232c91144abc2ed401d239697323215cfff5d158bccb2b539117 SHA512 3be6794e2fc9464abf350fdf1d515608e6bb2992fe12d378e5f87ea6435d732c5aedc0ff111721f3f8ed9143a6af1e1fc5a0decb066a187e760de4e11affa48f
diff --git a/app-text/texlive-core/texlive-core-2021-r1.ebuild b/app-text/texlive-core/texlive-core-2021-r2.ebuild
index 7c256aa5427a..22b8b8716b82 100644
--- a/app-text/texlive-core/texlive-core-2021-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2021-r2.ebuild
@@ -96,9 +96,9 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
 	dev-libs/zziplib:=
-	app-text/libpaper
-	dev-libs/gmp:0
-	dev-libs/mpfr:0=
+	app-text/libpaper:=
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
 	>=dev-libs/ptexenc-1.3.8
 	xetex? (
 		>=app-text/teckit-2.5.3
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 9e69f43deace..b2123630b316 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -15,5 +15,5 @@ DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.04.ebuild 3939 BLAKE2B 1c0d9dab0a6d42bee4dd2f24694cd8238aab3c3c833ae35725a4920bb7ea67cfefe0f9c44dc72625b879fc3f6371f269edee0be56d30892e1ba26f7ee764c0c6 SHA512 baa126049cd56569ed0b1fb5d8da8c651edeba64aa4c805460d7a52b585c649350b79b6b1e62d94d899bed50313e9d02c77f1c91e5ecfea270949414f3102031
+EBUILD xpdf-4.04-r1.ebuild 3941 BLAKE2B fd4df457733bd94e6adfc1bea526ef150c8e4c79210e1e2067ba64e9b784ce575f347bededdf76e334e38bb0c2f251cb356fe63798fa4b10d22ada1354a3932c SHA512 961763092eb62805cfbeb893b0b9ecbebbeb3c4289dda6da4e4fe74f797c2ad9bda69e859f241841c0d5d97238ce1d75bae190f12d7c2da759a5a3f9d698dd57
 MISC metadata.xml 993 BLAKE2B 14996cd8a901c0cee2ff357b6d7e0ba523cef08d39997b4e3266b9f07e75e31fcbbee940d25eb318bcfc7144781d490a8604a9c57d8dd883ce08f51323139099 SHA512 b0245e750f66aeb07c9a35ad8bcc2d6fa01debf62870104b87ba824c79350dc4dbb620d8d4a535c774709f49b47d2808baeb9ddb88d209e48e3cfd6309fd8628
diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
index 682bfe8d9f78..9d39323e7d04 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 		net-print/cups
 	)
 	fontconfig? ( media-libs/fontconfig )
-	libpaper? ( app-text/libpaper )
+	libpaper? ( app-text/libpaper:= )
 	utils? ( png? ( media-libs/libpng:0 ) )
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5