Updated libiconv to latest upstream version.

Package-Manager: portage-2.0.51.22

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index 411b47e15b93744ccc33cf7b8d81245e3ae35aca..b98699de23074b4bf2381c307a6ec66ced1e49f2 100644 (file)
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libiconv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.15 2005/08/11 11:15:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.16 2005/09/04 19:03:16 flameeyes Exp $
+
+*libiconv-1.10 (04 Sep 2005)
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libiconv-1.10-link.patch, +libiconv-1.10.ebuild:
+  Updated libiconv to latest upstream version.
 
   11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   libiconv-1.9.2-r3.ebuild:

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 9303b9e38ae2bf17cab8f9b644690bd835107a56..257534ad1b021d583b2ed458e99e5ea51be2a5f5 100644 (file)
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c8c039589930865495e3c977f18323fc ChangeLog 2611
+MD5 48038728f0be7d2e0116ee8a8bda31a1 ChangeLog 2800
+MD5 b896bcee65b7519f24c1ae1cb2652704 libiconv-1.10.ebuild 1819
 MD5 abfe510c3ac1a78cb231d3bcbb38f532 libiconv-1.9.2-r3.ebuild 1318
 MD5 f90c6b5ccd48096b82a7842c5994583b metadata.xml 469
+MD5 0f60d7695c7c3a779ae0635797f6eead files/digest-libiconv-1.10 66
+MD5 c48abf520f6345ca1cb28be835796db8 files/libiconv-1.10-link.patch 910
 MD5 97aebb7d7ded50f07b44c23768d25928 files/libiconv-1.9.2-RPATH-fix.patch 1906
 MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2-r3 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC+zN7j5H05b2HAEkRAr3ZAJ94Y5V6UxxqZ5fFwqkX2gp93nt6WACfUXZ0
-5icJnFu56eVvOaEmPxfsFwM=
-=JCgZ
+iD8DBQFDG0UYj5H05b2HAEkRAtZ+AJ9fWZDIR7DmiBs7Dh6QcFbXLz1JhgCfV0ld
+t4zOypdObDgsIX5zPnof1KY=
+=PSCq
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libiconv/files/digest-libiconv-1.10 b/dev-libs/libiconv/files/digest-libiconv-1.10
new file mode 100644 (file)
index 0000000..25c3a81
--- /dev/null
+++ b/dev-libs/libiconv/files/digest-libiconv-1.10
@@ -0,0 +1 @@
+MD5 0d621d541e28ff053d8bbcf7215de3a4 libiconv-1.10.tar.gz 3954075

diff --git a/dev-libs/libiconv/files/libiconv-1.10-link.patch b/dev-libs/libiconv/files/libiconv-1.10-link.patch
new file mode 100644 (file)
index 0000000..c17019c
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.10-link.patch
@@ -0,0 +1,13 @@
+Index: libiconv-1.10/src/Makefile.in
+===================================================================
+--- libiconv-1.10.orig/src/Makefile.in
++++ libiconv-1.10/src/Makefile.in
+@@ -92,7 +92,7 @@ install : all force
+       if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+       case "@host_os@" in \
+         hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
+-        *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
++        *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
+       esac
+       $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+ 

diff --git a/dev-libs/libiconv/libiconv-1.10.ebuild b/dev-libs/libiconv/libiconv-1.10.ebuild
new file mode 100644 (file)
index 0000000..fb2e24a
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.10.ebuild,v 1.1 2005/09/04 19:03:16 flameeyes Exp $
+
+inherit eutils multilib flag-o-matic autotools libtool
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libiconv/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="build"
+
+DEPEND="virtual/libc
+       !sys-libs/glibc"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # This patch is needed as libiconv 1.10 provides (and uses) new functions
+       # and they are not present in the old libiconv.so, and this breaks the
+       # ${DESTDIR} != ${prefix} that we use. It's a problem for Solaris, but we
+       # don't have to deal with it for now.
+       epatch ${FILESDIR}/${P}-link.patch
+
+       # Make sure that libtool support is updated to link "the linux way" on
+       # FreeBSD.
+       elibtoolize
+}
+
+src_compile() {
+       # Filter -static as it breaks compilation
+       filter-ldflags -static
+
+       # Install in /lib as utils installed in /lib like gnutar
+       # can depend on this
+
+       # Disable NLS support because that creates a circular dependency
+       # between libiconv and gettext
+
+       econf \
+               --disable-nls \
+                || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       make DESTDIR=${D} docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+
+       # Move static libs and creates ldscripts into /usr/lib
+       dodir /$(get_libdir)
+       mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir)
+       gen_usr_ldscript libiconv.so
+       gen_usr_ldscript libcharset.so
+
+       use build && rm -rf ${D}/usr
+
+       preserve_old_lib /lib/$(get_libdir)/libiconv.so.4
+}
+
+pkg_postinst() {
+       preserve_old_lib_notify /lib/$(get_libdir)/libiconv.so.4
+}