13 files changed, 84 insertions, 121 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ce33682a0840..7b0c2f7c5ffa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index f26c5e9ed309..a053db072ee6 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -1,6 +1,6 @@
 AUX imlib-1.9.15-asneeded.patch 1124 BLAKE2B 19ffffd4a5f0b9e708bb7ae18697d765cf28a8839eb7e0ad4e56f0a5ea5517671b11367b0c9b1ae17622edc7185a377b5b65c29b2efadffbdff8f0bc2c3550c6 SHA512 ed12ad7420622dcde29d287f258e6d7257d126c9f227d9ea0f1e6d00f83ffa0c5ff25912d7eb94352a3b92cefe79c0317d2bed3179ae74348b91e9f3293bd557
 AUX imlib-1.9.15-bpp16-CVE-2007-3568.patch 461 BLAKE2B 32b0b83ffdc65496857ea99fecdcd676298597977e4e057e45c4c33857a7ddcd7496c9b01e2afb9a167f0d2e09b7170953f29ff1cd7cb440fa68cc3782d120c5 SHA512 9a60cf535bb58240de01c73afe43c4c24c0c15fab3f8d48d4571795ff717c4670d1465ffc0c8f9db5144ef241fccb7477fdf43240d18e53384c0888a2b24e7c2
-AUX imlib-1.9.15-c99-configure.patch 501 BLAKE2B 3f1c97e6536d4dac18aed9862c5d0026db5e6a13d5c15fe8be955009ad735e49076203ad58e849c613b7e9e4e5c5e7e2fd9c8946bb4a8c2c6448a58a3ac44c60 SHA512 0a1a1f59a517d34d69354fbeaef50b86a0da4e88085f02d1ca0a5eeec99c3fa5b14bfd28f54c08f4ae95ec01615d87574dcbd5534d9e91fed943d74e3ef8b9d7
+AUX imlib-1.9.15-c99-configure.patch 501 BLAKE2B 02d307ed10584d299c3410c6e3d2e4590379abf6821900d393bf13f92f3a277c3aa64a800e3fb594493f0d382482398ad2cb43ae25ba839f8fdeebe86a7add83 SHA512 10432d29480e7edc682ab5e090d05b7911787eb39e0ff8542779fc20ea7c5d1ba0f587009257a0993556b99e14982d6c2c60f89f6f3f9215f6e2edac879f342e
 AUX imlib-1.9.15-fix-rendering.patch 3263 BLAKE2B b45fb30178937daf25257b1a6270838116e8e16d470958ea6b09f40fb323ff99c9f39f17bcc17574a53831e8d1d1ae263c9ae03cb5087050361fcf766cd0ee3f SHA512 4e94da8de3f18b711bdfcf4184dbc2220ef566aa61b72c6139e490e55051b3090dc5330929b218f6fab1764c8c2ee8acdd630a0c64010b56b4b4f1b8c55c3f89
 AUX imlib-1.9.15-giflib51-1.patch 3284 BLAKE2B 58bc6e9b674896a8716f0833a719ae13c8d007c6aca854cf1bc856c328c9fd45b3f4809ccc2225c669b8d2aed8b26f50d0d1157686db2995b1ecf2bc008d350c SHA512 ceb74e811300d7233019bcd9f20baf711c5f778e59cc72f56b954845594841b42ee8958eec77ee9ffe6f2a6002a6726c96d5a93463cdc18f5b593ce5333798a0
 AUX imlib-1.9.15-giflib51-2.patch 2847 BLAKE2B 8a191b656fdc7279c6f44e1733d311a50ca050ceaa77ee6d0ac5111f0257b6c4481e71d44e41758d52ca40df9c78dc3054696b23d459ecbd9e5b5a35a7d48fc3 SHA512 e7c56f6f30594f35dc240bbdb57965f9036e688bede544a937f536de10f598eb881be315d2cebf3a7c27ae5ab6c5a4627d16c948c93a04bc56f6bb1f6b31bb34
diff --git a/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch b/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch
index a22514d2dea1..eed93af38f96 100644
--- a/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch
+++ b/media-libs/imlib/files/imlib-1.9.15-c99-configure.patch
@@ -1,6 +1,6 @@
 https://bugs.gentoo.org/898234
