13 files changed, 228 insertions, 9 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 843869305340..474be0df97be 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index e737dcd91cb7..f7174b013e82 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,7 +1,9 @@
 AUX 50a2ps-gentoo.el 218 BLAKE2B 59dc77b7859a5c6536077f6322c1aa5bffbfc3c27ba3b7ead28b703021282fc1f1c3db16d169fcf08088d30de9baf52406074b91bcd58b66ace6ddc312b707c1 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269
+AUX a2ps-4.15-lpr-wrapper.patch 546 BLAKE2B e15cbbf5c0834d71804bcdfa625fa4d7031373a7497d463e4066595bb820ec8ff992bd0c55af2ea0cbdc2ec132ba97cd4330b6409983013c34b2b29489093c31 SHA512 6384a629d3e8ac6bcd892f9c5ff75f5224e5b0d8ed7e7131fbd965828b353ccb4139ab572b99c0c9d209974e0638a9e7bb978dee4ab54336af56322b964542df
 AUX a2ps-4.15-stdout.patch 578 BLAKE2B edab46a428d330dad3f9543e3ecc92e058f1f425e39f68350d7e9de287217fee27a237aa7747bab7bcf78c2e61b6526a4a62569b22d84c1fb40fb054165d8418 SHA512 44878e936275a8ee23f0bc34293a3eb0ceeadb13a4234e1bc93b3dee02268dbf45eb68d3b6dd2177f4c15c25f88ffa1b9e009d893a1f263da2c24b543331bfd3
 DIST a2ps-4.15.4.tar.gz 3570970 BLAKE2B 96355c3e656199a6daebc7d311d85f9c124080db8d92e6fdc502bedf06c547e886fed8335f6ce01df04ee23972fb93ccf4c2614294dea63f1bf5eccd95f37a04 SHA512 aac3dfed21919682afa688b7315eeea012c5d496aad163b801021ed81d6056362d149745dcf48a99d139909c2ec796ce56bd4e63adb103d746ad89c691ea7779
 DIST a2ps-4.15.5.tar.gz 3571724 BLAKE2B 7c352b72c537f8519cafb7993595d902e1dfeae49207936c365b0ea3813ffff973c5f5e2bb63a4cffa3c665990d95c8a8e339c87d9eac25fa24e364b8b705bae SHA512 e9953659139a46aed46e190d5485382a9e396ae8bbbe59edb78ab3110e7839a764e3cb6ff94f5f36e6e91fcaf85f6352376e0b4a0e0141f24e098fa334b5015e
 EBUILD a2ps-4.15.4.ebuild 1862 BLAKE2B 7a0dfd2da66b22373deebdad01615501933dfedbc48a6ffab030b3766c79e8f057f8ddb4d974614b6ded23a0789eca6b32417f5c9a9fe800763d84e47bc6c7a3 SHA512 4e339abd8da23aca277b5ceb2d766fd2a389f60ffbe4fad3f5c48399841b062a520362fea281ca9736b52d1837b14a574ad940bd4e21f6a2237dc37c4ee39b44
-EBUILD a2ps-4.15.5.ebuild 1868 BLAKE2B e7c07e0c818de8be95a2cb12056958af806b8c9dfe0f257835d8664a3db796718c4927b2b77e32d9399c112b084214b77ebedbcb1373d0e46cc6eafe7d9c33d8 SHA512 b6507d90f2aaadb87b06f3ba556c95e32871b94795ee8b53a4fbcb4bab5619dbfc331c3b6a58f38400767c3ec77ba011175f2983201fb04a934b4c2527759bad
+EBUILD a2ps-4.15.5-r1.ebuild 1925 BLAKE2B b0716f709983755efdbe8d3690e2e4134da196bb54b7ad43f99ff985b1a316cb9c3aace9f2719030523bbddef4e840b6672ea76cbbcf912470bbc019dbc988a4 SHA512 235fda4dd52b983153e8c7923b612a9cda92d826d3c7ff4feafffc5706de6515585307b992c1095175e79d75ec0646ea7fbe0c5ec5714b1a0cd3f339969b10f6
+EBUILD a2ps-4.15.5.ebuild 1865 BLAKE2B efaa08194837f2467f72846e597e71b935b73036e71074b214e0e29d0acb4521aa6d24c13c3eaff755deeaae660753a0952cda79c6cd8707ac6e1f159cd830dd SHA512 3188ffbd348fa6aa11178483a18be92f53669089d1ea23adbc14131b40734a9e16023e7a39a658802bf917fb29908c12d0438b0d06793081466ec18baf0d8567
 MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/a2ps-4.15.5-r1.ebuild b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
