Works with virtual/jdk-1.4 again, doesn't install a versioned jar and installs javado...

Package-Manager: portage-2.1.2.4

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 762a64f255a9f54a36e86c6d297ed703a8298c3f..ced9a7da2e87f085e3d2155fc9dadcac7cdcb9ff 100644 (file)
--- 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/Manifest b/net-dns/libidn/Manifest
index 3faff8f1a741b1448dc8ebfc6907b9e456a1e3fc..5c8ef66bd28d8c7866237747263a827d6d1213c4 100644 (file)
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.6.9-javacflags.patch 613 RMD160 689aa4960422c72c5d906006fe8c3ef1a5e49d61 SHA1 d3e1807c01ed750ed5951e0e56d0aa59e2b38cda SHA256 fc71933575bd0f5b241949a47b9f156a412c68986da3b600dca2a4a4ad9928a1
+MD5 d2bfb0c91acabe0be549e62cf766b2ad files/0.6.9-javacflags.patch 613
+RMD160 689aa4960422c72c5d906006fe8c3ef1a5e49d61 files/0.6.9-javacflags.patch 613
+SHA256 fc71933575bd0f5b241949a47b9f156a412c68986da3b600dca2a4a4ad9928a1 files/0.6.9-javacflags.patch 613
 DIST libidn-0.5.15.tar.gz 1971879 RMD160 f8cc7cce3dd4e51033fa82c12e44d0fec6df658d SHA1 9f105d8595debde8c1457c7db4f98b9c6b078c61 SHA256 c76fd2b521d8e514107a2c357c5842affe064d6addb330fbbd64bb00349d86d2
 DIST libidn-0.6.5.tar.gz 2128103 RMD160 9e63b79a5febbde8fd5078de931afed6d1b33cf4 SHA1 3742d1d58bd462adb401a3c6fb3153e523f9540c SHA256 a8642d70069c25a65b8b6e9d3cb20ecb44f457e5af8ca0b83b96aec63ce61114
 DIST libidn-0.6.9.tar.gz 2193905 RMD160 bbf5507b33c1ae57c4b12ec60ac2ea546c3ddc8c SHA1 cad26486e7e4bfdf43ed40a2a6d5dd85585115b6 SHA256 f6e9baf9b5cfdab60a67d0c853198a6a528e778bc5283cef45fc4c131a2ba335
@@ -12,14 +16,18 @@ EBUILD libidn-0.6.5-r1.ebuild 1337 RMD160 4937813b6742e81cb488d6eac2bad667d4d1a0
 MD5 a4a87657b44502a4c769b630a617687e libidn-0.6.5-r1.ebuild 1337
 RMD160 4937813b6742e81cb488d6eac2bad667d4d1a06c libidn-0.6.5-r1.ebuild 1337
 SHA256 f331978f39e15461ccbdb9fb988a30b1ffe5f0361925aa75643b85cee66753c7 libidn-0.6.5-r1.ebuild 1337
+EBUILD libidn-0.6.9-r1.ebuild 1418 RMD160 64a19c500dfb4cd9ad5b9257051aa017ce7afd4b SHA1 5b4d4762f3105b03352181ea7a1a7096379ed6fb SHA256 de6ceb4f401a1ecb8e266bee80d6c70553a0c14fef34680490e31eeb0c561d41
+MD5 5c86cd2e40e45befcbd6d5d096c5e45f libidn-0.6.9-r1.ebuild 1418
+RMD160 64a19c500dfb4cd9ad5b9257051aa017ce7afd4b libidn-0.6.9-r1.ebuild 1418
+SHA256 de6ceb4f401a1ecb8e266bee80d6c70553a0c14fef34680490e31eeb0c561d41 libidn-0.6.9-r1.ebuild 1418
 EBUILD libidn-0.6.9.ebuild 1345 RMD160 6a0fdbfd3c49fe57c76361c924d5d07c8cc7b2eb SHA1 629572cc048451f04b7dbb152099f0771fa937e4 SHA256 e02ff58ec792e5107714754c4443a7336b4be52ad8271138ae1858137c3ebfe7
 MD5 d8cbaea036ffb511dc43ebc9bb673649 libidn-0.6.9.ebuild 1345
 RMD160 6a0fdbfd3c49fe57c76361c924d5d07c8cc7b2eb libidn-0.6.9.ebuild 1345
 SHA256 e02ff58ec792e5107714754c4443a7336b4be52ad8271138ae1858137c3ebfe7 libidn-0.6.9.ebuild 1345
-MISC ChangeLog 7010 RMD160 7c62ae1c59d59b3d15c3a12bdfdf323adaea5cc8 SHA1 8befd3b83c30b190f15961aea8fb63cbd509828b SHA256 68d80cd73a77d2ffc31551981e2cb22780c18d68b22e327017dc77426cfc4b0c
-MD5 232b031e4d42ad3dc6ed49e98a91ab4f ChangeLog 7010
-RMD160 7c62ae1c59d59b3d15c3a12bdfdf323adaea5cc8 ChangeLog 7010
-SHA256 68d80cd73a77d2ffc31551981e2cb22780c18d68b22e327017dc77426cfc4b0c ChangeLog 7010
+MISC ChangeLog 7272 RMD160 a58c719d21686f2d6a6127d0ed201a2524a3cdd0 SHA1 ea82a22161aeceaab7b6e539091e5a21da3c90fa SHA256 e25e40519db1bb4a4e79613cc2e72620c4347fc2b0a564b8310656989423e7a2
+MD5 9d8bdc729c3e43dd850e00c084a18a43 ChangeLog 7272
+RMD160 a58c719d21686f2d6a6127d0ed201a2524a3cdd0 ChangeLog 7272
+SHA256 e25e40519db1bb4a4e79613cc2e72620c4347fc2b0a564b8310656989423e7a2 ChangeLog 7272
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -33,10 +41,13 @@ SHA256 170873bc00e236487938fabb611c5f1c820eddcf801b33fd8bcdd147b4da96db files/di
 MD5 0f22f0272cf4b72bf24a440f906141b4 files/digest-libidn-0.6.9 241
 RMD160 41c5877073fa1d017f55e168a4184e2987c4d2a1 files/digest-libidn-0.6.9 241
 SHA256 d8282dacbc6cd505526e2a72ef38eb69418964c7600b05eb2a2bdd1f3b1bdc6c files/digest-libidn-0.6.9 241
+MD5 0f22f0272cf4b72bf24a440f906141b4 files/digest-libidn-0.6.9-r1 241
+RMD160 41c5877073fa1d017f55e168a4184e2987c4d2a1 files/digest-libidn-0.6.9-r1 241
+SHA256 d8282dacbc6cd505526e2a72ef38eb69418964c7600b05eb2a2bdd1f3b1bdc6c files/digest-libidn-0.6.9-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLjJqcxLzpIGCsLQRAvMvAJ0f71bP5xaCuKHtLQE5Uog8m5tW0ACfSvgB
-bBRgnGRq1YpGEPmE0QvcitM=
-=npyh
+iD8DBQFGLj17cxLzpIGCsLQRAt2KAJ9zPz2hNaKPROp13oL4iYUM4egXtwCfeO1O
+zL8Atp38qbP/9Fa4r2LbufY=
+=P3Dk
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..d1ac263
--- /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 (file)
index 0000000..f239619
--- /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 (file)
index 0000000..a689311
--- /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
+}