---- a/configure.ac
-+++ b/configure.ac
+--- a/configure.in
++++ b/configure.in
 @@ -62,7 +62,7 @@ if test "x$GDK_IMLIB" != x; then
  #include <glib.h>
  #include <gmodule.h>
diff --git a/media-libs/libeot/Manifest b/media-libs/libeot/Manifest
index b459add455c5..f6d960564b39 100644
--- a/media-libs/libeot/Manifest
+++ b/media-libs/libeot/Manifest
@@ -1,5 +1,4 @@
 DIST libeot-0.01.tgz 38651 BLAKE2B ba8362035dca9db2adef636ce153f4fd1d75c20cf0f9671d6f1aa64e055dfbe7644811f44751e11eb4660f0902c14b66be8cdbb45c85325bfd5dd5b37e388b15 SHA512 ff8c3d92b948159171c76306d4a74758974c7ee26c801c5de48805f182b542015286b1e53cfc6dc4524494becb74fb55185701e06fc9be7c16f2d89ac0275941
-EBUILD libeot-0.01-r1.ebuild 639 BLAKE2B 730fe23ed3ee863294d8451b13b3355817b52dea751ab73e479fed87cf2f6c5beaa55796917dfcdc368e781ed4bfd775a752b7550631308ad7376525b9607529 SHA512 35942fc666b12b595e6fa12a75be90478141730e831936de2e8ec87be371ca34e9d7593d25ac500696e171eaff6b65d12a5f09a432894be1320b601107564ddb
-EBUILD libeot-0.01.ebuild 706 BLAKE2B f4bf94c02c3d5211367050d5f122f55ee6f76dabd689e77dde3469a1c20ebb45c7bb6d257392a450d0e8f4a76632fd2c8151d5507998a169ecdf485f64a11ed0 SHA512 f3627131555a8bf5dd1a217e9cb368f86cf4c461515eddaaa8119a60334524bc07e24359a2a44b0a21a200eadd20e143661ab084e77f46aa8b1833763d6e0f9d
+EBUILD libeot-0.01-r1.ebuild 637 BLAKE2B 2fe002890f2b6ae35ee7108562d630a0847f247567ba21213d1043749c051157d72b5772b4e055b7a130e4ba97f19235ca6b52d1e3aa090a1639595d5a01caa8 SHA512 c47676a36e086bb2b54109b6819ee666a70104ead25797ec8f36d863e9dbe9b64c68d67d97c952a887a5a0217fadaeeb5ad4522293099d0c4947901c2fa30ad6
 EBUILD libeot-9999.ebuild 639 BLAKE2B 730fe23ed3ee863294d8451b13b3355817b52dea751ab73e479fed87cf2f6c5beaa55796917dfcdc368e781ed4bfd775a752b7550631308ad7376525b9607529 SHA512 35942fc666b12b595e6fa12a75be90478141730e831936de2e8ec87be371ca34e9d7593d25ac500696e171eaff6b65d12a5f09a432894be1320b601107564ddb
 MISC metadata.xml 338 BLAKE2B c6c1ff67c503267257fab7101393f177a21a5a138d3cfb16c3fa4b08f091d176dcf1eeb1bd877d57925fec692bebaeb4c5ea6888022c02bb4f45c22ba3ac76a7 SHA512 a2156072b19db8ea245cf965854e79dde90ed7fac4ce4dba641ef081a0fef6d5dfe3e01c764ed83317d843f152976b31ab2bc9ff2a8a6a4357fa48701f4af927
diff --git a/media-libs/libeot/libeot-0.01-r1.ebuild b/media-libs/libeot/libeot-0.01-r1.ebuild
index 62bab11bf0a5..5e98d19a339d 100644
--- a/media-libs/libeot/libeot-0.01-r1.ebuild
+++ b/media-libs/libeot/libeot-0.01-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
 else
 	SRC_URI="https://github.com/umanwizard/libeot/archive/v${PV}.tar.gz -> ${P}.tgz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/media-libs/libeot/libeot-0.01.ebuild b/media-libs/libeot/libeot-0.01.ebuild
