Don't depend on JDK if all that's needed is a JRE.

Remove old.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/java-virtuals/jmx/ChangeLog b/java-virtuals/jmx/ChangeLog
index d44751081be3c7fecd1989d532abe737cd6e5294..2256e97833bf75c196cf76fae6a8ad40edb41f90 100644 (file)
--- a/java-virtuals/jmx/ChangeLog
+++ b/java-virtuals/jmx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for java-virtuals/jmx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/ChangeLog,v 1.12 2012/01/01 18:57:56 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/ChangeLog,v 1.13 2012/01/13 11:21:51 sera Exp $
+
+*jmx-1.0-r3 (13 Jan 2012)
+
+  13 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -jmx-1.0.ebuild,
+  -jmx-1.0-r2.ebuild, +jmx-1.0-r3.ebuild:
+  Don't depend on JDK if all that's needed is a JRE.
+  Remove old.
 
   01 Jan 2012; Ralph Sennhauser <sera@gentoo.org> jmx-1.0.ebuild,
   jmx-1.0-r1.ebuild, jmx-1.0-r2.ebuild:

diff --git a/java-virtuals/jmx/Manifest b/java-virtuals/jmx/Manifest
index bc25ca05b9d610dfcff1e4f4ea2a6aae82c3d81a..6efe16b5526b397966666c74ded2ccc793ec330a 100644 (file)
--- a/java-virtuals/jmx/Manifest
+++ b/java-virtuals/jmx/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 EBUILD jmx-1.0-r1.ebuild 695 RMD160 50e6cfad8d4d3c0971cef22ea2fe209f8b100a95 SHA1 26a3ef89fc9de714921be363d63d799c75c29e45 SHA256 37ebd4a5e72ac50b53e5ba21151a2c31605f64938108f8c7e69c31a878cb377c
-EBUILD jmx-1.0-r2.ebuild 735 RMD160 a579b422deb24a40a2aebf692413bc198a7d2c2c SHA1 0d923696b2040ae27cb8ed6861dd1b54db1ee3f3 SHA256 e08f0f9344e70e7b404f0dfe42c60a3025b2a1e861b8b90428fa94bba2f2e8a5
-EBUILD jmx-1.0.ebuild 770 RMD160 7abf9a1ca74e529b7a1dc332aba3fb6f7b206a7d SHA1 37328b3f9ad74be690234acb7a6c65750eb5a261 SHA256 27db17b68c87117fcee21dbb3d0fcc8cebecb6d908a3740355e203d4e9c46cda
-MISC ChangeLog 1541 RMD160 0021198b302879c69627de63e80394bd4ebf77e9 SHA1 5cbe686148f33717625ab6f1523afeea14d3b015 SHA256 fd5061b5de58c5f07f23a19eb1cf2d1d54df8b4d80f11d77709fa5e6040215ed
+EBUILD jmx-1.0-r3.ebuild 725 RMD160 b39bb8d39c37bbdf4eb51686c0af4e8180d2d274 SHA1 76eefe0b1abfc2510176eb424f40c1962e47a89f SHA256 02f05334d2d00d4be85743f3f1d0389a894f51632acdba77b4cb943013fdc11e
+MISC ChangeLog 1745 RMD160 b65b8a13c4f4e377a8020f19f462b9b9c2470fe2 SHA1 a0c548721e65b69c868e8724fcac93afc412b747 SHA256 4a698a19153472b0d06727db3426a5a082b38db74d44a74d11a50506c1174b72
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPAKzFAAoJEIUJ+svaV16332kIAIEN2v5bkAB+22DAwfpP9vvr
-HAvneU8bch0rvaxXFsk1b6/Hv9df032KYs/Dj8nQk1UB02dlVuc8eEzvytrG5lf9
-i0BDA66agr+t8bDBIxUXAOgp4j/baquo7P+KULFIyzi+Gy5Bm4WtoMqeGz3iZ3NI
-bSMzZv+pr6mLN1pvRq7Shmhx11Y2P9dWjrK7VOCkaduwGsa8mJEBPEDl8EPYUXur
-a4YKC1pCJcSwV2QqGwGDApqdM0UHlNn4g6MU7MOMA9eXS1g03QdEQN1cuuLZzdzl
-J+EymUr0Vh1Mldn1v8d7+X/1rNNTV+SHbSlWTe/EA3gSb/5xM7KPM99Yn9jAmgo=
-=yaJb
+iQEcBAEBAgAGBQJPEBPqAAoJEIUJ+svaV163AYEIAKun2KD0Wxk7ireoYi2vIPit
+xfABpCIXaJRjpLC6UwBXbnYxcV6pXNBCbLfcVOJPOl9HvpWNUkYv5r93MXSt2YKq
+0jcHcGdqGJnw6UvuagOpqyLCVdTPVQmSUYGpztQnUwc+Wb4n4Uxz8ITeBHJs6jV6
+cnle1f+BQfyBcRSulcZ2xRd6hXjH++4jYOo3p7sAtYOnaW7WDyCms4NSUDdvHld4
+t+Ww7H3AOHYaSWfvv6gNW2EprlW6VlCTRHr6VQ7YlaedxT5D82ImfH2Fi1p3TTbH
+dS7uWDtBqNkzIx/6eGj7PKApZpGXp2plGn3QRGgLWYxxW7F8i8k24LzucEwaG2U=
+=cCbh
 -----END PGP SIGNATURE-----

diff --git a/java-virtuals/jmx/jmx-1.0-r2.ebuild b/java-virtuals/jmx/jmx-1.0-r3.ebuild
similarity index 75%
rename from java-virtuals/jmx/jmx-1.0-r2.ebuild
rename to java-virtuals/jmx/jmx-1.0-r3.ebuild
index 1bad2f9ce0446e30d98c39063d30a8c94fbc9bfb..fa1d9f8b38f8be8a4ae0bf66bd454f466723b9ad 100644 (file)
--- a/java-virtuals/jmx/jmx-1.0-r2.ebuild
+++ b/java-virtuals/jmx/jmx-1.0-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/jmx-1.0-r2.ebuild,v 1.2 2012/01/01 18:57:56 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/jmx-1.0-r3.ebuild,v 1.1 2012/01/13 11:21:51 sera Exp $
 
-EAPI=1
+EAPI=4
 
 inherit java-virtuals-2
 
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-DEPEND=""
 RDEPEND="|| (
-                       virtual/jdk:1.7
-                       virtual/jdk:1.6
-                       virtual/jdk:1.5
+                       virtual/jre:1.7
+                       virtual/jre:1.6
+                       virtual/jre:1.5
                        dev-java/sun-jmx:0
                )
                >=dev-java/java-config-2.1.8

diff --git a/java-virtuals/jmx/jmx-1.0.ebuild b/java-virtuals/jmx/jmx-1.0.ebuild
deleted file mode 100644 (file)
index fec6284..0000000
--- a/java-virtuals/jmx/jmx-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jmx/jmx-1.0.ebuild,v 1.6 2012/01/01 18:57:56 sera Exp $
-
-EAPI=1
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Java Management Extensions (JMX)"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-                       virtual/jdk:1.6
-                       virtual/jdk:1.5
-                       dev-java/sun-jmx:0
-               )
-               >=dev-java/java-config-2.1.6
-               "
-
-JAVA_VIRTUAL_PROVIDES="sun-jmx"
-JAVA_VIRTUAL_VM="sun-jdk-1.6 ibm-jdk-bin-1.6 sun-jdk-1.5 ibm-jdk-bin-1.5"
-JAVA_VIRTUAL_VM+=" jrockit-jdk-bin-1.5 diablo-jdk-1.5"