Make enca multilib aware, keyword ~mips, bug #424171

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 82 insertions, 6 deletions

diff --git a/app-i18n/enca/ChangeLog b/app-i18n/enca/ChangeLog
index d47693daa34d..3a43accc91ef 100644
--- a/app-i18n/enca/ChangeLog
+++ b/app-i18n/enca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/enca
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.79 2012/05/15 13:01:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.80 2012/07/01 13:15:58 blueness Exp $
+
+*enca-1.13-r3 (01 Jul 2012)
+
+  01 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +enca-1.13-r3.ebuild,
+  +files/enca-remove-dirty-path-hack.patch:
+  Make enca multilib aware, keyword ~mips, bug #424171
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> enca-1.13-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-i18n/enca/Manifest b/app-i18n/enca/Manifest
index aa4b3c60a46e..1ad10a942861 100644
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX enca-remove-dirty-path-hack.patch 667 RMD160 359f7517994196573b2230092c3a833fddfebea2 SHA1 a71a4c1d7c71685ceb9435913f8eedaeb197b191 SHA256 92db99e7b9bc50d116ce1880ef026057f4cc12c28222ef7e1c4dd7bbfea4511c
 DIST enca-1.12.tar.bz2 531308 RMD160 c39e0f3a5877a3a2b361b1b0d816ef076af8801d SHA1 36e1e6ebac9dbf701008d80362f10ac50378b4dc SHA256 4611eacbbc7712622ae7f01d8d9f088eae095cfdc485e70ee16df86fa349ed91
 DIST enca-1.13.tar.bz2 532000 RMD160 347d81c5211a74aad1e5aca9ba6a86883158a804 SHA1 448e5a6d356980ca6d489e760eacbcca118b320f SHA256 6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432
 EBUILD enca-1.12.ebuild 1006 RMD160 b53a61fec7f3dc8ff72511e44802893fc6ba0bea SHA1 430d909816b412541b0288fdb35db276cc13d9c1 SHA256 12077e101f10814202e9b15294516eba92efa19b7fd93a0e8a0345acefc841c3
 EBUILD enca-1.13-r1.ebuild 1125 RMD160 8de7c3c8df4df6b7b93dde4c56e2a56c72d78a1d SHA1 7993dfeed6027f312740f88162492af1d8411d10 SHA256 8bc8bf1b7a497109669dd7f171cc7566769c707d657fd1d82840a1625ab67b13
 EBUILD enca-1.13-r2.ebuild 1187 RMD160 4f48a1ff00783c146d47d25e980989a87550e767 SHA1 790067d84a9b8a2a8cdff68958112767241aaa44 SHA256 f4aa47168c3aca912cac82dacd59467537f667bdae0f650f369531713f321196
+EBUILD enca-1.13-r3.ebuild 1341 RMD160 712655cf9f288e305e15ebc5c33f5e67108d6ead SHA1 5da7fa82a064e35c1d87840f4a94679a86e1b520 SHA256 8019a024ad6bf944e69d05844e90e2018575e233074278c18b276133bb1450aa
 EBUILD enca-1.13.ebuild 1126 RMD160 f128ee136c719606bd041fc210433ea40aa5dde4 SHA1 4f977f891ace251906ac913c849a6d4c34b9cd27 SHA256 65b155bb3dcda32f0fc0761dcfb60a7ba74fd90e88cee54408eb923d8f367152
-MISC ChangeLog 8845 RMD160 b8ed5b8a7fb6ea742a409e4c1a3182d1b504bfbc SHA1 b4af26eb9899ab30d38d30ca2455675746ac1ab4 SHA256 7d144242903b7fc58bc0278c3f9e3ce767eabb2b4f46a454f0dbf653bfd4c3d0
+MISC ChangeLog 9051 RMD160 434a50b90a49e5f1abc2ab2c60e32fe1ba2653b5 SHA1 384074b930e5013fbca53a243283fbedffad4d99 SHA256 761cab2ec8746a88b694daae00793ae45f8320098fe86672831cb5f729cde7bf
 MISC metadata.xml 397 RMD160 9894a1d11f9713ba0df40a7e68348783d70d6328 SHA1 a72d3486c3869046c702f5db95b40199cee07d3e SHA256 5810797c9af8674a11390f93a10c63dba9f46ac17b3326170f749856aa8ded0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEARECAAYFAk+yU5kACgkQvFcC4BYPU0qm+QCWOrV5caB7NlvZ+cbMp2myv3l3
-0QCfWDsuFsAdQBEL+QkpZJIQy4/e40k=
-=qSsV
+iEYEAREIAAYFAk/wTZgACgkQl5yvQNBFVTVh0wCgmmOpxpLPWNkq05VZuCLPqoSQ
+OnoAn29XmS5fE0kBzvsyJrwZesEK3bb9
+=gbQP
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/enca/enca-1.13-r3.ebuild b/app-i18n/enca/enca-1.13-r3.ebuild
new file mode 100644
index 000000000000..45f79b30e95b
--- /dev/null
+++ b/app-i18n/enca/enca-1.13-r3.ebuild
@@ -0,0 +1,49 @@
+# 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-r3.ebuild,v 1.1 2012/07/01 13:15:58 blueness Exp $
+
+EAPI="4"
+
+inherit eutils 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 ~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
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch
+	autotools-utils_src_prepare
+}
+
+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/files/enca-remove-dirty-path-hack.patch b/app-i18n/enca/files/enca-remove-dirty-path-hack.patch
new file mode 100644
index 000000000000..b96667cd288f
--- /dev/null
+++ b/app-i18n/enca/files/enca-remove-dirty-path-hack.patch
@@ -0,0 +1,19 @@
+diff -Naur enca-1.13.orig//configure.ac enca-1.13/configure.ac
+--- enca-1.13.orig//configure.ac	2010-02-09 05:23:03.000000000 -0500
++++ enca-1.13/configure.ac	2012-06-29 18:04:51.000000000 -0400
+@@ -97,15 +97,6 @@
+ dnl Check for good random number sources
+ AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom)
+ 
+-dnl Dirty path hack.  Helps some people with badly set up search paths.
+-if test "$prefix" = "NONE"; then
+-  LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
+-  CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
+-else
+-  LDFLAGS="$LDFLAGS -L$prefix/lib"
+-  CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-fi
+-
+ dnl Checks for libraries.
+ ye_CHECK_LIBM
+