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

18 files changed, 152 insertions, 171 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a983e960d62d..4db5cd504dd5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 7a403410c40b..45f04ebcb050 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -1,6 +1,7 @@
 AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a748eed64ab323bbfc33feec828d56bb9243f64ec800e9750b094e84c6347ee6c25e74d6881ab2f9b012e13f6b28a06b6 SHA512 db0496b6e826ece8db2d9bae4758134b56204982e07783986cf0406df7a3c7006a39ccb56dcd4b303bf1b1227acc43b98533546dd5957ae6334fe56e3ad63378
+AUX hyperestraier-java-11.patch 2602 BLAKE2B 718462095f4ff2746b2193cddd366de547591047eba53fc855c48be7d90069284771b2c007e4d13c80e7d11a74ae3c9ab7ffec6dcb1b86739fc81b2d1a0ffc04 SHA512 81077f319830d6ab28164cfbd5e57d89a0ddf0197135dbf71b3d33f1edc2b21e253431604122f1f82e718dae125228da57a93585d2ce9bce478ddcb8dceb17d8
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13-r1.ebuild 3597 BLAKE2B 575af47ddd4732ecd3cbdb5e8f16d4cf9287de0fe3e58a8511dfc67745b570c4aea850f1d084c0f079a2312f104b5e241c60097a0403e2031217c67a540ae32a SHA512 383d5223c9d0b1bc59450a148cd3bd58640b0f2ea984ba0053a124589baa49ff34eb91b680ffabe490dd7f692405acfc74384527f7b4597a6c58f4bd84801ac5
+EBUILD hyperestraier-1.4.13-r2.ebuild 3625 BLAKE2B 9554c2161a8b2bca6d07dd6131f3d4679c3b7eaadeccf161fc5a88ada40f0b0d5da42ded6d8b47d7d887909525d09cc49735332b252943c9d5a9683988f3666d SHA512 cd839f574b65c39ce30f6826e66e627f787fe91ca10cc2d02f03b754c9c75b0cafae8ad552963d40ce925adf35b815fffe83465f3b082ec9a45945b2ac686e1b
 MISC metadata.xml 441 BLAKE2B d0c43a24b0a988b9b5d30a7c0d002ca45587c13f166dc2b43cfabac3b4c73f78a57cbee98d5967609dcaff3bb8e25b6be2df2f6328fb6b441e5b15d3dc0ce9bf SHA512 aab164bf0b80548a5867b8347963f9bc8dde159e879fc464e8b12e9a1f7bfa0dad572d453a28ab5d0fb6169cc6238f9a2f79016ee835b0560396f1631b3f3e85
