version bump and clean up

(Portage version: 2.0.51.19)

11 files changed, 26 insertions, 95 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 38f520e3cc88..a0dd2d637ed8 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/libidn
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.22 2005/04/19 14:24:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.23 2005/04/19 14:31:25 carlo Exp $
+
+*libidn-0.5.15 (19 Apr 2005)
+
+  19 Apr 2005; Carsten Lohrke <carlo@gentoo.org> -libidn-0.5.0.ebuild,
+  -libidn-0.5.7.ebuild, -libidn-0.5.11.ebuild, -libidn-0.5.11-r1.ebuild,
+  +libidn-0.5.15.ebuild:
+  version bump and clean up
 
   19 Apr 2005; Carsten Lohrke <carlo@gentoo.org> libidn-0.5.13.ebuild:
   stable on x86
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index edb9bd820196..d96e74c6de71 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,17 +1,10 @@
 MD5 c33918231e4239d278a3f701319462b7 libidn-0.5.4.ebuild 543
 MD5 5dbe6572032f2a6324f22b6c1bf69849 libidn-0.3.7.ebuild 636
-MD5 c1cf81ba24208fff0cc881461a7a99f2 libidn-0.5.11.ebuild 621
-MD5 239994761f24de616f862fd474378cb4 libidn-0.5.0.ebuild 634
-MD5 d342a79577ed37419020d2333d80879e libidn-0.5.11-r1.ebuild 1400
 MD5 ece0284649a2d82c055b7b0f06c751bf libidn-0.5.13.ebuild 1283
-MD5 46e9e202f4ddf7d92ab0bfc52bbbc2d5 libidn-0.5.7.ebuild 620
-MD5 ee9a1bf0fd663752463d3c8ec1227202 ChangeLog 2648
+MD5 0a3970fb02250ca5e98aca2befa1aa79 ChangeLog 2876
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 341fff32e66659a0f0c7f305f636591c libidn-0.5.15.ebuild 1287
+MD5 f2ecbaf343fd2a1913f0789bce980a21 libidn-0.5.15.ebuild 1190
 MD5 71c9d73948b2aae62f1f91b02a24904c files/digest-libidn-0.3.7 65
-MD5 fc807c568d7d15366e98afb3b5d04911 files/digest-libidn-0.5.0 65
 MD5 34af7cf0c0c059728bc3b2870298d456 files/digest-libidn-0.5.4 65
-MD5 9735250b9caf3517e94e86f3f18ef8cd files/digest-libidn-0.5.7 65
-MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11 66
 MD5 04ac8297c56ed0aa42ee97df501dda7e files/digest-libidn-0.5.13 66
