gentoo resync : 29.01.2021

3 files changed, 2 insertions, 85 deletions

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 )"