[gentoo-java] java-vm-2.eclass dependancies

[gentoo-java] java-vm-2.eclass dependancies

[Jon Severinsson]

[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dear Gentoo/Java team

I recently noticed that sun-jdk-1.5 RDEPEND on =java-config-1.3*, which
I found quite odd, considering that jdk-1.5 isn't compatible with
java-config-1.

Digging a bit deeper I found that the problem is in java-vm-2.eclass,
witch doesn't consider JAVA_SUPPORTS_GENERATION_1 when it defines DEPEND
and RDEPEND. (It does in the rest of the eclass).

With the attached patch it does, and the end result works just fine on
both mixed generation systems, and generation 2 only systems, in the
first case with both java-config-1 and java-config-2, and the second
with only java-config-2.

Please consider adding it to the tree (so I don't have to do it myself
after every emerge --sync on my "pure" java 1.5 / generation 2 system).

Regards
- - Jonno

P.S. To get a pure java 1.5 / generation 2 system you'll have to get
creative in packages.keywords, but it is certainly possible. I'm
currently doing it on one system, where HD space is at a premium, and
two VM is overkill just to run tomcat. While java-config-1 isn't exactly
a space killer, it's the principle of the thing. After working hard on
getting rid of generation-1 I still can't get rid of this last piece.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFi/bhOOpxqcksWu4RAjfAAJ9TfPdFsp9GxfpJE3PkZ3aTsZqbpwCfSY7I
OB1Ht9ab3mFOMbfpzFckHMg=
=bp9l
-----END PGP SIGNATURE-----

[-- Attachment #2: java-vm-2.diff --]
[-- Type: text/plain, Size: 697 bytes --]

--- /usr/portage/eclass/java-vm-2.eclass	2006-11-11 01:39:17.000000000 +0100
+++ java-vm-2.eclass	2006-12-10 07:14:14.000000000 +0100
@@ -14,12 +14,21 @@
 
 inherit eutils fdo-mime
 
-DEPEND="
-	=dev-java/java-config-2.0*
-	>=sys-apps/portage-2.1"
-RDEPEND="
-	=dev-java/java-config-2.0*
-	=dev-java/java-config-1.3*"
+if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' ]]; then
+	DEPEND="
+		=dev-java/java-config-1.3*
+		=dev-java/java-config-2.0*
+		>=sys-apps/portage-2.1"
+	RDEPEND="
+		=dev-java/java-config-1.3*
+		=dev-java/java-config-2.0*"
+else
+	DEPEND="
+		=dev-java/java-config-2.0*
+		>=sys-apps/portage-2.1"
+	RDEPEND="
+		=dev-java/java-config-2.0*"
+fi
 
 export WANT_JAVA_CONFIG=2
 

Re: [gentoo-java] java-vm-2.eclass dependancies

[Petteri Räty]

[-- Attachment #1.1: Type: text/plain, Size: 1402 bytes --]



Jon Severinsson kirjoitti:
> Dear Gentoo/Java team
> 
> I recently noticed that sun-jdk-1.5 RDEPEND on =java-config-1.3*, which
> I found quite odd, considering that jdk-1.5 isn't compatible with
> java-config-1.
> 
> Digging a bit deeper I found that the problem is in java-vm-2.eclass,
> witch doesn't consider JAVA_SUPPORTS_GENERATION_1 when it defines DEPEND
> and RDEPEND. (It does in the rest of the eclass).
> 
> With the attached patch it does, and the end result works just fine on
> both mixed generation systems, and generation 2 only systems, in the
> first case with both java-config-1 and java-config-2, and the second
> with only java-config-2.
> 
> Please consider adding it to the tree (so I don't have to do it myself
> after every emerge --sync on my "pure" java 1.5 / generation 2 system).
> 
> Regards
> - Jonno
> 
> P.S. To get a pure java 1.5 / generation 2 system you'll have to get
> creative in packages.keywords, but it is certainly possible. I'm
> currently doing it on one system, where HD space is at a premium, and
> two VM is overkill just to run tomcat. While java-config-1 isn't exactly
> a space killer, it's the principle of the thing. After working hard on
> getting rid of generation-1 I still can't get rid of this last piece.

Attached patch is a bit cleaner. Yeah, I think we can add something like
this.

Regards,
Petteri

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: java-vm-2-deps.patch --]
[-- Type: text/x-patch; name="java-vm-2-deps.patch", Size: 650 bytes --]

Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.16
diff -u -r1.16 java-vm-2.eclass
--- java-vm-2.eclass	11 Nov 2006 00:13:22 -0000	1.16
+++ java-vm-2.eclass	22 Dec 2006 15:35:15 -0000
@@ -18,8 +18,11 @@
 	=dev-java/java-config-2.0*
 	>=sys-apps/portage-2.1"
 RDEPEND="
-	=dev-java/java-config-2.0*
-	=dev-java/java-config-1.3*"
+	=dev-java/java-config-2.0*"
+
+if [[ "${JAVA_SUPPORTS_GENERATION_1}" == 'true' ]]; then
+	RDEPEND="${RDEPEND} =dev-java/java-config-1.3*"
+fi
 
 export WANT_JAVA_CONFIG=2
 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Re: [gentoo-java] java-vm-2.eclass dependancies

[Vlastimil Babka]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Petteri Räty wrote:
> Attached patch is a bit cleaner. Yeah, I think we can add something like
> this.

I have a feeling that something like this was already done, and
java-config-1.3* had jdk-1.4* in PDEPEND. But then it was removed for
some reason, maybe nichoj remembers better?

- --
Vlastimil Babka (Caster)
Gentoo/Java
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFjHMVtbrAj05h3oQRAmoAAJ9oL/WNgIhBUVnthbmZBAhkS0s86gCffnjY
gFJLjjydZhbjN3a+7CX2PB8=
=qrlw
-----END PGP SIGNATURE-----
-- 
gentoo-java@gentoo.org mailing list