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

Package-Manager: portage-2.0.53_rc5

13 files changed, 166 insertions, 18 deletions

diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index a2a46d181e34..f43ecfd97ac1 100644
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-modeler
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.12 2005/07/10 13:41:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.13 2005/10/15 11:42:40 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> commons-modeler-1.1.ebuild:
+  move dev-java/jmx dev-java/sun-jmx
 
   10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> commons-modeler-1.1.ebuild:
   dep fixes, add source useflag, cleanup
diff --git a/dev-java/commons-modeler/commons-modeler-1.1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1.ebuild
index cab2eb15a275..8ce38d0ee7f9 100644
--- a/dev-java/commons-modeler/commons-modeler-1.1.ebuild
+++ b/dev-java/commons-modeler/commons-modeler-1.1.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/commons-modeler/commons-modeler-1.1.ebuild,v 1.14 2005/07/10 13:42:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1.ebuild,v 1.15 2005/10/15 11:42:40 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://jakarta.apache.org/commons/modeler/"
 LICENSE="Apache-1.1"
 SLOT="0"
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/jmx-1.2.1
+	>=dev-java/sun-jmx-1.2.1
 	>=dev-java/commons-logging-1.0.3
 	>=dev-java/commons-digester-1.4.1
 	>=dev-java/xalan-2.5.1"
