diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-02-09 00:16:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-02-09 00:16:30 +0000 |
| commit | d5af17a5bb821fb89f66a236fcb1cc9b7d8029de (patch) | |
| tree | f35a211c60324f0d2754e127e7594776c61fe165 /dev-libs | |
| parent | Touch up configure code a bit. (diff) | |
| download | gentoo-2-d5af17a5bb821fb89f66a236fcb1cc9b7d8029de.tar.gz gentoo-2-d5af17a5bb821fb89f66a236fcb1cc9b7d8029de.tar.bz2 gentoo-2-d5af17a5bb821fb89f66a236fcb1cc9b7d8029de.zip | |
Update to EAPI=4 and cleanup ebuild.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libiconv/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libiconv/libiconv-1.14.ebuild | 38 |
2 files changed, 20 insertions, 25 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/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 } |