Clean up ebuild, mark 0.5.15 stable on alpha amd64 ia64 x86, bump to 0.5.17

(Portage version: 2.0.51.22-r1)

5 files changed, 80 insertions, 20 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 3291075d483b..288b9ee9a31b 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2005/04/25 06:02:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.28 2005/06/27 02:32:18 agriffis Exp $
+
+*libidn-0.5.17 (27 Jun 2005)
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org> libidn-0.5.15.ebuild,
+  +libidn-0.5.17.ebuild:
+  Clean up ebuild, mark 0.5.15 stable on alpha amd64 ia64 x86, bump to 0.5.17
 
   25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> libidn-0.5.13.ebuild:
   Stable on alpha.
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 93502fc3d3fa..c7b10a22745f 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,10 +1,12 @@
-MD5 ac42c61b1aa970e38ad34655beab891a ChangeLog 3243
-MD5 5dbe6572032f2a6324f22b6c1bf69849 libidn-0.3.7.ebuild 636
 MD5 c33918231e4239d278a3f701319462b7 libidn-0.5.4.ebuild 543
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 314955faf6d3ea671d56d71461662cc0 libidn-0.5.15.ebuild 1339
+MD5 b7d8f9e264433f36a2f1ff1c9fad5891 libidn-0.5.17.ebuild 1247
+MD5 5dbe6572032f2a6324f22b6c1bf69849 libidn-0.3.7.ebuild 636
 MD5 8e0007d9387bbcdd935f205a6631ae60 libidn-0.5.13.ebuild 1278
+MD5 ac42c61b1aa970e38ad34655beab891a ChangeLog 3243
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 b7d8f9e264433f36a2f1ff1c9fad5891 libidn-0.5.15.ebuild 1247
 MD5 71c9d73948b2aae62f1f91b02a24904c files/digest-libidn-0.3.7 65
 MD5 34af7cf0c0c059728bc3b2870298d456 files/digest-libidn-0.5.4 65
-MD5 91804808fca23d8a14cc7a801e512b76 files/digest-libidn-0.5.15 66
 MD5 04ac8297c56ed0aa42ee97df501dda7e files/digest-libidn-0.5.13 66
+MD5 91804808fca23d8a14cc7a801e512b76 files/digest-libidn-0.5.15 66
+MD5 68549705ff201e9108e312df95a7f7c8 files/digest-libidn-0.5.17 66
diff --git a/net-dns/libidn/files/digest-libidn-0.5.17 b/net-dns/libidn/files/digest-libidn-0.5.17
new file mode 100644
index 000000000000..c13076ac2e34
--- /dev/null
+++ b/net-dns/libidn/files/digest-libidn-0.5.17
@@ -0,0 +1 @@
+MD5 cd890b571f2a27222052eac9dccb7c80 libidn-0.5.17.tar.gz 1974848
diff --git a/net-dns/libidn/libidn-0.5.15.ebuild b/net-dns/libidn/libidn-0.5.15.ebuild
index 2eb2dd56f5c7..cd487af3e750 100644
--- a/net-dns/libidn/libidn-0.5.15.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.15.ebuild,v 1.2 2005/05/24 22:51:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.5.15.ebuild,v 1.3 2005/06/27 02:32:18 agriffis Exp $
 
 inherit java-pkg
 
@@ -10,24 +10,20 @@ 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"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="java doc nls emacs"
 
 DEPEND="java? ( virtual/jdk )"
 RDEPEND="java? ( virtual/jre )"
 
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
 src_compile() {
+	local jdkhome
+
 	if use java; then
-		check_java_config
+		jdkhome=$(java-config --jdk-home)
+		if [[ -z ${jdkhome} || ! -d ${jdkhome} ]]; then
+			die "You need to use java-config to set your JVM to a JDK!"
+		fi
 	fi
 
 	econf \
@@ -39,10 +35,10 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	make install DESTDIR=${D} || die
 	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
 
-	use emacs || rm -r "${D}"/usr/share/emacs
+	use emacs || rm -r ${D}/usr/share/emacs
 
 	if use doc; then
 		dohtml -r doc/reference/html/*
diff --git a/net-dns/libidn/libidn-0.5.17.ebuild b/net-dns/libidn/libidn-0.5.17.ebuild
new file mode 100644
index 000000000000..6c47b29b5d7f
--- /dev/null
+++ b/net-dns/libidn/libidn-0.5.17.ebuild
@@ -0,0 +1,55 @@
+# 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.17.ebuild,v 1.1 2005/06/27 02:32:18 agriffis Exp $
+
+inherit java-pkg
+
+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="java doc nls emacs"
+
+DEPEND="java? ( virtual/jdk )"
+RDEPEND="java? ( virtual/jre )"
+
+src_compile() {
+	local jdkhome
+
+	if use java; then
+		jdkhome=$(java-config --jdk-home)
+		if [[ -z ${jdkhome} || ! -d ${jdkhome} ]]; then
+			die "You need to use java-config to set your JVM to a JDK!"
+		fi
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable java) \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
+
+	use emacs || rm -r ${D}/usr/share/emacs
+
+	if use doc; then
+		dohtml -r doc/reference/html/*
+	fi
+
+	if use java; then
+		java-pkg_dojar ${D}/usr/share/java/${P}.jar || die
+		rm -rf ${D}/usr/share/java
+
+		if use doc; then
+			dohtml -r doc/java
+		fi
+	fi
+}