New version of libiconv and new maintainer.

(Portage version: 2.0.51.19)

7 files changed, 59 insertions, 28 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index c8c86f9c5060..3ca5e31a8d13 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/libiconv
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.8 2004/06/24 23:18:35 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.9 2005/04/18 22:15:09 flameeyes Exp $
+
+*libiconv-1.9.2 (18 Apr 2005)
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
+  -libiconv-1.7.ebuild, +libiconv-1.9.2.ebuild:
+  Added 1.9.2 libiconv's ebuild, and removed previous 1.7.x one. I'm going 
+  to maintain libiconv in future for non-glibc systems like *bsd.
+  
+  New ebuild also blocks on glibc so that it can't be installed on glibc 
+  systems without have to remove glibc before (which is quite 
+  unpractical).
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> libiconv-1.7.ebuild:
   Add die following econf for bug 48950
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 6ba31f298ee9..4a6f1fcc6c20 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,3 +1,4 @@
-MD5 55145d903194a4f326b00b0cd53e6cf4 libiconv-1.7.ebuild 725
 MD5 d1dd7b7a0f9bde8ec57cbe70f19e7e7d ChangeLog 805
-MD5 23d3e294a30979175887909cb357a88e files/digest-libiconv-1.7 65
+MD5 f90c6b5ccd48096b82a7842c5994583b metadata.xml 469
+MD5 acfb378ffc90d89705448a5347821119 libiconv-1.9.2.ebuild 692
+MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2 67
diff --git a/dev-libs/libiconv/files/digest-libiconv-1.7 b/dev-libs/libiconv/files/digest-libiconv-1.7
deleted file mode 100644
index 1248625aae9e..000000000000
--- a/dev-libs/libiconv/files/digest-libiconv-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc7029c0bc913dc297cf49afa4c0e133 libiconv-1.7.tar.gz 2941046
diff --git a/dev-libs/libiconv/files/digest-libiconv-1.9.2 b/dev-libs/libiconv/files/digest-libiconv-1.9.2
new file mode 100644
index 000000000000..e124274679fd
--- /dev/null
+++ b/dev-libs/libiconv/files/digest-libiconv-1.9.2
@@ -0,0 +1 @@
+MD5 6bc300365053c815b10b800a21e0bc7e libiconv-1.9.2.tar.gz 3919945
diff --git a/dev-libs/libiconv/libiconv-1.7.ebuild b/dev-libs/libiconv/libiconv-1.7.ebuild
deleted file mode 100644
index afb34e207e49..000000000000
--- a/dev-libs/libiconv/libiconv-1.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.7.ebuild,v 1.17 2004/07/14 14:40:21 agriffis Exp $
-
-DESCRIPTION="This is a fork of the glibc iconv implementation that is incompatible. it may break things."
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libiconv/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-src_compile() {
-	econf || die "econf failed"
-	mv man/Makefile man/Makefile.orig
-	sed -e 's/mkdir/$(MKDIR)/' man/Makefile.orig > man/Makefile
-	emake || die
-}
-
-src_install() {
-	make MKDIR="mkdir -p" DESTDIR=${D} install || die
-}
diff --git a/dev-libs/libiconv/libiconv-1.9.2.ebuild b/dev-libs/libiconv/libiconv-1.9.2.ebuild
new file mode 100644
index 000000000000..66dc67387bff
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# 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.9.2.ebuild,v 1.1 2005/04/18 22:15:09 flameeyes Exp $
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libiconv/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="nls"
+
+DEPEND="virtual/libc
+	!sys-libs/glibc"
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		 || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
+
diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
new file mode 100644
index 000000000000..1fd2216cf8da
--- /dev/null
+++ b/dev-libs/libiconv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>bsd</herd>
+<maintainer>
+<email>flameeyes@gentoo.org</email>
+<name>Diego Pettenò</name>
+</maintainer>
+<longdescription lang="en">
+libiconv is a standalone package which implements the iconv() related
+functions as glibc already embed. Libraries and applications needs it
+when built in a non-glibc system.
+</longdescription>
+</pkgmetadata>
+