6 files changed, 44 insertions, 3 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 489cdfce1658..14293f2f3547 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 03dc43bbba46..453dc2bed90c 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,5 @@
 DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
+DIST build-docbook-catalog-2.4.tar.bz2 4693 BLAKE2B 496356008ef31f87169f9f060ba5593e6054447789a8a1c0dbc43fb4f81ebf087d09adec8fe82d2641e3550616bb874c6a1253b7988553948956f1bbb2e241c7 SHA512 5d42a641c8b336e49749b28101f87d4d856d3e5491adca4053212a473b42dcda88ab00fa64f54813a3e1b4ef1e45756e7de3a652808ad7ee113aa3afe7bf99b5
 EBUILD build-docbook-catalog-2.3-r1.ebuild 1177 BLAKE2B d0871fb35b15d7cfbd057927bc783cbbe77e539975f375a8958818b18c7cc76ef5efbffb4899c826220e8eb2c67a8aed48a336b727db3ae94d5f170787ea584a SHA512 abba721ccf8b739f5cd0ed328785910bab72577db0a79e8dbb6178a64cd51e188972a26bfc75eae7deb16aae142f216c78f8ded442b247346a45fbcc72332500
+EBUILD build-docbook-catalog-2.4.ebuild 1185 BLAKE2B be88bf7358c05ebb6f9c7343e4cc42761489a0d97666e3222aedb28e09b4d79af37a6028d3630311b4ae24d105e4f13d9dcc222b81c090a4cab7124d2e6f5f6a SHA512 16a6cb44afb0baa724077dfbb0811eb88bf3c132a232ad3b0cd9c30a04a5980be885fdfaf5ecd224b2a6b8efa19e6f2660409e804fab6d16a462b5b77f3a36b9
 MISC metadata.xml 283 BLAKE2B 5cc7f34f6d2e2efcea07d91ed23d5f70a834c0d11b92ee45c27bab7296bd480fac2d27652f0ea4388e370014bafe490e8464eff4e3bb27fda67e20f568c1d92b SHA512 97de2993c7828c3585e4e97d62ac2a08146ae5a39051f825b38be1f657836603eb24ea8819bce7bf75cc71a349ad29f6d920876f20c1bb1cc88a78f9e5dfab66
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
new file mode 100644
index 000000000000..ab5f58f571db
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-libs/libxml2
+	|| ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e "1s@#!@#!${EPREFIX}@" build-docbook-catalog || die
+	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+	default
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	# See bug #816303 for rationale behind die
+	build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 0848cb7e9482..45638a66dfc2 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -4,5 +4,5 @@ DIST ghostscript-10.01.1.tar.xz 67567268 BLAKE2B 26f14f11362c7cd6e129044b8e094ad
 DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
 EBUILD ghostscript-gpl-10.0.0-r5.ebuild 5557 BLAKE2B ea473304d688c9187e366be0c2464e7b33706ce26e10311d1034ccf4e8dcb78a075db2e59a66d53487451e85b1b09a736cb223a6099eb6590e5ed3d85ee0c0d3 SHA512 bedff71a935d1ca18f9fc1bccbcd090787b1ece734ae5c1f46ef244c4705aecf0545eda5dedd02aade0577b8a942238af17d969850a8c5438efd047028948d0b
 EBUILD ghostscript-gpl-10.01.0.ebuild 5496 BLAKE2B eef46a0757c650aa2749e0f75c211d2a9ea17b8b46b42ecb4348f88d7ba952eba80f61ee6c179f398f355087c50e2c08507a8dead4bb8a6ead4189fa572ed8cf SHA512 4c32176f5a136ad9c378cd633c3dcc4040086acc4a315c8976218220393134bff89d5f5a6a59e82d641a29366ce1039cd495352cd895056c09e72a328bf7f1e5
-EBUILD ghostscript-gpl-10.01.1.ebuild 5490 BLAKE2B 5365ef5195543b16b262dc7ae5022b0ab0abe7ec568fc3e32f752b54dd647dc9db10fef54bf8ccc2da4ede28c6eb9e203713d876911a57a97db3ecc231fcf62f SHA512 5ff4a024369f69500db0fedea4f6a7ff62809d552add501aace8dab1c155e0325586086f626553eefa19f885fd82c4237d2cb40fe3d0d3619eefea6949658519
-MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
+EBUILD ghostscript-gpl-10.01.1.ebuild 5488 BLAKE2B cd4328b6ea3af1668e7a783ac6b54eb37f6908d9d3fa466bf0adae360e0f81e783cc2f1bd434edbc7b8d8cf91747d4f29c686691a55b75e8c8a9b943c8a39829 SHA512 ec31d094177e83ecc2aa9e65461fe4c168ac738bd6d4f5b3617110e51f37531a2ab254c2ec3df98ae35932d9666483482300e0fe89a6d300f6e1158bed5aa8ff
+MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
index 504411567c86..cb84f295f593 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 3570f4ae29c0..dd57cc77263a 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -14,6 +14,7 @@
 	</slots>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
+		<remote-id type="github">ArtifexSoftware/ghostpdl</remote-id>
 		<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
 		<bugs-to>https://bugs.ghostscript.com/</bugs-to>
 	</upstream>