3 files changed, 2 insertions, 88 deletions
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index aa65e8f9e7d3..537d80f8468c 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,8 +1,5 @@
 AUX libintl-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1
 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
-DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
-DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.1.ebuild 2769 BLAKE2B 186e5c51991920dfed079ee3be3ab0d975c6706d33d10198b20afbcc41e5e02c74c8266e35ada082062e059e81a6856d519a9381c05ef49573b38b6748eb24f1 SHA512 08d3510710471ccc8d32a3236ba9e688bd691d6faac64a496c4acaf64a07185a29562f7dd123242eb1ca17eb63ccfc2c1fc8b2599c52cea7f991d98969db5e35
-EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
+EBUILD libintl-0.21.1.ebuild 2768 BLAKE2B ba7943b373470fbbe3bed9bf8cc7e59ac1046a027a384ba6114391f7dad5b167eee031fb76d6ec2861fca903a9d85a8c3c61ec25f48be0e93d9e23654e838169 SHA512 5603f68d1b8071049e0d87ca1b8cf6a217396ba0989800fa260cac1322811b94f45af92e251d10f144bdd056a897cb1fdd1bfee0d4d679e4bfcef44c473c7f51
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index c96124d7a3b9..bf61c562db4c 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
deleted file mode 100644
index c0d55f3fb99d..000000000000
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI=7
-
-MY_P="gettext-${PV}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
-inherit multilib-minimal libtool usr-ldscript verify-sig
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
-
-src_prepare() {
-	default
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--cache-file="${BUILD_DIR}"/config.cache
-
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No Java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -r "${ED}"/usr/share/locale || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}