deleted file mode 100644
index 838ce3e108f8..000000000000
--- a/media-libs/libeot/libeot-0.01.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/umanwizard/libeot.git"
-inherit autotools
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="Library for parsing Embedded OpenType files (Microsoft embedded font 'standard')"
-HOMEPAGE="https://github.com/umanwizard/libeot"
-[[ ${PV} == 9999 ]] || SRC_URI="https://github.com/umanwizard/libeot/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index dbb1b882097c..ef456c182f94 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,4 +1,6 @@
 AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37ca603bcf89bd7dd71cf81ebd8beab6bcf671b76482b3d6d053f53558463c7f3e139897382c90aad5a5cebbd8c49ce4512e7f048c SHA512 3b80c89eb4643a315af594158ca370b71f38ab285cfaa3d1b8d90b09aa420750dccd46f1222b1b9a983af6e9dc501da2d6c732c05a2a3b097ba0437785cc80c7
 DIST libwebp-1.3.2.tar.gz 4162949 BLAKE2B 12b3ff3aa9952dd32ce13656146556d5efb6a66860249a8676721980aee10253a1b0335685a769d995e9954cd305190a8ed1878ba4fefce9dcaf41a3976f9e3d SHA512 2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20
+DIST libwebp-1.4.0.tar.gz 4281370 BLAKE2B 022cef190284b69af781718a82b28ee9806d7e6b1e642ee0833e608f64f691ef918a83e99db02335fb9f60d24d6f0cfc58e7e05e99a3f13d2118719d40a71722 SHA512 1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd
 EBUILD libwebp-1.3.2.ebuild 1941 BLAKE2B 117fedba4fd4191623eb05f0772fff70a84a9e853c3813446e6c04816d1157a7e36c255c32ec209464084e9210f430139a4878b05dd2e9582e0aea732f8e41b9 SHA512 4f03417a90e2dd2e9d1de1008f3b0aaea56820fbd9956717075eee20668031446582e8bbe0a782574bf0b0a58fad75eb2b520df7612ab3732f99b66676bf89a6
+EBUILD libwebp-1.4.0.ebuild 1949 BLAKE2B fd9b98adba39d3d5a77a19163bfc31a7deb4400b8cf4c9ab664e9f96807d5b05014942adb139a6e7b92352123b68dcab8b689eb5982c2cf1c21a64fd50dd812b SHA512 974827c3a00fef5a5ec732f5f46dc7f35405349bc188966bec4bb5cf77e1dee1ccf4a60e114276f8ec2433886decc2e2fc05ab098ddeac7fb1b16919272f29a8
 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.4.0.ebuild b/media-libs/libwebp/libwebp-1.4.0.ebuild
