Fix dependencies for users of JDK 1.6.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64

4 files changed, 22 insertions, 16 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 28aebc527c2b..24eba4842d8c 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.78 2008/06/10 21:01:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.79 2008/06/20 23:16:20 nelchael Exp $
+
+*resin-3.1.6-r2 (20 Jun 2008)
+
+  20 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.6/resin.conf,
+  -resin-3.1.6-r1.ebuild, +resin-3.1.6-r2.ebuild:
+  Fix dependencies for users of JDK 1.6.
 
 *resin-3.0.26 (10 Jun 2008)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 52e319133038..2ed721165cdf 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -5,7 +5,7 @@ AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 5
 AUX 3.0.25/resin.init 951 RMD160 c6bb819c7bd225a4a5fb570782f15d4cba9bce7e SHA1 123e2b64bc29f1ebbb5cdc65ea98be10c09cf9f8 SHA256 86d043936058453da710957d9da81644eb67f8a4e656160d6624eb9cd974db17
 AUX 3.0.26/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
 AUX 3.0.26/resin.init 951 RMD160 24577bf523d07741fc8798d96d2920798164d63d SHA1 61221c2721080f54070fd6611a3eb82d799b52c2 SHA256 c3615e7623ca6457572ca21720944aaaf719d0a64adc569f33f10175adcb5b6c
-AUX 3.1.6/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
+AUX 3.1.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 3.1.6/resin.init 885 RMD160 f1d4543ffa15db428c0e39cb339b8620ddda65ae SHA1 f3bbde79651d4511628e335fe1ff924a9ecb5c16 SHA256 abdef88060b1b7dd707ca0fac1a48cf57d887df87c44d7045dfeeff5ceac6917
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.0.26-src.zip 10762073 RMD160 767cf59c8f7b33175961b61a2132d7bec980cc75 SHA1 a1dc5607e8b0261feab544859b93f17b8a13fdf7 SHA256 e362b55b4d077a8b4277374edbcf478d34a7c1859d3b03f27f33c3b5479a230e
@@ -15,13 +15,13 @@ DIST resin-gentoo-patches-3.0.26.tar.bz2 4802 RMD160 cd22d92dff92408de2bca180cc1
 DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
 EBUILD resin-3.0.26.ebuild 4019 RMD160 30263145e7783b6cca419fc943549a20fa8e4ebd SHA1 f369d06dd59a0ba26f338c3e14b631bfc3b297a4 SHA256 46cf735b2c1be2649feb0d319432badb56a8dfdc12237c55beb0ebaaf4ce8710
-EBUILD resin-3.1.6-r1.ebuild 4183 RMD160 cc260c248f6394cd13400231a421290c17cae50a SHA1 935168798a44dff97b0149343dd1224a40dd27cc SHA256 7be8a0159cb23129c0f065848080e14587e882b5227b5653312653da286c2c77
-MISC ChangeLog 15270 RMD160 8be20a8b6b8c7ca408486ebe7fcbf716f6aa865c SHA1 133f14b9b272e4e9b904f66db2cc07c21309b509 SHA256 1b726f4069284f5871bbdab77713f06e51cad7af2ef817b6e35edfdce085cfbd
+EBUILD resin-3.1.6-r2.ebuild 4181 RMD160 07cb0b60eeb5bf0db2d16736842d9daeaf3038d4 SHA1 ce37ef6095a9059858b8dba5219e33eb957ebba0 SHA256 f43a7297928664e11ca3a27753350805010aadf43f9d90a719b200a2b544f66e
+MISC ChangeLog 15470 RMD160 65ed1ce988dbc5bb40a067b51aed12d427d04a26 SHA1 ba1f8ea58e54e6b98ee9e97533ee770bc786c8e6 SHA256 0daecf6539ec02c3bc5f1ae4743e0472e10bde5ae2b99429dd73e3d38587f525
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhRx1wACgkQ/ejvha5XGaP5eACg9GRWRx7ahrn8aU+Yy8GUlmXu
-basAoL6JVIQrKXzvW/h2UO2Fl9rJPc+I
-=gLJD
+iEYEARECAAYFAkhcOkoACgkQgo/w9rxVVVG4bwCeK+7wR75HbtS8EwQr9pNImVb+
+pc4AoMDvQJkkJ5FikGLwyQnP24iyUdaM
+=IYYY
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.1.6/resin.conf b/www-servers/resin/files/3.1.6/resin.conf
index 0895ad30fbf4..b205f671a22d 100644
--- a/www-servers/resin/files/3.1.6/resin.conf
+++ b/www-servers/resin/files/3.1.6/resin.conf
@@ -3,7 +3,7 @@
 # set using java-config.
 # See java-config(1) manual page for assistance in determining this value.
 
-# You can override this value with whatever JDK 1.5 you want.
+# You can override this value with whatever JDK you want.
 # For a list of valid values for GENTOO_VM see output of
 #   java-config -L
 #GENTOO_VM=sun-jdk-1.5
diff --git a/www-servers/resin/resin-3.1.6-r1.ebuild b/www-servers/resin/resin-3.1.6-r2.ebuild
index 22028a754521..9a69a14c5497 100644
--- a/www-servers/resin/resin-3.1.6-r1.ebuild
+++ b/www-servers/resin/resin-3.1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6-r1.ebuild,v 1.1 2008/06/09 21:49:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6-r2.ebuild,v 1.1 2008/06/20 23:16:20 nelchael Exp $
 
 EAPI="1"
 
@@ -19,17 +19,17 @@ IUSE="admin"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	>=dev-java/iso-relax-20050331
+	dev-java/iso-relax
 	dev-java/aopalliance
 	=dev-java/sun-j2ee-deployment-bin-1.1*
 	dev-java/jax-ws-api:2
 	dev-java/jaxb:2
-	>=dev-java/sun-javamail-1.4
-	>=dev-java/sun-jaf-1.1"
+	java-virtuals/javamail
+	java-virtuals/jaf"
 
-RDEPEND="=virtual/jdk-1.5*
+RDEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
-DEPEND="${RDEPEND}
+DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	dev-java/ant-core
 	dev-libs/openssl
@@ -77,8 +77,8 @@ src_compile() {
 
 	mkdir "${S}/lib"
 	cd "${S}/lib"
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from sun-javamail
+	java-pkg_jar-from --virtual jaf
+	java-pkg_jar-from --virtual javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
 	java-pkg_jar-from sun-j2ee-deployment-bin-1.1