Restore virtual/jdk deps.

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index f0df683fae03b7c6a61d0987c0d0f18b4ca4b534..0164c426ba37af2d1bc48406477a0cfd5b26eaeb 100644 (file)
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.147 2011/11/27 23:29:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.148 2011/11/28 07:54:37 jer Exp $
+
+  28 Nov 2011; Jeroen Roovers <jer@gentoo.org> libidn-1.22-r1.ebuild,
+  libidn-1.23.ebuild:
+  Restore virtual/jdk deps.
 
 *libidn-1.23 (27 Nov 2011)
 

diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index b16cba430f140dca0aea34f5adf506c7093f54b5..0673a2676e8a66650d0b107948ed423e535a667f 100644 (file)
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 AUX 50libidn-gentoo.el 455 RMD160 68a84a8b9aa9ff2b7c6e6b266e2545d2bbb243f2 SHA1 6c986493a8790b67d47444d64ec56b867f644513 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937
 DIST libidn-1.22.tar.gz 3356444 RMD160 46773bd6192faaeef52c88b6aa8d2e3242f2cdd8 SHA1 8358e897c24d534438f6b5694c25e85889d860c3 SHA256 2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed
 DIST libidn-1.23.tar.gz 3477618 RMD160 22922f29abe5045f4cb1c30d3b3f75950e5b8b1c SHA1 98b00aeb8240a7a6e02f338edd6ef08adbc31a34 SHA256 25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a
-EBUILD libidn-1.22-r1.ebuild 2088 RMD160 cb923fbb1667fe4ba26f529e4881758d09108836 SHA1 073709ceaf13b9d662556da2f47fc3f724bdb75f SHA256 b119508653b25a25b7a5c9d8cce055bd8ebeabea54379a713e150d9229034e94
+EBUILD libidn-1.22-r1.ebuild 2094 RMD160 00d4f14c9fa61822f69bd8d556d7207c2c07d029 SHA1 4410be3d38cbe1aeff6437c9221a519fce5164b6 SHA256 099de6d0360a9afbe850b722d32f351fd7c559109ffba1a2444802cf1f9ea2f2
 EBUILD libidn-1.22.ebuild 2059 RMD160 d96e1513ba032a8982bc328d40ee6465180f014f SHA1 c96e9310e1dc28bce57c3c0565d93303e37d331a SHA256 dbd9712e05ea407e74fbfddeca07f4cd281394317a81f0ae18d0d09998953d53
-EBUILD libidn-1.23.ebuild 2085 RMD160 877a6d8b952ebacb4a18aa2db27529806a6110eb SHA1 a2bf5ad5710ba06aca7e21ee1e720d459af2feca SHA256 9f526778518c01070248a0663f82c89ffcece60b0d47c7e03a70c64bfb5ef4c7
-MISC ChangeLog 17987 RMD160 efe03ed72c96ef11ab687fd3882361d5524483da SHA1 4be3cdef5252ba3fa50eb9a593a0b7b1ec2b3fef SHA256 651b705372d718e376eadcd5b60c2c4b1ce132530cb4182761c1409b5cd15b94
+EBUILD libidn-1.23.ebuild 2091 RMD160 d6057efc6ef74ae28976c126245688f652cae04a SHA1 dbc48490dda9e573539e1753da6db42f6d0b22d5 SHA256 9cf4c44253e5f0d17dd1c2a53d0772fc933e4576757aee75e0d5818df0689880
+MISC ChangeLog 18108 RMD160 5ec71b11e31faaaec55ac9cb1f3b02aeafbf553a SHA1 5db46d316c136018d782ff06c6188efeec7f557f SHA256 8844c7b56437f40bb33c1b4f0c1acff5e0be51a03db6f021382ed0f8e6fbf2ca
 MISC metadata.xml 230 RMD160 f4eaafe69d80938604be6213ca2529b73ced7a53 SHA1 27d0d9e737236700ad6d266c9a2fc8869f427869 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7Sx+MACgkQVWmRsqeSphPlxACfRtUYjwtI5Q4F9CI0BuX0Qlxw
-eZoAnjCN7yaj2o4w8tZEVzgBid/z1tDg
-=7Ug2
+iEYEARECAAYFAk7TPkkACgkQVWmRsqeSphMSNgCdF1TDnvc/XN5BQ/THtKyEy50H
+IisAn2s2zsHXYN9L7UpVs8eK7IewRdpS
+=g6lk
 -----END PGP SIGNATURE-----

diff --git a/net-dns/libidn/libidn-1.22-r1.ebuild b/net-dns/libidn/libidn-1.22-r1.ebuild
index d1d6a00a8790b792793523b41f3e90a8f566aad6..2dbaf2c2e385332b5cbb10600440b000c3a30c0a 100644 (file)
--- a/net-dns/libidn/libidn-1.22-r1.ebuild
+++ b/net-dns/libidn/libidn-1.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22-r1.ebuild,v 1.2 2011/11/27 23:29:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22-r1.ebuild,v 1.3 2011/11/28 07:54:37 jer Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="emacs? ( virtual/emacs )
 DEPEND="${COMMON_DEPEND}
        nls? ( >=sys-devel/gettext-0.17 )
        java? (
-               virtual/jdk
+               >=virtual/jdk-1.4
                doc? ( dev-java/gjdoc )
        )"
 RDEPEND="${COMMON_DEPEND}

diff --git a/net-dns/libidn/libidn-1.23.ebuild b/net-dns/libidn/libidn-1.23.ebuild
index 9109358374b3c99c67b809bf14e22dccbfc9f75a..c7c6a24745193437371b19c6e92be33fb287b4c7 100644 (file)
--- a/net-dns/libidn/libidn-1.23.ebuild
+++ b/net-dns/libidn/libidn-1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.23.ebuild,v 1.1 2011/11/27 23:29:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.23.ebuild,v 1.2 2011/11/28 07:54:37 jer Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="emacs? ( virtual/emacs )
 DEPEND="${COMMON_DEPEND}
        nls? ( >=sys-devel/gettext-0.17 )
        java? (
-               virtual/jdk
+               >=virtual/jdk-1.4
                doc? ( dev-java/gjdoc )
        )"
 RDEPEND="${COMMON_DEPEND}