new file mode 100644
index 000000000000..cb24c360a855
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cjk emacs latex nls static-libs vanilla"
+
+# a2ps-lpr-wrapper needs bash
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/libpaper:=
+	>=app-text/psutils-1.17
+	app-text/wdiff
+	app-shells/bash:*
+	dev-libs/boehm-gc
+	>=sys-apps/coreutils-6.10-r1
+	emacs? ( >=app-editors/emacs-23.1:* )
+	latex? ( virtual/latex-base )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	>=dev-util/gperf-2.7.2
+	nls? ( sys-devel/gettext )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15-lpr-wrapper.patch
+)
+
+src_prepare() {
+	default
+
+	use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	export LANG=C LC_ALL=C
+
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--sysconfdir="${EPREFIX}"/etc/a2ps \
+		$(use_enable nls) \
+		COM_netscape=no \
+		COM_acroread=no \
+		$(usev !latex COM_latex=no) \
+		$(usev !emacs EMACS=no)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		lispdir="${EPREFIX}${SITELISP}"/${PN} \
+		install
+
+	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/a2ps-4.15.5.ebuild b/app-text/a2ps/a2ps-4.15.5.ebuild
index db63721729f2..f0aeb28d0abb 100644
--- a/app-text/a2ps/a2ps-4.15.5.ebuild
+++ b/app-text/a2ps/a2ps-4.15.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 # a2ps-lpr-wrapper needs bash
diff --git a/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch
new file mode 100644
index 000000000000..d7b231c0b929
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch
@@ -0,0 +1,23 @@
+# a2ps-lpr-wrapper exits on bogus parameter-count test
+# https://bugs.gentoo.org/913751
+# https://savannah.gnu.org/bugs/?64047
+--- a/src/a2ps-lpr-wrapper
++++ b/src/a2ps-lpr-wrapper
+@@ -5,7 +5,7 @@
+ set -e
+
+ usage() {
+-  echo "Usage: $(basename "$0") [-d printer] FILE..." >&2
++  echo "Usage: $(basename "$0") [-d printer] [FILE...]" >&2
+   exit 1
+ }
+
+@@ -17,7 +17,6 @@ while getopts d: flag; do
+   esac
+ done
+ shift $((OPTIND - 1))
+-if [ $# -eq 0 ]; then usage; fi
+
+ # If lp (from CUPS) exists, just use it.
+ if command -pv lp > /dev/null; then
+
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 7cccc6b22a06..7b13177e45da 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -2,10 +2,12 @@ DIST libpaper-2.0.10.tar.gz 1304460 BLAKE2B 89c0ab7348cff01e278a64fe984f51102146
 DIST libpaper-2.0.12.tar.gz 1304598 BLAKE2B e8a78fc3efc3d0676e8596c0c457f4ebab26eb2f4d4f8e885237f475db4969f6c875bbb7021afb41a212e1cf8bc540e56b301964ce9f3399bb65af789db085cd SHA512 edea8758894eb4b36d7164623d34ae7721a903d7fccaf3a0a40b598e901699b8d2754cb02be9a289494de46e3d30463806c3d85a9d701947218bb7146cf05af4
 DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcff15acbac126535f526312900650e25fa0a4d68ceebc5d718f5135be22a9f9407d690dc5d5e22eab9dc55b040fc8 SHA512 d603a807c8fdc57b704cdfdc90bedf05c54c8a7b67e8cf52f26298c22a6cee5291fcadc6e67d28b00cf9d68f4890a394e56c8e91f0b97c8edfac4662fe4dc8f0
 DIST libpaper-2.1.0.tar.gz 1306128 BLAKE2B 6e44e3d2fcf01faa551b1df401155a96b8612f5372683cf8f62af7af4ec93e748c650a3246a0548c3fea9f48c4f61b21a0a9c6310d4d19aed599b8b165c0bd72 SHA512 0e54084ee4aada1eb87cb8e0423ff23039298b0135c7f1c7c92794ef9010ab0704e5fab94f2e34dfbee2f8c048e11b6acecc04a4f3ac7c772dec5be43f870392
+DIST libpaper-2.1.1.tar.gz 1262975 BLAKE2B 1605accd560f34ffc08f556fbab6caae4f945dccf83a08e2a0f1f971915d914450a615bf76db316fce3e32a38e53a6a77751df7617d0271cd1f55eaa7db084e8 SHA512 90fabb586115d99c9fb4d4ecee87ac0d1b2ac17ddf0c89287eb82e21834b0a2bc7cd5049fb73f3e20e4b494c374413c388b28c3274ceb278ce81928e17fde288
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.28.ebuild 1091 BLAKE2B 959695856a3c1c883f214a45893da5355d633ce9dafaf1509fa7820ba1c0134172c6e688dc87c2af7bf88806e0682426c7089bdd21bed3d7fc2e76455e6b82c7 SHA512 0fbfee7d663a4c1f9e7f230b734334de8ae25cc2ad7fac5e1efc10dfb6a23c4f1dfa4dd03ddd5c4a5c56cbdd8bcfe4e5781b41fd882382992140628645e327ba
 EBUILD libpaper-2.0.10.ebuild 694 BLAKE2B fbd024536c0d7c9901d9a90214543650dcbc45c5e510e35711cf51f12c7182134f5010e56242f0d2bbae737e8ff5fe85a64c27cb3f63a75490194ffe4cf0d255 SHA512 a965663584d0de7b1c36f48bb2f74bee550f9e879e7a4655044f20ef66868e6b22937b099f91b75c96e564874dbf36ce8748b0789b97b6e79d307d9def523e83
 EBUILD libpaper-2.0.12.ebuild 694 BLAKE2B fbd024536c0d7c9901d9a90214543650dcbc45c5e510e35711cf51f12c7182134f5010e56242f0d2bbae737e8ff5fe85a64c27cb3f63a75490194ffe4cf0d255 SHA512 a965663584d0de7b1c36f48bb2f74bee550f9e879e7a4655044f20ef66868e6b22937b099f91b75c96e564874dbf36ce8748b0789b97b6e79d307d9def523e83
 EBUILD libpaper-2.0.4.ebuild 806 BLAKE2B 9a4bed52ec481ae9879c4ab580e2f263b6ee45d60fb1b56d57dd1f4c629c738927590c9512b5b76c38a7e1836e0f51a54c05244f88f869ab41dcd2b366e05a39 SHA512 8a5bbe6afdc418adb360f7712d6c682a221257c4ab2791e88527f4d859b62db471507e5fb5da56453adde0f5e26c49895facf278f3ad7635f47d1560b82b5f80
-EBUILD libpaper-2.1.0.ebuild 715 BLAKE2B 29d144fb9cdf9893aa793ab33f81d5bc57163e35c4eb618c1ddc85241a85ecbc5621041b68e29a34eca904ce400884481939aa16ae131ee297c393a67d5c1cca SHA512 d48da9e86a4b21da19ce4f0142b8908457e0d6cc1a6c5209ae4fda7a4fa1bb46e8f1f641f8ad506b92465e2de9c8747ae40259b6160eedf00f6e63b4fd35f3ff
+EBUILD libpaper-2.1.0.ebuild 709 BLAKE2B e07af593b124b19a059aa2a6dad24990c81c2acdd04b48f02b58d6d3886805cdacde6af6e861cc9cdcdda96819061c052108f47dd4b96ea32b53828c571a7b2d SHA512 1b4af154beed45146c8d9afa70e5d2efb801e57574468ac0485239dbe59429fc00de0093f30556306e752eaede475b82ebe77822f9377ce0c1fbed50495316b9
+EBUILD libpaper-2.1.1.ebuild 715 BLAKE2B 29d144fb9cdf9893aa793ab33f81d5bc57163e35c4eb618c1ddc85241a85ecbc5621041b68e29a34eca904ce400884481939aa16ae131ee297c393a67d5c1cca SHA512 d48da9e86a4b21da19ce4f0142b8908457e0d6cc1a6c5209ae4fda7a4fa1bb46e8f1f641f8ad506b92465e2de9c8747ae40259b6160eedf00f6e63b4fd35f3ff
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-2.1.0.ebuild b/app-text/libpaper/libpaper-2.1.0.ebuild
index 35123da4b6cf..a0846f3f1b55 100644
--- a/app-text/libpaper/libpaper-2.1.0.ebuild
+++ b/app-text/libpaper/libpaper-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.
 # paperspecs is public-domain
 LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	econf --enable-relocatable
diff --git a/app-text/libpaper/libpaper-2.1.1.ebuild b/app-text/libpaper/libpaper-2.1.1.ebuild
new file mode 100644
index 000000000000..35123da4b6cf
--- /dev/null
+++ b/app-text/libpaper/libpaper-2.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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"
+
+# See README.
+# paperspecs is public-domain
+LICENSE="LGPL-2.1+ GPL-3+ public-domain"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+src_configure() {
+	econf --enable-relocatable
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 981a9b9ee87e..2890fc5c7ad8 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,9 +4,9 @@ AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203
 DIST poppler-23.08.0.tar.xz 1883408 BLAKE2B a35e44cc590e34991b27e53caf650dedf4d4aa4f9f82ed5d8a57b0ca6bb863c96fe0e9b9c9021b9722db48896d236c9e057bcbf45e9609eb237bf00481e91428 SHA512 4f4e3fab9c7de5913496862ce7158a4d79e252c36e4c461980a2ac77689897d02ab292965ea12fb02ea7720e34f98331251b914c0ea8be66842fee0d76779ba6
 DIST poppler-23.08.0.tar.xz.sig 833 BLAKE2B afab91ff9f799cc6c5864275bebf580098449ca070fa5eca47ff54007e94eef4a33f3762390a509d21471af81f9d731951bdbc1ff4adc162763bf54e7dd84408 SHA512 896905f056265388872de552aac94c64abc29f82062ecb2a5137288e4594ca87cb7372807bfe4c30fbc08a3d3922ce84bbbe7260a35e19d438f6bc88d230429f
 DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c
-DIST poppler-23.09.0.tar.xz.sig 195 BLAKE2B 540229bef6c04adf874984f84415a1f89949ea7fc22e86f72cbbafb5a9dfa99e62087237542084bc4ae6e66205ad596b84f68b9cc818bc4f070325c17c2393d7 SHA512 5bdda1b83a3f73a9be203b6ebf359a4e19137bbbc705413fd5e55539d65ca4a6f2b05e055eabe4dcdf8d38387a272bcb7bd64c9aef83c3d12f8a43cdab7b8cc1
+DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.08.0.ebuild 4310 BLAKE2B 3432859fb7c477736f0aa6b3309620a0802e8ff720bed72968c5a8c1e57b72e0e8bc80ebd350398944b730610a30aa22a1f5c25992a2ef21f314768b07ee4581 SHA512 fd3829b708941707afac4d610e708c0aae2f2adb5694a222d6c9fac7e45708d612795d6ee7b3645e6327baad30b2939faabd0bf65d712a47db405b8c6df879de
-EBUILD poppler-23.09.0.ebuild 4318 BLAKE2B b337fccbf643b5e4fff7cd423cb7e88bf043ecfd360205a03c13676812f421d1da22b7be869344ee7253b609490e81e63708c9a13fdd661aeeef2f9229c7a45b SHA512 4b39eb4eb004ace9bc2db0754a03f2490b29e22ccea61f691e625861d3cbdc306ac8534fdebaa8895885d751d0cdeef4afe5f8eb4d57700f7e626d4e331e4c06
-EBUILD poppler-9999.ebuild 4318 BLAKE2B b337fccbf643b5e4fff7cd423cb7e88bf043ecfd360205a03c13676812f421d1da22b7be869344ee7253b609490e81e63708c9a13fdd661aeeef2f9229c7a45b SHA512 4b39eb4eb004ace9bc2db0754a03f2490b29e22ccea61f691e625861d3cbdc306ac8534fdebaa8895885d751d0cdeef4afe5f8eb4d57700f7e626d4e331e4c06
+EBUILD poppler-23.09.0.ebuild 4318 BLAKE2B 5014c23b8ed02d8bf59ac2ad531af32d6b7451429bf835e617166f88fb20b113bbfe936589996392bcbf67ed9e53d80e52a420b6f580969172ce42f03bfacb17 SHA512 da4709afb59c97bdf5f08a8e576486fb36aefc6ccff2f250eab1552467cb6cd87e7102c9a682ad0242683300d8410de98cf23459354d7d37d3755b056afebeae
+EBUILD poppler-9999.ebuild 4318 BLAKE2B 5014c23b8ed02d8bf59ac2ad531af32d6b7451429bf835e617166f88fb20b113bbfe936589996392bcbf67ed9e53d80e52a420b6f580969172ce42f03bfacb17 SHA512 da4709afb59c97bdf5f08a8e576486fb36aefc6ccff2f250eab1552467cb6cd87e7102c9a682ad0242683300d8410de98cf23459354d7d37d3755b056afebeae
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-23.09.0.ebuild b/app-text/poppler/poppler-23.09.0.ebuild
index 1db2523f013b..d33daa61e4b9 100644
--- a/app-text/poppler/poppler-23.09.0.ebuild
+++ b/app-text/poppler/poppler-23.09.0.ebuild
@@ -67,7 +67,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
 fi
 
 DOCS=( AUTHORS NEWS README.md README-XPDF )
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 1db2523f013b..d33daa61e4b9 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -67,7 +67,7 @@ BDEPEND="
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230313 )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
 fi
 
 DOCS=( AUTHORS NEWS README.md README-XPDF )
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index e2b4d9565a31..a7c0333acdb3 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -8,9 +8,12 @@ DIST qpdf-11.4.0-doc.zip 6854262 BLAKE2B 58b55287fbef37beae452803db409e163f3fcf4
 DIST qpdf-11.4.0.tar.gz 18643945 BLAKE2B cde1c4db4c51733fe71a7e46fc271817825b5a56ce81053edf0f886eabdf13bce55308dd36ebf9b5067dcf173f371135bbc651253a7df214b9863c2b62cdde8f SHA512 6f31a37a9a52752c89d319e0d29d8e6c1e4885ca494de47a65f9374cdb5672497ab93f754481300c8e6c68fc2874860997b778dc05386b6f3e6a5a70a3f9f754
 DIST qpdf-11.5.0-doc.zip 6858454 BLAKE2B bd1e7f974eb2b0e22395216a1e3d55b18b1140c2210b230e5382934e5465314f8c73db5e24b8daf2478b89d94eba6214452be5f9f1ec4eb06fe6f5b254742caf SHA512 263fa79a9a1d14086787adf8ce2cfb1e951f504cb214a9c4b44e261a72e715a33e03dc3084a8aaa76e0b068ac0fe5905c6a1ec99e52e962c1589f1f4d0e6f678
 DIST qpdf-11.5.0.tar.gz 18638138 BLAKE2B 54545665a31cf0cbfc50faa18f1dc64f036cd5bfd2b274ff443718e704e26f3a8cf83600f9dd7d8039cf4bdcaf42e1c14f03db775226b56c8ba53be33e0ca522 SHA512 3c8504de11c34e7d623b829c0c987ba5555c2bdcfdd5d4408d29f321fd79154ec2d6fa76f45556046dfc931b51bd75e3062973c36c8020383acacbe56c90e04c
+DIST qpdf-11.6.1-doc.zip 6861634 BLAKE2B bc9f566de9bc403e9a81184ef860cf2c39253228e4ad776f999d8b896958242fca4833517b03ce1c92e03983a39a17a1b02f3605df354afc414b82a5dbf6398b SHA512 efb8ff85c2a5c712f2f78213eddd6c8568727ff6d15d31da2880ee487053c9d703c47ac383f008f6abbf87feb262c6aa2a84419d21e7b4859215509e80d6814a
+DIST qpdf-11.6.1.tar.gz 18646767 BLAKE2B fd6163963eb192b38ed1e78cba443e9e247e6ff408efd6cb480c81ac3d9d233e00edf9ef0858e51ac755b2b7cea0d8763ac6dda3fe9d54618114b4b3a00d5b15 SHA512 a3ce1a531331a6f7e33244d598118f9463f92f0466fd1f2aa3dcdc6dc2c1db0811d00e5ff16ad33ccc81a702ff8dbec719f56194f944de1e00f5e6cc8ed17a69
 EBUILD qpdf-11.1.1-r1.ebuild 1850 BLAKE2B 5e52d82411d166b3d1959f72a5ba9672473ce50c78f01284cd9d42163ef20d61b29893e554773c61a63d4244da8fea22402591eabeef1c5835200d08b6fde4b3 SHA512 133fcaeae8de4256704cb55c0670d8c664ddbf1f11f28577e2bf73bea961b8755757aadbeda4222e5a2d5c80792cdf6beb2d3918729866270d6b930503622f67
 EBUILD qpdf-11.2.0-r1.ebuild 1850 BLAKE2B 574271ba3fc5b19da071d62a32357a108de174f0c26ea93d91d81b35e6d1928c685cd9da8edc4499d090d2080f96f8ffd12f82eb748f7223c940b3986e66faa3 SHA512 b53654535d13f84095569a40fa36785228a8c2447815ab6a7a3ee3b0ebb480200bafe25a7bccb160a719a45c28ff12c36fceb7a7384af55ec4304a7e817aad28
 EBUILD qpdf-11.3.0.ebuild 1850 BLAKE2B 574271ba3fc5b19da071d62a32357a108de174f0c26ea93d91d81b35e6d1928c685cd9da8edc4499d090d2080f96f8ffd12f82eb748f7223c940b3986e66faa3 SHA512 b53654535d13f84095569a40fa36785228a8c2447815ab6a7a3ee3b0ebb480200bafe25a7bccb160a719a45c28ff12c36fceb7a7384af55ec4304a7e817aad28
 EBUILD qpdf-11.4.0.ebuild 1858 BLAKE2B 93f474844536a0e75fec9a5e9d3cd3fc6b8c02cbdf8b6c99165554dd8c6c01de8f0e1abf2e2bb7f0fefc2c4d48fa4db69f7bff27a1d92e2325437e9a9fc6f1d9 SHA512 0a2cb5e0e92357711027e14ffa5791a5d99e7f4a2ed70dbe702e52c180c81259300740fcb947e09867f9e20828781199527a8359dcd4d532ab4ab83aab5888e8
 EBUILD qpdf-11.5.0.ebuild 1815 BLAKE2B bdbb5f1e63f8dcf2d18279231fbd6ed1045576ba63e71f0b5147d8f0c0de04add76f241439f9a5ee60ff2f23cf28638eedc3ecce2e41b450539693771c4422ce SHA512 1d293b365a2b64fdd653de98a21f49f86aca5f6c0f454597c759b7df817d04a8d706fa1301af755303bc432384caad8a9025592efc73fa41979f96493f76834a
+EBUILD qpdf-11.6.1.ebuild 1823 BLAKE2B bff9ca5cf2f998df67137b7df24a43204e08b136b00b610149e2da71365d4f651232664329cb8651177fda271bf7f523b171aee057e39ab45e25fe5eb3c68e44 SHA512 d0178fa1b535655df38c46418f0407ccc3d6a7da955e93c46a2d9f87eb1a97ced42273cb1edc5cb1d70c9e6a962b35d1aec4b96e2ec3aacd654ce949b572b2b3
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.6.1.ebuild b/app-text/qpdf/qpdf-11.6.1.ebuild
new file mode 100644
index 000000000000..12e307695db6
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 )
+"
+
+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)
+		local crypto_provider_lowercase=${crypto_provider,,}
+		mycmakeargs+=(
+			-DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+			-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
+}