move dev-java/jmx dev-java/sun-jmx

(Portage version: 2.0.53_rc5)

4 files changed, 14 insertions, 10 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index f92ec162e173..0143abebec61 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.34 2005/09/08 23:45:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.35 2005/10/15 11:41:45 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> log4j-1.2.9.ebuild,
+  log4j-1.2.11.ebuild, log4j-1.2.12.ebuild:
+  move dev-java/jmx dev-java/sun-jmx
 
 *log4j-1.2.12 (08 Sep 2005)
 
diff --git a/dev-java/log4j/log4j-1.2.11.ebuild b/dev-java/log4j/log4j-1.2.11.ebuild
index a1285e3c310e..31869e1a6872 100644
--- a/dev-java/log4j/log4j-1.2.11.ebuild
+++ b/dev-java/log4j/log4j-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.11.ebuild,v 1.2 2005/08/20 11:59:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.11.ebuild,v 1.3 2005/10/15 11:41:45 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ IUSE="doc javamail jikes jms jmx source"
 
 RDEPEND=">=virtual/jre-1.4
 	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
-	jmx? ( dev-java/jmx )
+	jmx? ( dev-java/sun-jmx )
 	jms? ( =dev-java/openjms-bin-0.7.6 )"
 
 # We should get log4j working with openjms but at the moment that would bring
@@ -38,7 +38,7 @@ src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)"
-	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar jmx jmxtools.jar)"
+	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
 	#use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
 	use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
 	ant ${antflags} || die "compilation error"
diff --git a/dev-java/log4j/log4j-1.2.12.ebuild b/dev-java/log4j/log4j-1.2.12.ebuild
index 2d4d65ebdc0b..32b27f6739f8 100644
--- a/dev-java/log4j/log4j-1.2.12.ebuild
+++ b/dev-java/log4j/log4j-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.1 2005/09/08 23:45:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.2 2005/10/15 11:41:45 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ IUSE="doc javamail jikes jms jmx source"
 
 RDEPEND=">=virtual/jre-1.4
 	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
-	jmx? ( dev-java/jmx )
+	jmx? ( dev-java/sun-jmx )
 	jms? ( =dev-java/openjms-bin-0.7.6 )"
 
 # We should get log4j working with openjms but at the moment that would bring
@@ -38,7 +38,7 @@ src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)"
-	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar jmx jmxtools.jar)"
+	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
 	#use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
 	use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
 	ant ${antflags} || die "compilation error"
diff --git a/dev-java/log4j/log4j-1.2.9.ebuild b/dev-java/log4j/log4j-1.2.9.ebuild
index 1dae447f297e..3d9b7b32f37e 100644
--- a/dev-java/log4j/log4j-1.2.9.ebuild
+++ b/dev-java/log4j/log4j-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.12 2005/07/15 10:00:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.13 2005/10/15 11:41:45 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ IUSE="doc javamail jikes jms jmx source"
 
 RDEPEND=">=virtual/jre-1.4
 	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
-	jmx? ( dev-java/jmx )
+	jmx? ( dev-java/sun-jmx )
 	jms? ( =dev-java/openjms-bin-0.7.6 )"
 	#jms? ( =dev-java/openjms-0.7.6 )"
 DEPEND=">=virtual/jdk-1.4
@@ -35,7 +35,7 @@ src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin activation.jar)"
-	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar jmx jmxtools.jar)"
+	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
 	#use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
 	use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
 	ant ${antflags} || die "compilation error"