@@ -31,8 +31,8 @@ src_unpack() {
 	# Setup the build environment
 	echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties
 	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "jmx.jar=$(java-pkg_getjar jmx jmxri.jar)" >> build.properties
-	echo "jmxtools.jar=$(java-pkg_getjar jmx jmxtools.jar)" >> build.properties
+	echo "jmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar)" >> build.properties
+	echo "jmxtools.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" >> build.properties
 	echo "jaxp.xalan.jar=$(java-pkg_getjars xalan)" >> build.properties
 	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
 	mkdir dist
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"
diff --git a/dev-java/quartz/ChangeLog b/dev-java/quartz/ChangeLog
index 7caf1bc3a545..30b561458524 100644
--- a/dev-java/quartz/ChangeLog
+++ b/dev-java/quartz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/quartz
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.17 2005/05/21 16:56:49 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/ChangeLog,v 1.18 2005/10/15 11:41:22 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> quartz-1.4.5.ebuild:
+  move dev-java/jmx dev-java/sun-jmx
 
 *quartz-1.4.5 (21 May 2005)
 
diff --git a/dev-java/quartz/quartz-1.4.5.ebuild b/dev-java/quartz/quartz-1.4.5.ebuild
index 1fb5002bdb09..ce0cd7c19825 100644
--- a/dev-java/quartz/quartz-1.4.5.ebuild
+++ b/dev-java/quartz/quartz-1.4.5.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/quartz/quartz-1.4.5.ebuild,v 1.3 2005/09/20 17:56:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.5.ebuild,v 1.4 2005/10/15 11:41:22 axxo Exp $
 
 inherit java-pkg
 
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.4
 		dbcp? ( >=dev-java/commons-dbcp-1.1 )
 		jboss? ( >=www-servers/jboss-3.2.3 )
 		jta? ( >=dev-java/jta-1.0.1 )
-		jmx? ( >=dev-java/jmx-1.2.1 )
+		jmx? ( >=dev-java/sun-jmx-1.2.1 )
 		struts? ( =dev-java/struts-1.1* )
 		jikes? ( dev-java/jikes )"
 
diff --git a/dev-java/sun-jmx/ChangeLog b/dev-java/sun-jmx/ChangeLog
new file mode 100644
index 000000000000..3919a3ee2907
--- /dev/null
+++ b/dev-java/sun-jmx/ChangeLog
@@ -0,0 +1,65 @@
+# ChangeLog for dev-java/sun-jmx
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/ChangeLog,v 1.1 2005/10/15 11:37:31 axxo Exp $
+
+*sun-jmx-1.2.1-r1 (15 Oct 2005)
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
+  +sun-jmx-1.2.1-r1.ebuild:
+  move dev-java/jmx dev-java/sun-jmx
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jmx-1.2.1.ebuild:
+  stable on ppc, introduced support for the examples and the source useflag
+
+  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> jmx-1.2.1.ebuild:
+  Stable on sparc
+
+  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jmx-1.2.1.ebuild:
+  stable on amd64
+
+  26 Jan 2005; Markus Rothe <corsair@gentoo.org> jmx-1.2.1.ebuild:
+  Stable on ppc64
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jmx-1.2.1.ebuild:
+  added missing jikes dependency.
+
+  20 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/build.xml-jdk1.5.patch, jmx-1.2.1.ebuild:
+  Patch to allow compilation with JDK 1.5, by Petteri Räty
+  <petteri.raty@welho.com>. Fixes #74888.
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> jmx-1.2.1.ebuild:
+  added ~ppc64 to KEYWORDS
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> jmx-1.2.1.ebuild:
+  Added ~sparc keyword to fix broken deps.
+
+  03 Nov 2004; Thomas Matthijs <axxo@gentoo.org> jmx-1.2.1.ebuild:
+  depend on app-arch/unzip
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> jmx-1.2.1.ebuild:
+  keywords ~amd64; closes #67332.
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmx-1.2.1.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> jmx-1.2.1.ebuild:
+  Fixed to compile with jikes, Thanks too Dan <dan@intuitivelyobvious.net> for
+  the fix, closes #65978
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> jmx-1.2.1.ebuild:
+  Added to ~ppc.
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> jmx-1.2.1.ebuild:
+  Stable on x86. Fixes according to #45398
+
+*jmx-1.2.1 (27 Feb 2004)
+
+  27 Feb 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml:
+  Initial Import.
+  Thanks to Greg Bowyer <bg115@gre.ac.uk> for the initial ebuild. Closes #37927
+
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
new file mode 100644
index 000000000000..2328b19c8813
--- /dev/null
+++ b/dev-java/sun-jmx/Manifest
@@ -0,0 +1,6 @@
+MD5 0fefaa284830791e6ff9968a1819aa96 ChangeLog 2163
+MD5 b075599e4253703c34d53059f8a7f587 files/digest-sun-jmx-1.2.1 64
+MD5 b075599e4253703c34d53059f8a7f587 files/digest-sun-jmx-1.2.1-r1 64
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 14eaca17eeb4a9b6a9e7b0b934b3e0c3 sun-jmx-1.2.1-r1.ebuild 1688
+MD5 14eaca17eeb4a9b6a9e7b0b934b3e0c3 sun-jmx-1.2.1.ebuild 1688
diff --git a/dev-java/sun-jmx/files/digest-sun-jmx-1.2.1-r1 b/dev-java/sun-jmx/files/digest-sun-jmx-1.2.1-r1
new file mode 100644
index 000000000000..b767ef1b2233
--- /dev/null
+++ b/dev-java/sun-jmx/files/digest-sun-jmx-1.2.1-r1
@@ -0,0 +1 @@
+MD5 de1a800156998f4ef98bcdef4421f312 jmx-1_2_1-scsl.zip 2177550
diff --git a/dev-java/sun-jmx/metadata.xml b/dev-java/sun-jmx/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/dev-java/sun-jmx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r1.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..425d7ad5f147
--- /dev/null
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/sun-jmx-1.2.1-r1.ebuild,v 1.1 2005/10/15 11:37:31 axxo Exp $
+
+inherit java-pkg eutils
+
+MY_PN=${PN//sun-/}
+MY_P=${MY_PN}-${PV//./_}
+DESCRIPTION="Java Management Extensions for managing and monitoring devices, applications, and services."
+HOMEPAGE="http://java.sun.com/products/JavaManagement/index.jsp"
+SRC_URI="${MY_P}-scsl.zip"
+LICENSE="sun-csl"
+SLOT="0"
+KEYWORDS="x86 ppc amd64 sparc ppc64"
+IUSE="doc examples jikes source"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	app-arch/unzip
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+RESTRICT="fetch"
+
+S="${WORKDIR}/${MY_P}-src"
+
+DOWNLOADSITE="http://wwws.sun.com/software/communitysource/jmx/download.html"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i.orig -r -e 's/="src"/="src\/jmxri"/g' build.xml || die "sed failed"
+}
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${DOWNLOADSITE} and follow instructions"
+	einfo " 2. Download ${SRC_URI}"
+	einfo " 3. Move file to ${DISTDIR}"
+	einfo " 4. Run emerge on this package again to complete"
+	einfo
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} examples"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+	use doc && java-pkg_dohtml -r docs/*
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r examples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/jmxri/*
+}