-MD5 823859b97ca0b5b2b7a9768723f050b6 files/digest-libidn-0.5.11-r1 66
+MD5 91804808fca23d8a14cc7a801e512b76 files/digest-libidn-0.5.15 66
diff --git a/net-dns/libidn/files/digest-libidn-0.5.0 b/net-dns/libidn/files/digest-libidn-0.5.0
deleted file mode 100644
index 471ebcb6acde..000000000000
--- a/net-dns/libidn/files/digest-libidn-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d13633479facc9163eb16db6f9662a3b libidn-0.5.0.tar.gz 1865204
diff --git a/net-dns/libidn/files/digest-libidn-0.5.11 b/net-dns/libidn/files/digest-libidn-0.5.11
deleted file mode 100644
index c3c5585582be..000000000000
--- a/net-dns/libidn/files/digest-libidn-0.5.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4f6ca9464ecbf2fc1e837869f2f3c8d libidn-0.5.11.tar.gz 1945424
diff --git a/net-dns/libidn/files/digest-libidn-0.5.11-r1 b/net-dns/libidn/files/digest-libidn-0.5.11-r1
deleted file mode 100644
index c3c5585582be..000000000000
--- a/net-dns/libidn/files/digest-libidn-0.5.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4f6ca9464ecbf2fc1e837869f2f3c8d libidn-0.5.11.tar.gz 1945424
diff --git a/net-dns/libidn/files/digest-libidn-0.5.15 b/net-dns/libidn/files/digest-libidn-0.5.15
new file mode 100644
index 000000000000..704bfc9b3445
--- /dev/null
+++ b/net-dns/libidn/files/digest-libidn-0.5.15
@@ -0,0 +1 @@
+MD5 03d2c41aa6e74ab627a09b1f9f032280 libidn-0.5.15.tar.gz 1971879
diff --git a/net-dns/libidn/files/digest-libidn-0.5.7 b/net-dns/libidn/files/digest-libidn-0.5.7
deleted file mode 100644
index 44d55c5596c0..000000000000
--- a/net-dns/libidn/files/digest-libidn-0.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fc537d187ed63577e73b32c80bfde6c libidn-0.5.7.tar.gz 1914553
diff --git a/net-dns/libidn/libidn-0.5.0.ebuild b/net-dns/libidn/libidn-0.5.0.ebuild
deleted file mode 100644
index 904e920de4cb..000000000000
--- a/net-dns/libidn/libidn-0.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.0.ebuild,v 1.2 2005/01/29 17:00:10 carlo Exp $
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation."
-HOMEPAGE="http://www.gnu.org/software/libidn/"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-# See http://www.gnu.org/software/libidn/manual/html_node/Supported-Platforms.html
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
-DEPEND=""
-
-src_compile()
-{
-	econf || die
-	emake || die
-}
-
-src_install()
-{
-	einstall || die
-}
diff --git a/net-dns/libidn/libidn-0.5.11.ebuild b/net-dns/libidn/libidn-0.5.11.ebuild
deleted file mode 100644
index cb033c88db5f..000000000000
--- a/net-dns/libidn/libidn-0.5.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.11.ebuild,v 1.2 2005/01/29 17:00:10 carlo Exp $
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="http://www.gnu.org/software/libidn/"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
-}
diff --git a/net-dns/libidn/libidn-0.5.11-r1.ebuild b/net-dns/libidn/libidn-0.5.15.ebuild
index 4ae7c0b4593e..7ae5bdaf8d63 100644
--- a/net-dns/libidn/libidn-0.5.11-r1.ebuild
+++ b/net-dns/libidn/libidn-0.5.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.11-r1.ebuild,v 1.4 2005/01/29 17:00:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.15.ebuild,v 1.1 2005/04/19 14:31:25 carlo Exp $
 
 inherit java-pkg
 
@@ -11,10 +11,9 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="java doc pic nls"
+IUSE="java doc nls"
 
-DEPEND="java? ( virtual/jdk )
-	doc? ( dev-util/gtk-doc )"
+DEPEND="java? ( virtual/jdk )"
 RDEPEND="java? ( virtual/jre )"
 
 check_java_config() {
@@ -31,29 +30,26 @@ src_compile() {
 		check_java_config
 	fi
 
-	if use amd64; then
-		myconf="--with-pic"
-	else
-		myconf="`use_with pic`"
-	fi
-	econf \
-		`use_enable nls` \
-		`use_enable java` \
-		${myconf} || die "Configure failed"
+	econf $(use_enable nls) \
+	      $(use_enable java) || die
 
-	emake || die "Make failed"
+	emake || die
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+	if use doc; then
+		dohtml -r doc/reference/html/*
+	fi
 
 	if use java; then
-		java-pkg_dojar ${D}/usr/share/java/libidn-0.5.11.jar || die
+		java-pkg_dojar ${D}/usr/share/java/${P}.jar || die
 		rm -rf ${D}/usr/share/java
+
 		if use doc; then
-			dohtml -r ${S}/doc/java
+			dohtml -r doc/java
 		fi
 	fi
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
 }
diff --git a/net-dns/libidn/libidn-0.5.7.ebuild b/net-dns/libidn/libidn-0.5.7.ebuild
deleted file mode 100644
index 36d6af1648b0..000000000000
--- a/net-dns/libidn/libidn-0.5.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.7.ebuild,v 1.5 2005/01/29 17:00:10 carlo Exp $
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="http://www.gnu.org/software/libidn/"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/libidn/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
-}