gentoo resync : 08.01.2021

3 files changed, 74 insertions, 3 deletions

diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index d6d9c99dd0a3..de0b3a3feaf5 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,3 +1,4 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r2.ebuild 2094 BLAKE2B 0a23cc210c98486de1d099378ccfc8e64f92de02dba4ba081442570d6b7cbd7c5f11c717557f4ea1a28f0ed56fbe863f9a238216cb5d6ad3fb33d4f02951018f SHA512 22dd1b367bc3d496c4ced1b8d8ad6431b59f18312d0b4d920d1db0db5bef7d77bb45a74816d5269104baddae3c33b158050edf4e299f65a8c9f87bf50f260383
+EBUILD enca-1.19-r2.ebuild 2083 BLAKE2B e20fb87d6f0480f6f18092690d17b64b4075e6437a721b8bd3bf89af23d6e059c28c1d3f4b7ad06f2d18a877cdfb9c0e373a46b77e0d6e9e78d969b3125d8858 SHA512 7a660d1927d237961baa18adf6f0f83db132460d5b17b6a2e0939afce37b133729471d52f67b321fd2362b07cb97d529ec031821772334ea0fda447d78b22344
+EBUILD enca-1.19-r3.ebuild 1614 BLAKE2B 0dda242d015018b9c3dc2071c9c3129dd818aee61b46aacc7f75a8155cf8eb76dbfd922e5d4b74e4a841672616d605e54a9d40a672f753923b5bd3b47191c849 SHA512 62313a59ff4fa5f775d3679885f7f785bff8964c57e8c476e1a8f75bf0dc8e3e73c70bccbe86943cd63cbaea822cf07d15af61133506871dbe18258a75a3084e
 MISC metadata.xml 324 BLAKE2B 61e560fc5161d96f01841ebd42ce64012725667f0545fe3bfa463f94b61a536822e1109bfa044f17f6e12c6c45bd24c284aa4846f36db5836e24742b1cc171e9 SHA512 b10801cd8a372709601915899abe03282148aa9a0519160963f5a7734fbeadc082f5493e46ecfb887a16c4b9b5f28424b3b2b87ab4b34708b77cdf3cd4eba03f
diff --git a/app-i18n/enca/enca-1.19-r2.ebuild b/app-i18n/enca/enca-1.19-r2.ebuild
index aedbe2b2bc0f..631cb8be1eec 100644
--- a/app-i18n/enca/enca-1.19-r2.ebuild
+++ b/app-i18n/enca/enca-1.19-r2.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=6
@@ -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 ~x86-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 static-libs"
 
 RDEPEND="
diff --git a/app-i18n/enca/enca-1.19-r3.ebuild b/app-i18n/enca/enca-1.19-r3.ebuild
new file mode 100644
index 000000000000..a818121498e4
--- /dev/null
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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"
+
+BDEPEND="doc? ( dev-util/gtk-doc )"
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	recode? ( app-text/recode:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+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
+
+	# Disable unconditional documentation build.
+	sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-external
+		--disable-static
+		$(use_enable doc gtk-doc)
+		$(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 "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Workaround cross compilation issues. See Gentoo bug 424473.
+	tc-is-cross-compiler && tc-env_build emake -e -C tools
+
+	emake
+	use doc && emake -C devel-docs docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake -C devel-docs DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete || die
+}