Changes: - Migrated to use the new split mx4j - Made commons-digester dependency optional and working - Removed unused dependencies - Added src_test - dropped amd64 until mx4j-core is keyworded there

(Portage version: 2.1.2_rc2-r3)

4 files changed, 95 insertions, 1 deletions

diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index 07162c589f3e..f775cd397be3 100644
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/commons-modeler
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.16 2006/12/01 16:09:26 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.17 2006/12/07 20:40:38 betelgeuse Exp $
+
+*commons-modeler-1.1-r3 (07 Dec 2006)
+
+  07 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.1-commons-digester.patch, +commons-modeler-1.1-r3.ebuild:
+  Changes:
+   - Migrated to use the new split mx4j
+   - Made commons-digester dependency optional and working
+   - Removed unused dependencies
+   - Added src_test
+   - dropped amd64 until mx4j-core is keyworded there
 
 *commons-modeler-1.1-r2 (01 Dec 2006)
 
diff --git a/dev-java/commons-modeler/commons-modeler-1.1-r3.ebuild b/dev-java/commons-modeler/commons-modeler-1.1-r3.ebuild
new file mode 100644
index 000000000000..9f69c8edb30b
--- /dev/null
+++ b/dev-java/commons-modeler/commons-modeler-1.1-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/12/07 20:40:38 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
+SRC_URI="mirror://apache/jakarta/commons/modeler/source/modeler-1.1-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/commons/modeler/"
+LICENSE="Apache-1.1"
+SLOT="0"
+
+# Provides ant tasks for ant to use
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/mx4j-core-3*
+	>=dev-java/commons-logging-1.0.3
+	dev-java/ant-core
+	commons-digester? ( >=dev-java/commons-digester-1.4.1 )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )"
+
+KEYWORDS="~x86"
+IUSE="commons-digester doc source test"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/1.1-commons-digester.patch"
+
+	# Setup the build environment
+	use commons-digester && 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 mx4j-core-3.0 mx4j.jar)" >> build.properties
+
+	# This is something the build.xml tries to run. Could of course package it
+	# separately using dolauncher. Use the demo target for this.
+	#use examples && echo "jmxtools.jar=$(java-pkg_getjar mx4j-tools-3.0 mx4j-tools.jar)" >> build.properties
+
+	#Probably only needed with 1.3
+	#echo "jaxp.xalan.jar=$(java-pkg_getjars xalan)" >> build.properties
+	mkdir dist
+}
+
+src_compile() {
+	eant $(use_doc) prepare jar
+}
+
+src_test() {
+	eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodoc RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
+pkg_postinst() {
+	elog "Changed to mx4j from sun-jmx due to fetch restrictions"
+	elog "If you don't like it tell us at java@gentoo.org"
+}
diff --git a/dev-java/commons-modeler/files/1.1-commons-digester.patch b/dev-java/commons-modeler/files/1.1-commons-digester.patch
new file mode 100644
index 000000000000..92d09e7dd831
--- /dev/null
+++ b/dev-java/commons-modeler/files/1.1-commons-digester.patch
@@ -0,0 +1,15 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 483551)
++++ build.xml	(working copy)
+@@ -150,8 +150,8 @@
+ 
+ 
+   <target name="compile-only" >
+-    <available property="ant16.available"  classname="org.apache.tools.ant.PropertyHelper" />
+-    <available property="digester.available"  classname="org.apache.commons.digester.Digester" />
++    <available property="ant16.available"  classname="org.apache.tools.ant.PropertyHelper" classpathref="compile.classpath" />
++    <available property="digester.available"  classname="org.apache.commons.digester.Digester" classpathref="compile.classpath" />
+ 
+     <javac  srcdir="${source.home}"
+            destdir="${build.home}/classes"
diff --git a/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r3 b/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r3
new file mode 100644
index 000000000000..29c15fe941b8
--- /dev/null
+++ b/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r3
@@ -0,0 +1,3 @@
+MD5 6de043186a348758c845f1a2321e8308 modeler-1.1-src.tar.gz 92211
+RMD160 dd1d1548784ff4fbc5549294b7a6bed16e319803 modeler-1.1-src.tar.gz 92211
+SHA256 41146b9e3614eda22064fbdde457750608b0cbc0ff2d904a39c5938b165fc2e7 modeler-1.1-src.tar.gz 92211