6 files changed, 5 insertions, 88 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 49e958ee6f76..70fea7fd1975 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index 86a4126c281b..b9f4cd16ddaf 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,4 +1,3 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r2.ebuild 2083 BLAKE2B e20fb87d6f0480f6f18092690d17b64b4075e6437a721b8bd3bf89af23d6e059c28c1d3f4b7ad06f2d18a877cdfb9c0e373a46b77e0d6e9e78d969b3125d8858 SHA512 7a660d1927d237961baa18adf6f0f83db132460d5b17b6a2e0939afce37b133729471d52f67b321fd2362b07cb97d529ec031821772334ea0fda447d78b22344
-EBUILD enca-1.19-r3.ebuild 1611 BLAKE2B e80ca8f95959d971b3288733a1e170060f8daddbf5c6581f295b6caa1c7ddbba44e9a0e92e13eee6536d510d979d71dca44f19a6fd642bb1a49cc630e7f5c0c8 SHA512 a6d32064f2ed75a27938207046f9a6fdd0824f2a4bbfc96b5b348f91a723fb650eab149140de05608e5245c5744a224fa5538169a2d09a1035f8af0322ee2716
+EBUILD enca-1.19-r3.ebuild 1608 BLAKE2B a510824a2b96486b5881e58a7eda7b1695126b208fb082b08e7d3a6c97ab65d677f0a9ad73e127acf47b0a3c2c0edf2a92bca8293cb9553e120ffc51a9ebbedc SHA512 8e2b778ec92849efedf8d30e9e00c9bd7078fbc71fef311d0dd101768d76976f7ce48dfc8701b0a57672c711b3ca187fee0ac5e60b619bb79147cd0ab5fd4935
 MISC metadata.xml 242 BLAKE2B 122a8f202e04067fda426bbf1facddf2244ff96e12bd9583bd07a6be498482c5e94c91ee73bab5e60185f8a2e5ce91d1ec3fc6078fc2045cec7e2f78eabb1a60 SHA512 339f854106f55f7dad2cc4c5582ce9fd6d32cedd5dce1414792053cc785011b13ae2a295445724fe079db81dded66d4f555ea4e6b5dc91ef5f1569fd0d7ec0d1
diff --git a/app-i18n/enca/enca-1.19-r2.ebuild b/app-i18n/enca/enca-1.19-r2.ebuild
deleted file mode 100644
index 631cb8be1eec..000000000000
--- a/app-i18n/enca/enca-1.19-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic ltprune multilib-minimal toolchain-funcs
-
-DESCRIPTION="Detect and convert encoding of text files"
-HOMEPAGE="https://cihar.com/software/enca/"
-SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc +iconv recode static-libs"
-
-RDEPEND="
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	recode? ( app-text/recode:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-"
-
-pkg_pretend() {
-	if tc-is-cross-compiler && use iconv; then
-		die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220."
-	fi
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Disable unconditional documentation build.
-	sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Workaround GCC-4.8 brokenness. See Gentoo bug 501386.
-	if tc-is-gcc && [[ $(gcc-version) == "4.8" ]]; then
-		replace-flags -O[3-9] -O2
-	fi
-
-	local myeconfargs=(
-		--enable-external
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-		$(use_with iconv libiconv-prefix "${EPREFIX}/usr")
-		$(use_with recode librecode "${EPREFIX}/usr")
-	)
-
-	# Workaround automagic virtual/libiconv dependency.
-	use iconv || export am_cv_func_iconv=no
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# Workaround cross compilation issues. See Gentoo bug 424473.
-	tc-is-cross-compiler && tc-env_build emake -e -C tools
-
-	if ! multilib_is_native_abi; then
-		emake -C lib
-	else
-		emake
-		use doc && emake -C devel-docs docs
-	fi
-}
-
-multilib_src_install() {
-	if ! multilib_is_native_abi; then
-		emake -C lib DESTDIR="${D}" install
-		emake DESTDIR="${D}" install-pkgconfigDATA
-	else
-		emake DESTDIR="${D}" install
-		use doc && emake -C devel-docs DESTDIR="${D}" install
-	fi
-	prune_libtool_files
-}
diff --git a/app-i18n/enca/enca-1.19-r3.ebuild b/app-i18n/enca/enca-1.19-r3.ebuild
index 2c53af67ade9..94cbc29fa4b1 100644
--- a/app-i18n/enca/enca-1.19-r3.ebuild
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode"
 
 BDEPEND="doc? ( dev-util/gtk-doc )"
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index a36941fd55e8..17bdb34121ef 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -2,6 +2,6 @@ AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf42538
 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
 EBUILD uchardet-0.0.6-r2.ebuild 853 BLAKE2B d1d6952ad6ed96b482cca2ff18987c324ebecf01ba9484c003a19ebdd95b9ad9203b4a7c3aa24390ad30fa0f275ddfce6198670902949bae06f9ceab1faf43b2 SHA512 d76c390c7e4f87b9c209dd50186971ae042b704c266b6f31d3769f09076024cf6c461e5b6b0bc55764b31729b0a3801816b2d14502de7ecf25fb8b94e6cdbe59
-EBUILD uchardet-0.0.7.ebuild 916 BLAKE2B 0dc7688b33e8222399ae0a867e32a9565232cfa47d73a00151e7e5d4527f62ee9c3a51058c8e467d4e93ed4a57b33588c983e7ce5d4ca00074cb20c8a88cb689 SHA512 29d7ec2b93f49d3bc33f7adf43b4b2efc8eab063994f029c7c675c394161f0c3dc510fd7d88bfb60201ae350cc705711e1ae8f0a1e3c345efec6a44973d3e0ec
+EBUILD uchardet-0.0.7.ebuild 974 BLAKE2B a48968b3ec4effe83eeec15e9e32bfaae70c48abb79b05e78eee200b0f7174cd12e008e91e57046bb9d8a1b70af15388f17d3d811527828eb32c7fd59a95221d SHA512 8b78580c4ccdecf489704ffa31e2ddf1828ee2812d79a02d8fb1848eb9c1efb48677f905e10e7b8c12fa6d7d073bb548439787de21adbd558475aa7bf671ea80
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
 MISC metadata.xml 671 BLAKE2B e4d37fa90064a38dceb1472cc2683257d8f7f7ef5f4c15a440f2d9102f91561d408b919c29077b305013e5dc967b42400ec49ee6a50037708a76b2c2e1742e44 SHA512 38fbc4d87e388fc19dcb64a65fe8859307dd7636a4327353131a7c8ebf8974cd74c73486b9dedf1f350d1d42e23a23e33737a1e2e3f4b769f9f64d730149c8a6
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index f9f084ac79e2..148add6ad42f 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"