Works with virtual/jdk-1.4 again, doesn't install a versioned jar and installs javadocs using java-pkg_dojavadoc.

(Portage version: 2.1.2.4)

4 files changed, 86 insertions, 1 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 762a64f255a9..ced9a7da2e87 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/libidn
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.57 2007/04/24 16:37:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.58 2007/04/24 17:25:12 betelgeuse Exp $
+
+*libidn-0.6.9-r1 (24 Apr 2007)
+
+  24 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.6.9-javacflags.patch, +libidn-0.6.9-r1.ebuild:
+  Works with virtual/jdk-1.4 again, doesn't install a versioned jar and
+  installs javadocs using java-pkg_dojavadoc.
 
   24 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> -libidn-0.5.4.ebuild,
   -libidn-0.5.20.ebuild, -libidn-0.6.1.ebuild, -libidn-0.6.5.ebuild:
diff --git a/net-dns/libidn/files/0.6.9-javacflags.patch b/net-dns/libidn/files/0.6.9-javacflags.patch
new file mode 100644
index 000000000000..d1ac263c17c8
--- /dev/null
+++ b/net-dns/libidn/files/0.6.9-javacflags.patch
@@ -0,0 +1,12 @@
+diff -ur java.old/misc/Makefile.am java/misc/Makefile.am
+--- java.old/misc/Makefile.am	2007-04-24 19:59:49.000000000 +0300
++++ java/misc/Makefile.am	2007-04-24 20:00:02.000000000 +0300
+@@ -18,7 +18,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ 
+ JAVAROOT = $(top_builddir)/java/misc
+-JAVACFLAGS = -classpath $(top_builddir)/java/libidn-@VERSION@.jar:$(top_srcdir)/java/libidn-@VERSION@.jar
++AM_JAVACFLAGS = -classpath $(top_builddir)/java/libidn-@VERSION@.jar:$(top_srcdir)/java/libidn-@VERSION@.jar
+ 
+ if JAVA
+ dist_noinst_JAVA = GenerateRFC3454.java GenerateNFKC.java	\
diff --git a/net-dns/libidn/files/digest-libidn-0.6.9-r1 b/net-dns/libidn/files/digest-libidn-0.6.9-r1
new file mode 100644
index 000000000000..f23961947108
--- /dev/null
+++ b/net-dns/libidn/files/digest-libidn-0.6.9-r1
@@ -0,0 +1,3 @@
+MD5 616135837f5aaa9fac752e6b54221fb3 libidn-0.6.9.tar.gz 2193905
+RMD160 bbf5507b33c1ae57c4b12ec60ac2ea546c3ddc8c libidn-0.6.9.tar.gz 2193905
+SHA256 f6e9baf9b5cfdab60a67d0c853198a6a528e778bc5283cef45fc4c131a2ba335 libidn-0.6.9.tar.gz 2193905
diff --git a/net-dns/libidn/libidn-0.6.9-r1.ebuild b/net-dns/libidn/libidn-0.6.9-r1.ebuild
new file mode 100644
index 000000000000..a689311d355c
--- /dev/null
+++ b/net-dns/libidn/libidn-0.6.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-0.6.9-r1.ebuild,v 1.1 2007/04/24 17:25:12 betelgeuse Exp $
+
+inherit java-pkg-opt-2 mono autotools
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="java doc emacs mono nls"
+
+DEPEND="java? ( >=virtual/jdk-1.4
+				dev-java/gjdoc
+				mono? ( >=dev-lang/mono-0.95 )
+		)"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+		mono? ( >=dev-lang/mono-0.95 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/0.6.9-javacflags.patch"
+	elibtoolize
+	eautomake
+}
+
+src_compile() {
+	local myconf=" --disable-csharp"
+
+	use mono && myconf="--enable-csharp=mono"
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable java) \
+		${myconf} \
+		|| 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_newjar ${D}/usr/share/java/${P}.jar || die
+		rm -rf ${D}/usr/share/java
+
+		if use doc; then
+			java-pkg_dojavadoc doc/java
+		fi
+	fi
+}