diff --git a/app-text/hyperestraier/files/hyperestraier-java-11.patch b/app-text/hyperestraier/files/hyperestraier-java-11.patch
new file mode 100644
index 000000000000..fa143fb23872
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-java-11.patch
@@ -0,0 +1,78 @@
+--- a/javanative/Database.java
++++ b/javanative/Database.java
+@@ -135,7 +135,7 @@
+   /** last happened error code */
+   private int ecode;
+   /** callback function to inform of database events */
+-  private DatabaseInformer informer;
++  private long informer;
+   //----------------------------------------------------------------
+   // constructors and finalizers
+   //----------------------------------------------------------------
+--- a/javanative/database.c
++++ b/javanative/database.c
+@@ -19,7 +19,7 @@
+ 
+ 
+ /* global variables */
+-JNIEnv *infoenv = NULL;
++static JavaVM* jvm = NULL;
+ 
+ 
+ /* private function prototypes */
+@@ -181,8 +181,8 @@
+     err = TRUE;
+   }
+   (*env)->SetLongField(env, obj, fid, 0);
+-  fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+-  if((infoobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++  fid = (*env)->GetFieldID(env, cls, "informer", "J");
++  if((infoobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+     (*env)->DeleteGlobalRef(env, infoobj);
+   (*env)->SetObjectField(env, obj, fid, NULL);
+   return err ? FALSE : TRUE;
+@@ -735,16 +735,17 @@
+     throwillarg(env);
+     return;
+   }
+-  fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+-  if((oldobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++  fid = (*env)->GetFieldID(env, cls, "informer", "J");
++  if((oldobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+     (*env)->DeleteGlobalRef(env, oldobj);
+   (*env)->SetObjectField(env, obj, fid, NULL);
+   if(!(informer = (*env)->NewGlobalRef(env, informer))){
+     throwoutmem(env);
+     return;
+   }
+-  (*env)->SetObjectField(env, obj, fid, informer);
+-  infoenv = env;
++  (*env)->SetLongField(env, obj, fid, (PTRNUM)informer);
++  if(jvm == NULL)
++    (*env)->GetJavaVM(env, &jvm);
+   est_mtdb_set_informer((ESTMTDB *)(PTRNUM)coreptr, dbinform, informer);
+ }
+ 
+@@ -767,10 +768,12 @@
+ 
+ /* callback function for database events */
+ static void dbinform(const char *message, void *opaque){
++  JNIEnv *infoenv;
+   jstring msgobj;
+   jobject opobj;
+   jclass cls;
+   jmethodID mid;
++  (*jvm)->GetEnv(jvm, (void **)&infoenv, JNI_VERSION_1_8);
+   if(!(msgobj = (*infoenv)->NewStringUTF(infoenv, message))) return;
+   opobj = (jobject)opaque;
+   cls = (*infoenv)->GetObjectClass(infoenv, opobj);
+--- a/javanative/myconf.h
++++ b/javanative/myconf.h
+@@ -69,7 +69,6 @@
+ #define CLSDOC         "estraier/Document"
+ #define CLSCOND        "estraier/Condition"
+ #define CLSDB          "estraier/Database"
+-#define CLSDBINFO      "estraier/DatabaseInformer"
+ #define CLSRES         "estraier/Result"
+ 
+ 
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
index 28d438f7c840..c6658e72af58 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI="8"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
@@ -31,6 +31,7 @@ S="${WORKDIR}/all/${P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-java-11.patch
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 8138b3b5fea9..8ef3b9a695eb 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-v4.10.0.tar.gz 14624397 BLAKE2B a797db4cad381ae92bdeebf2b771059b5033a763dd1dc4ec85ac9eb81448482b20fc2c7293605816ad59ca6f5559221c72e22b6c0cd2c167af77b4f40dece4e3 SHA512 f77568fd803c32d8f28fc123c64c3122859f51c4c8f2f9cc4dc857e51d6fd6d1dfa42a4531f699b1f4b4b89adecb541a56e2cce0aac81ebf83f9c063dd79c86e
 DIST iso-codes-v4.11.0.tar.gz 14756251 BLAKE2B dd3bc5bae4def6338527a9c7c41f0ef9603eb2a2a7e4e2a95399bc4891a0d66fa323bb1f960263662cd6b4a42902defede64ad732f4a894d3073a7a68b5b9f80 SHA512 524be572c2505b0b2d55a7a0dd8d6bdff68edbc89c569652b11070cc6412881c98ea66a001193f1540153d44d6b41d921444a1d1a2bde6929bbe445eb369ea3e
 EBUILD iso-codes-4.10.0.ebuild 2644 BLAKE2B 553b3e2e087900b73225a27feeb22671704ee8c193982c74b3e81a1e14e3aad7753531a9f28cd7228cb122939b3ea5d12e6266099ccea85961a54e6ed883d731 SHA512 6abffc569b59f98750c220af0666c1a2b27cd533ce687f0205307c3a946cddb3d7fad8a1f9e3e4a1e2573d055b0800b2e8b0375e4f99a094aa82024a7b175705
-EBUILD iso-codes-4.11.0.ebuild 2651 BLAKE2B 1314ac207eeab5f0f6c67ccb0074a78925c428d657626555f3bbdd65e861c0733a1df8ff7391598d467f162a1aeacdc30c575cf3d28a8392a0207e43cbbc3534 SHA512 7cf9f0bf8969fb95ae55c426a7c708fbf6d61045e9961be22bcffa88fe0c7e38add46824e9487655b5ae3e97cd9f4f141ef4a9bf08193838e0836effd1ea4906
+EBUILD iso-codes-4.11.0.ebuild 2649 BLAKE2B d01defa86c413b1775d446dedb375a95c3bf9500e72283573cd19f145a209cda2ae3d3a45d5df00d20176c16d25ee59ae02faf5380307bcb64f6f8304e0c237a SHA512 065cfcb638302902bf3c36339062d4578155e017c0ab1002cb7389a460a8ab512f32e495a96afd542c695087a7c714fc0d5f98f36676d40f5e4abcb0d80d2b5e
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.11.0.ebuild b/app-text/iso-codes/iso-codes-4.11.0.ebuild
index b27a4c748d97..38502be66b53 100644
--- a/app-text/iso-codes/iso-codes-4.11.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index aa44611cd771..6368b45dbbad 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,7 @@
 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_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 1058 BLAKE2B eebe78764599d505526bd118d9be0ddad3e93138d0d420d8caf500ed77aeec0d94a675e5c690a41a9aa6bbb04ae353280fd0607869778928b9e63a330eee442a SHA512 1c37331568e378dcf665b88ea8c9a75f90aface8df02f5ac55f8f90b6f9ab414dcef1f67711b19167968acf653fae2c6ce2f521f7bf12700ac6f9795f5f565c9
+EBUILD libpaper-1.2.3.ebuild 1090 BLAKE2B 7ed2d8f8a1f6d59fcd32ecfe8b3274e5741d54df1ae0abb51b4ad898699f643ba5be865913949badefc1a09d99e0d12fc7a1efad7f2fa0f1632f141f52fea0b5 SHA512 0651db2e5e10c60e6a5e41b223c26504c257912ce89cfc4d6f726f44c18ff9dda3d7c2043fc5f02cb7faaada947d12c93ba0acfa63dd31a821f4a5e950105f9f
+EBUILD libpaper-1.2.4.ebuild 1090 BLAKE2B 7ed2d8f8a1f6d59fcd32ecfe8b3274e5741d54df1ae0abb51b4ad898699f643ba5be865913949badefc1a09d99e0d12fc7a1efad7f2fa0f1632f141f52fea0b5 SHA512 0651db2e5e10c60e6a5e41b223c26504c257912ce89cfc4d6f726f44c18ff9dda3d7c2043fc5f02cb7faaada947d12c93ba0acfa63dd31a821f4a5e950105f9f
 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
index 08482df1290f..df529ad758d3 100644
--- a/app-text/libpaper/libpaper-1.2.3.ebuild
+++ b/app-text/libpaper/libpaper-1.2.3.ebuild
@@ -12,6 +12,10 @@ 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.*"
 
diff --git a/app-text/libpaper/libpaper-1.2.4.ebuild b/app-text/libpaper/libpaper-1.2.4.ebuild
new file mode 100644
index 000000000000..df529ad758d3
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.2.4.ebuild
@@ -0,0 +1,40 @@
+# 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/pdftk/Manifest b/app-text/pdftk/Manifest
index 4eee00fb940c..ef68f16e4a8d 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,6 +1,6 @@
 DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb
 DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
-EBUILD pdftk-3.3.2-r1.ebuild 1869 BLAKE2B 3cef59487e80bb9caf6c30382e90f11097895162e112ddc1a8c14942b92fbbaf85ffa12139eb275c47bf85a7b24b9062daf05195eb3f09a5b6a82a929f53d136 SHA512 18ff95e145bf233b5f189b2d8268ffb170598afc25ac7cbf78adfe52d622bdba2a3e7ae06e4c723a84396d967fc10db697f0f9a158e9dad02ccc52a102336fa3
+EBUILD pdftk-3.3.2-r1.ebuild 1895 BLAKE2B 57ba5000ff92378cdfec0e0986fe625fff0fb1b1e11ef672def4dc6010ad8ffa0b9248cfaa9a68cd3e140d09f030476b9ba05644209941a8e7a25e04dbaf3a88 SHA512 d55b65838be4c8d41dd72186e2586cafd9526f25551e233e17c87e004f68425cc758e3717158b063678e6dfc45edfe44371df178eb0515d253c1065a64259301
 EBUILD pdftk-3.3.2.ebuild 904 BLAKE2B d51e397e8d255e08c859516bf94f31516ae6c7d819ff86ca178b53b49bf37e6afe5306b213b5f07e779c139e728014038d6bdf70ca8f36fc088675ebbdddb4ad SHA512 1c0a7cd38337a472350b70a2654d63fec064b2d6313081dc7f69f797bf8f525218003eba7d0b8586790e4f773760ad56acdb11d2e11639580764c0442551077f
 EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
 MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
diff --git a/app-text/pdftk/pdftk-3.3.2-r1.ebuild b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
index 0c5ad3c5f4df..281e7ea1e3aa 100644
--- a/app-text/pdftk/pdftk-3.3.2-r1.ebuild
+++ b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
 	test? (
+		app-text/poppler[cairo]
 		dev-java/system-rules:0
 	)
 "
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b9e4b85d9737..75264f3d6788 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -4,6 +4,6 @@ DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c
 DIST po4a-0.67.tar.gz 4466869 BLAKE2B c4dab0e40e7f5eb24ec85abf8a02131144b181d9b783a5dccc30221d1cc3a493f16d7c2faf8284c6d2f2259661a6f2c280624e5fd16e2d4d0bf878f8291ef7b5 SHA512 6445db615ac1a2e752daca7dca0c44a88e74c7a26c06ba8e7cb6bdeeaacce78cb74a671579dd95ee8341d817e16717e8cf99022a37c5d152e0c9828bd6aae3d9
 DIST po4a-0.68.tar.gz 4605485 BLAKE2B fe649a28c0c181f53d7eb3f583d4a7dffe4fc22fb316c1c534b672a267eef16ccdf39a77caff3a2d75b7bfcb36e68c49229aaddeb8dff5ee475b71b58402200e SHA512 d7c60a3647d8f4265ce6f016d33430c72775ae19eb2efb240532545b08280368fea70db3360131f6537eb7cc72c19299dff4b6f938ac09cbef1b2db1a93d996e
 EBUILD po4a-0.66.ebuild 1409 BLAKE2B 0eed07c6501a75d23c90e50e5c957de542f55313ea8cd0a70d5b7f044e821d01c588a45b8294aeaa8d96bf7a341e7615d768657547e629d5206137b0cbba406a SHA512 b27e2187f4db0dbb912c33d1f028f3ca4a4283238a268ad41aba6f706fdbce787bca894c3db2dc9a67717b237583b4092f1fb8f692f627e84e8193990afe880d
-EBUILD po4a-0.67.ebuild 1330 BLAKE2B ca3e5e22ddc844504d710a23739c32cd2c76feb770d0c0d15d90820c172f1f225a1cbd6f43357b681232bf23a6707859c9f6c0bf33ad615920ce0420a3e61e40 SHA512 9fbf472a377f966aaef64ecb1fbf2601d9591c86852d549036fbdac0c58159d0895190cd078a7842614f9d34c9011ffa08a5298cb8fb55566233e042283981c0
-EBUILD po4a-0.68.ebuild 1330 BLAKE2B ca3e5e22ddc844504d710a23739c32cd2c76feb770d0c0d15d90820c172f1f225a1cbd6f43357b681232bf23a6707859c9f6c0bf33ad615920ce0420a3e61e40 SHA512 9fbf472a377f966aaef64ecb1fbf2601d9591c86852d549036fbdac0c58159d0895190cd078a7842614f9d34c9011ffa08a5298cb8fb55566233e042283981c0
+EBUILD po4a-0.67.ebuild 1434 BLAKE2B 2bf9456057eb13e31e05860eb7f5f3b43155a9246a8db042f0f6ff3fed9308123737ee60008668ff1e42eef981f06813d2e7f87490a426204853f228e083bb16 SHA512 46865d62ea1654c58480480221a8bba3954aa1174f8d74c61c36dca3d81838e94addd4ef5188b661be6f7ed000e43278aefa8a5d934582e47307c4843e912011
+EBUILD po4a-0.68.ebuild 1434 BLAKE2B 2bf9456057eb13e31e05860eb7f5f3b43155a9246a8db042f0f6ff3fed9308123737ee60008668ff1e42eef981f06813d2e7f87490a426204853f228e083bb16 SHA512 46865d62ea1654c58480480221a8bba3954aa1174f8d74c61c36dca3d81838e94addd4ef5188b661be6f7ed000e43278aefa8a5d934582e47307c4843e912011
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.67.ebuild b/app-text/po4a/po4a-0.67.ebuild
index 300d739e1730..af06aeeeee98 100644
--- a/app-text/po4a/po4a-0.67.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.68.ebuild b/app-text/po4a/po4a-0.68.ebuild
index 300d739e1730..af06aeeeee98 100644
--- a/app-text/po4a/po4a-0.68.ebuild
+++ b/app-text/po4a/po4a-0.68.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a076804cfcf9..dc80cd718863 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,12 +3,9 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
-DIST poppler-22.08.0.tar.xz 1840700 BLAKE2B 7e27eb1e41afb83633288d2d923a58e94590780f6f558e403928582de11c742781a12df11dcd7d9aadbfcbdae2662c83ae23f683552fba9e1984d3a0c4577f53 SHA512 bbff6d51eaafe58891357069c83e43ea25b4077755fa715a17b38660cd3cd546fa21d2e17a272d9b375f7e440e6e3661e84a20f18d445e0f28d06971abc04666
-DIST poppler-22.08.0.tar.xz.sig 833 BLAKE2B 8f6476068a78a0d145b2c43826ad3a73175a5506aaaecd14f837deb21b7a247154ba41e87877e35f249229871f006930c5849649a4310820020dc4cd7284497d SHA512 3c5350e5b9ddd872c4cf61e7463897298fbd4233be45241d6720e0debb6a0577dd45d663ba863bcc6ebb457197ade1093d518a363f3d277e382947c75a897ebb
 DIST poppler-22.09.0.tar.xz 1842704 BLAKE2B 7104dc18582611901e55dbaa84d9ae87121773370b677719c470c9804fd0a74164e72b4f39c5113531736e37327b59abb2d47b9dba58acf127180fed0cd3021c SHA512 bd288b042ad6fa31584d733b941b7ba72d9e68407fda5596827d559be0f46cf27dd8e0b1b7e0d58c997e29b18c5f086486f900965229c61e034e31d8ac474613
 DIST poppler-22.09.0.tar.xz.sig 833 BLAKE2B bda372fa8d8d3d7ebe4263f9f81212d69e09b50e787a853390191c1bfcc38fd65f8e524f3810b6d3d25820ba5b2fe3d337c9e661c0747a73d64cbcdfb06b8205 SHA512 678e374c184e403b85cfbdc954b80fa4132f37d34eb60854f7708d7963b98f4e57997ec9a9aa8e17090ee696ff5821c3479857ef3f93a69e32c3f25744c84e43
 EBUILD poppler-22.07.0.ebuild 3648 BLAKE2B d8a3eaa2e381a1a7e047e0cd475f18a00234e602a0c2e2d4e8fe30a95499dff0ef0770ba83a6b2fc0e533419625a47753ff757bf109e540b32dc7c65cb07a9ea SHA512 0059fc5a203855c2139bb56fc379b4f8d4679a81049e253344ddde27d6b0b978ef5a3e0263e0b6c3a93f6cc600284a2f2c433e004931e9a2ce5500fe8b319371
-EBUILD poppler-22.08.0.ebuild 3656 BLAKE2B 6026baa71b89b2e8150a2e2f9024da315555e0f3f367355654c00dce0c7de90ffdf34fb442f9006d16dce68e4057b314161597470ab007916c2e891ea80b5d33 SHA512 a44f7052d8d26b9feda589f33fe27a27b983de561cfbbfe02b126551282ac6594a59fc25e2515aaf941573d5c7099f55c63272c61051cfa2824d249ef63fb457
 EBUILD poppler-22.09.0.ebuild 3656 BLAKE2B 8c14faaf9c7f78352d0508953ae0d1fe2cfc9c3695c2a40706ae7bb9241738a8bf766d5b0f8ba9fc2eb27f87cd04825fd0d23b65cdd99d30e7f307b1a57b72fb SHA512 7563541cfdbabeaa3b073d081ab2b62a566ebdc87e76df8043c5ca75113c638649d7294781c93943f4df1d2e97fcb915163b582b95b0484e433f7c8246d8d889
 EBUILD poppler-9999.ebuild 3656 BLAKE2B 8c14faaf9c7f78352d0508953ae0d1fe2cfc9c3695c2a40706ae7bb9241738a8bf766d5b0f8ba9fc2eb27f87cd04825fd0d23b65cdd99d30e7f307b1a57b72fb SHA512 7563541cfdbabeaa3b073d081ab2b62a566ebdc87e76df8043c5ca75113c638649d7294781c93943f4df1d2e97fcb915163b582b95b0484e433f7c8246d8d889
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.08.0.ebuild b/app-text/poppler/poppler-22.08.0.ebuild
deleted file mode 100644
index 02a66a8252b4..000000000000
--- a/app-text/poppler/poppler-22.08.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/123"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2.8
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
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