4 files changed, 29 insertions, 100 deletions
diff --git a/app-i18n/enca/ChangeLog b/app-i18n/enca/ChangeLog
index c5112827a573..dc180797e5ad 100644
--- a/app-i18n/enca/ChangeLog
+++ b/app-i18n/enca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/enca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.101 2014/07/23 15:13:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.102 2014/07/25 14:17:48 mrueg Exp $
+
+*enca-1.14-r2 (25 Jul 2014)
+
+  25 Jul 2014; Manuel Rüger <mrueg@gentoo.org> +enca-1.14-r2.ebuild,
+  -enca-1.12.ebuild, -enca-1.13-r2.ebuild, -enca-1.14.ebuild:
+  Cleanup old. Bump EAPI. Fix gettext dependency. Thanks to Nikoli. Fixes bug
+  #516804.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> enca-1.14-r1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-i18n/enca/enca-1.12.ebuild b/app-i18n/enca/enca-1.12.ebuild
deleted file mode 100644
index fa47f7fc7427..000000000000
--- a/app-i18n/enca/enca-1.12.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.12.ebuild,v 1.9 2010/02/25 11:29:49 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="ENCA detects the character coding of a file and converts it if desired"
-HOMEPAGE="http://gitorious.org/enca"
-SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc +recode"
-
-DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-external \
-		$(use_with recode librecode /usr) \
-		$(use_enable doc gtk-doc)
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		pushd tools > /dev/null
-		$(tc-getBUILD_CC) -o make_hash make_hash.c || die "native make_hash failed"
-		popd > /dev/null
-	fi
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-i18n/enca/enca-1.13-r2.ebuild b/app-i18n/enca/enca-1.13-r2.ebuild
deleted file mode 100644
index 9ade3aafb1bb..000000000000
--- a/app-i18n/enca/enca-1.13-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r2.ebuild,v 1.9 2012/05/15 13:01:08 aballier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs autotools-utils
-
-DESCRIPTION="ENCA detects the character coding of a file and converts it if desired"
-HOMEPAGE="http://gitorious.org/enca"
-SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc +recode"
-
-DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--enable-external
-		--disable-static
-		$(use_with recode librecode "${EPREFIX}"/usr)
-		$(use_enable doc gtk-doc)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		pushd tools > /dev/null
-		$(tc-getBUILD_CC) -o make_hash make_hash.c || die "native make_hash failed"
-		popd > /dev/null
-	fi
-	autotools-utils_src_compile
-}
-
-src_install() {
-	autotools-utils_src_install
-}
diff --git a/app-i18n/enca/enca-1.14.ebuild b/app-i18n/enca/enca-1.14-r2.ebuild
index 34b546b860ea..ecc04a131b35 100644
--- a/app-i18n/enca/enca-1.14.ebuild
+++ b/app-i18n/enca/enca-1.14-r2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14.ebuild,v 1.2 2013/04/26 20:29:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14-r2.ebuild,v 1.1 2014/07/25 14:17:48 mrueg Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit eutils toolchain-funcs autotools-utils
+AUTOTOOLS_AUTORECONF=2.52
+
+inherit eutils toolchain-funcs autotools-multilib
 
 DESCRIPTION="ENCA detects the character coding of a file and converts it if desired"
 HOMEPAGE="http://gitorious.org/enca"
@@ -15,20 +17,19 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +recode"
 
-DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_AUTORECONF=2.52
+RDEPEND="recode? ( >=app-text/recode-3.6_p15 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+	epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch\
+		"${FILESDIR}"/${P}-automake-1.13.patch
 	rm missing # too old, automake will update it
 	# fix crosscompilation, bug #424473
 	if tc-is-cross-compiler; then
 		sed -e "s#./make_hash#./native_make_hash#" -i tools/Makefile.am || die
 	fi
-	autotools-utils_src_prepare
+	autotools-multilib_src_prepare
 }
 
 src_configure() {
@@ -38,18 +39,20 @@ src_configure() {
 		$(use_with recode librecode "${EPREFIX}"/usr)
 		$(use_enable doc gtk-doc)
 	)
-	autotools-utils_src_configure
+	autotools-multilib_src_configure
 }
 
-src_compile() {
+multilib_src_compile() {
 	if tc-is-cross-compiler; then
-		pushd "${AUTOTOOLS_BUILD_DIR}"/tools > /dev/null
+		pushd "${BUILD_DIR}"/tools > /dev/null
 		$(tc-getBUILD_CC) -o native_make_hash "${S}"/tools/make_hash.c || die "native make_hash failed"
 		popd > /dev/null
 	fi
+	# It will fail if we run these twice...
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/ src / /'\
+			-e '/SUBDIRS/s/ test//' Makefile\
+			-e 's/install-data-hook:/install-data-hook:\n\ndisabled:/' Makefile || die
+	fi
 	autotools-utils_src_compile
 }
-
-src_install() {
-	autotools-utils_src_install
-}