Update to EAPI=4 and cleanup ebuild.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 36 insertions, 31 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index d8ec577b7200..1d4cc42ca3de 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libiconv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.36 2011/11/10 11:49:35 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.37 2012/02/09 00:16:30 vapier Exp $
+
+  09 Feb 2012; Mike Frysinger <vapier@gentoo.org> libiconv-1.14.ebuild:
+  Update to EAPI=4 and cleanup ebuild.
 
 *libiconv-1.14 (10 Nov 2011)
 
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index ab1e01a4c221..53af189d7389 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -5,13 +5,23 @@ AUX libiconv-1.10-link.patch 910 RMD160 9ffdad30a03ec8013c4e7eb257de01b096026853
 DIST libiconv-1.13.1.tar.gz 4716070 RMD160 a3e4b4d419006447045fde50fef0fe39bed9d501 SHA1 5b0524131cf0d7abd50734077f13aaa5508f6bbe SHA256 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49
 DIST libiconv-1.14.tar.gz 4984397 RMD160 87c36ba3f8ad1a49eb0d06f71856c856893bb52e SHA1 be7d67e50d72ff067b2c0291311bc283add36965 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
 EBUILD libiconv-1.13.1.ebuild 1730 RMD160 119f31bccecc740aa057bbd975c5424762719da7 SHA1 9290f878ff12302fbb175f7b9155244649c5ad29 SHA256 2a357bff3994fb82092f18205d7a37fe3a62cb4b465f1cd3a7f319eb7b2708c9
-EBUILD libiconv-1.14.ebuild 1418 RMD160 e72dfe0eb929fdd29fd4890e00f20c5258681240 SHA1 1628a27852af4a3b9503082a6e2af402ebf3f60d SHA256 7200e82b200142c5a9c3abca014316f92cb1faaa98a4aeda29f58004dce09b0e
-MISC ChangeLog 5588 RMD160 19555a57a8283570447d181df567b0fd13df09c0 SHA1 eeeb4e15d243d8c4797330e339d693b8a37bd486 SHA256 21a3e5ff5832fe95f13f5af65f3c3c6d2fc18251eab9097afc5f90c34696464b
+EBUILD libiconv-1.14.ebuild 1062 RMD160 8e284430e74a3b0763d968df14595672edbdcee8 SHA1 ac24508887308289ba4e37cc9ca97ae529ff42dc SHA256 4517782e271f08c1c8a48504261982c68b39822313221315851346ddc972dac5
+MISC ChangeLog 5701 RMD160 83e548a996e06fac6454cc141610d462b65b374f SHA1 34b46498fdcef7c158d5d9b2044ceea3e1ef8570 SHA256 4a37a2ef8b6e4ea87b434d780185c4765ba6cdb9f1b96d991f78000d4569bc29
 MISC metadata.xml 378 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 SHA1 a5566ba3b095b06da0d54f2d79d3f42769a9af26 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (FreeBSD)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67ulYACgkQGpDnPLSHuMAM9QCcD+xZmQBc1RY2k0IL1qiAesBo
-iZEAoNb1FqodEDFpgsl3kaT+odwk1kK3
-=EYMM
+iQIcBAEBAgAGBQJPMxBmAAoJELEHsLL7fEFWISIP/2921JJsUA9NDnK+y6jr5C0Y
+6hVHbwqQ6KBgwgnlVVfQGiNXxkEn+ujeNi85vkI496gNrp+3E0qkeJXjajROZ5z9
+l0fQYI/ctcG4Vc2qDYViq8PmsnW3IkfC4hb7xid+K6lBmOA9+sIzhlzWeWJJvzOZ
+9WYq86s7Qsj2VaAih0UPA2qb96zgfB4c4Gwz3F+fwUU90LGYddJomjuBKKr5/Yrk
+iroo7VKDVpoeTJVq3JqVWI+Y1//an39qgzrZXc3tGsvHe8hgYBc4Eqg1hsCAWZGk
+0kEC3REWWIFH4R9YNJw0uLBVZ+Zks834pxFhwcc5EzCAwGC1Ijb1vX2Q/v6pj3l2
+gxhRLP84XUW0l95z66OawJkTmTfoU7a+SENoLyNgqikpCeN2ZIyKLlEOMdmdfOzn
+aA9YDN3w6Nq/TiX77aHeE7boGDijUwrjGY6ZuznxmoOaRqoU3lZ2jrjK6nqPMlmo
+Fl6rw/n7ooqtONSaVDg3ko8JprGdL7u4Phm/fKQq4R9mOlY8Q36PfL+hTRMqMqt4
+qd/7H3/pV7BWBChSIz1XNe5UtRkT1XEICvauT8uzXEkpSDK2nYODZWvqqXFlhIeN
+q+qWEM4QtUKaDREZuaqETmLIt7V6ezqkYBEcWiUHg7vSpuO43ESHqQw85EiDPcYO
+nUz06oHqbegXVMZOU7aP
+=Xbs8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
index eb110d29d3e9..447e440f6711 100644
--- a/dev-libs/libiconv/libiconv-1.14.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14.ebuild,v 1.1 2011/11/10 11:49:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.14.ebuild,v 1.2 2012/02/09 00:16:30 vapier Exp $
 
-inherit eutils multilib flag-o-matic libtool toolchain-funcs
+EAPI="4"
+
+inherit libtool toolchain-funcs
 
 DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
 HOMEPAGE="http://www.gnu.org/software/libiconv/"
@@ -17,36 +19,26 @@ DEPEND="!sys-libs/glibc
 	!sys-apps/man-pages"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Make sure that libtool support is updated to link "the linux way" on
-	# FreeBSD.
+src_prepare() {
+	# Make sure that libtool support is updated to link "the linux way"
+	# on FreeBSD.
 	elibtoolize
 }
 
-src_compile() {
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-
+src_configure() {
 	# Disable NLS support because that creates a circular dependency
 	# between libiconv and gettext
-
 	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
 		--disable-nls \
 		--enable-shared \
-		--enable-static \
-		 || die "econf failed"
-	emake || die "emake failed"
+		--enable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+	default
 
-	# Move static libs and creates ldscripts into /usr/lib
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib{iconv,charset}*$(get_libname)* "${D}/$(get_libdir)" || die
-	gen_usr_ldscript libiconv$(get_libname)
-	gen_usr_ldscript libcharset$(get_libname)
+	# Install in /lib as utils installed in /lib like gnutar
+	# can depend on this
+	gen_usr_ldscript -a iconv charset
 }