new file mode 100644
index 000000000000..d9a49f914a11
--- /dev/null
+++ b/media-libs/libwebp/libwebp-1.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+if [[ ${PV} != *_rc* ]] ; then
+	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"
+fi
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-libpng-pkg-config.patch
+)
+
+src_prepare() {
+	default
+	# Needed for pkg-config patch; use elibtoolize instead if that's ever dropped
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local args=(
+		--enable-libwebpmux
+		--enable-libwebpdemux
+		--enable-libwebpdecoder
+		$(use_enable static-libs static)
+		$(use_enable swap-16bit-csp)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable opengl gl)
+		$(use_enable tiff)
+
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
+		$(use_enable cpu_flags_arm_neon neon)
+
+		# Only used for gif2webp binary wrt bug #486646
+		$(multilib_native_use_enable gif)
+	)
+
+	ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+	dodoc AUTHORS ChangeLog doc/*.txt NEWS README.md
+}
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index df62c8b2299d..5f64d4a3208d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -8,6 +8,6 @@ DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd3
 DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
 DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.9-r1.ebuild 7118 BLAKE2B aae0530d8a34216c44bf574553225ba1961b2ef02b7494d0c508881b24415dca098bf19b046bdeb1c1bd91bbc81a4497026e0f3e3b2f444b4fa10aff33ead613 SHA512 4997bae85799ffd0ea77c9a13aaa2979bf763b331ff5f5dfe1e1b492d33e0e33bbf75a76c62d816dd7778002b12797330e2f448a4ea43e6ad91694cc9769cb03
+EBUILD netpbm-11.2.9-r1.ebuild 7111 BLAKE2B c8eee1507da7db6bb697fb45b035c9e13373492284531f36e550c8eb59c3dd888fef900de07236635724f5a84d560bfd632d75e60a1b1e2c411ccf96b9eede70 SHA512 cbdb30b8ff9a1cb4af2ab1e392f3d4cb8b57a00bfab6075a510783016fd859a2ee31398d331b5ae5e9c387beaaa59fba1102457ca0c48440cd42ede7d09d272d
 EBUILD netpbm-11.6.1-r1.ebuild 6984 BLAKE2B ee29cdaf8e397781efdca52bf3b55f9912158381328b8b05fdab124fee06fa2e988a5a7d32d3d0245662716f85cdb924b151fb966e5b75450f368502e1da7a9a SHA512 4e40c3d736311711de6c1bd21b041086215499b9bdc9e3a7ca0e248f196d6a50431128faba4fa572909b5dba75d4b5156e87592e75e552716710a3def25cb03f
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
index 042c3ac90c65..5c3f0e8bda46 100644
--- a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/stable"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 # app-text/ghostscript-gpl is really needed for postscript
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index d61bd8030d86..3b1f98711016 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -7,6 +7,5 @@ AUX t1lib-5.1.2-c99.patch 673 BLAKE2B ef8805e261f44ca2dd68bf5776e3e8f8ffaac7413f
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r3.ebuild 1807 BLAKE2B 9fea0c6d8596e8aa51d9cbe48349f4159317436764741083a1199d993c05345e01177a3e19e7fe89e49bc840ccdbbec49ea76bc2662f0991f77d683ef9b597ab SHA512 c8fa6c8ff3b8e5b4680b66a6803c2e5611c1af526e80a69e4658da6f667477ad7a4ddf22d1cca222799b66c1726999c8e3d2b48c1cc6e31da60f5273c1d5f1b2
-EBUILD t1lib-5.1.2-r5.ebuild 1955 BLAKE2B 31d98d9662725909509a755370525ad1054fd446276bd57c7241ddf7746ff3f8fddc5e710e5b1ee6aef0155670df10673b5b0bfa0a0c5472ad9b79290edd4363 SHA512 d811167c4e12c802113cb754e096d3f1bc7643cdc391873d7fcc21cdab719776e96f8ee99051a0dc85e5ea6c0237b26a60d7111c3a388868ae254448dbf66643
+EBUILD t1lib-5.1.2-r5.ebuild 1948 BLAKE2B 2312c8d6a7c34828dde3d6616adb35ff63a2ee9e8be19dc2ee4dcf3cce1a4f2d8c4c53c9499bf637a6b7e4aa48074b4b8458d643f13cdc4a75bf596720ec0d5e SHA512 8c485c1175c43b15ec8a212cd7fe19521ccd01a9e9a7d471b93007e33a4008271e5d574d2f1b082b5acf223e0002a149116e1191291d7b2702ab00cfbafa68a4
 MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
diff --git a/media-libs/t1lib/t1lib-5.1.2-r3.ebuild b/media-libs/t1lib/t1lib-5.1.2-r3.ebuild
deleted file mode 100644
index 035b88e3c7d3..000000000000
--- a/media-libs/t1lib/t1lib-5.1.2-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="A Type 1 Font Rasterizer Library for UNIX/X11"
-HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="X doc static-libs"
-
-RDEPEND="X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.1-parallel.patch
-	"${FILESDIR}"/${PN}-do-not-install-t1lib_doc-r1.patch
-	"${FILESDIR}"/${PN}-5.1.2-format-security.patch
-	"${FILESDIR}"/${PN}-5.1.2-CVE-2010-2642_2011-0433_2011-5244.patch
-	"${FILESDIR}"/${PN}-5.1.2-CVE-2011-0764.patch
-	"${FILESDIR}"/${PN}-5.1.2-CVE-2011-1552_1553_1554.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in
-	sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c
-	# Needed for sane .so versionning on fbsd. Please don't drop.
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--datadir="${EPREFIX}/etc" \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-src_compile() {
-	local myopt=""
-	tc-export CC
-
-	use alpha && append-flags -mieee
-
-	if ! use doc; then
-		myopt="without_doc"
-	else
-		VARTEXFONTS=${T}/fonts
-	fi
-
-	emake ${myopt}
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
-	fi
-
-	dodoc Changes README*
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-		docompress -x /usr/share/doc/${PF}/pdf
-	fi
-}
diff --git a/media-libs/t1lib/t1lib-5.1.2-r5.ebuild b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
index 2ccee89b20ac..8e41fb6cb8da 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ibiblio.org/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="