3 files changed, 2 insertions, 82 deletions
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="