From 4aef4cbbc708c46d448741ce45ae58dc4613b2a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Thu, 7 Dec 2006 20:40:38 +0000 Subject: [PATCH] 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 Package-Manager: portage-2.1.2_rc2-r3 --- dev-java/commons-modeler/ChangeLog | 13 +++- dev-java/commons-modeler/Manifest | 29 +++++++-- .../commons-modeler-1.1-r3.ebuild | 65 +++++++++++++++++++ .../files/1.1-commons-digester.patch | 15 +++++ .../files/digest-commons-modeler-1.1-r3 | 3 + 5 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 dev-java/commons-modeler/commons-modeler-1.1-r3.ebuild create mode 100644 dev-java/commons-modeler/files/1.1-commons-digester.patch create mode 100644 dev-java/commons-modeler/files/digest-commons-modeler-1.1-r3 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 + +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/Manifest b/dev-java/commons-modeler/Manifest index c80eb81484f0..40da45158fe1 100644 --- a/dev-java/commons-modeler/Manifest +++ b/dev-java/commons-modeler/Manifest @@ -1,3 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 1.1-commons-digester.patch 740 RMD160 6a325f080775d878680422a32128ef050e4fdbe9 SHA1 e34c4c7dd01ff258a60778b523bb90b467171fa7 SHA256 78466ec39edddfaa21963750b39ac0a819f7a89ff73d500d90db5813bbaaa7ee +MD5 3ea8e5a7a0691966d7bdd64aee739d7b files/1.1-commons-digester.patch 740 +RMD160 6a325f080775d878680422a32128ef050e4fdbe9 files/1.1-commons-digester.patch 740 +SHA256 78466ec39edddfaa21963750b39ac0a819f7a89ff73d500d90db5813bbaaa7ee files/1.1-commons-digester.patch 740 AUX gentoo.diff 510 RMD160 d3e9aa460b2308ca79624a8242536fb20a32d255 SHA1 9771433b724263826a586f02128a71de31137b1d SHA256 e002206cc3a326a2bd492bb177f8f7a0a954826abdc13e590c75236be61e1ff1 MD5 6cd2a42a25b29cb85c58037271a97037 files/gentoo.diff 510 RMD160 d3e9aa460b2308ca79624a8242536fb20a32d255 files/gentoo.diff 510 @@ -11,14 +18,18 @@ EBUILD commons-modeler-1.1-r2.ebuild 1810 RMD160 b9638b38acbfce8272ea89dd89f8e18 MD5 772c637a3eb3eb223000f69a49311866 commons-modeler-1.1-r2.ebuild 1810 RMD160 b9638b38acbfce8272ea89dd89f8e183c7849ae3 commons-modeler-1.1-r2.ebuild 1810 SHA256 3b4a04d3829bc79936ed579fe2542c6822c898e9993c901ff13b0528adff97e6 commons-modeler-1.1-r2.ebuild 1810 +EBUILD commons-modeler-1.1-r3.ebuild 2103 RMD160 b6c826d16757f043986888747bf11b56500aa194 SHA1 569d6f334bf749eb9241c8b4de08d1c96e2e0a6a SHA256 8e4d3ab8821ae0608d13f7b2c09fdcd6fdf1a89a3918b2c46b6d09d68551c6ec +MD5 24ddeffa3f06aaf51b3f6e42b703bde7 commons-modeler-1.1-r3.ebuild 2103 +RMD160 b6c826d16757f043986888747bf11b56500aa194 commons-modeler-1.1-r3.ebuild 2103 +SHA256 8e4d3ab8821ae0608d13f7b2c09fdcd6fdf1a89a3918b2c46b6d09d68551c6ec commons-modeler-1.1-r3.ebuild 2103 EBUILD commons-modeler-1.1.ebuild 1758 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3cb1649 SHA1 5538c181352044aaefaf125a21887fd2bef08e05 SHA256 0fbc22d6e7fed13c8318ce99172c073925f746946f03fc16686d7f450673603c MD5 06ed7856de3e3cbeb14fca948fb55bae commons-modeler-1.1.ebuild 1758 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3cb1649 commons-modeler-1.1.ebuild 1758 SHA256 0fbc22d6e7fed13c8318ce99172c073925f746946f03fc16686d7f450673603c commons-modeler-1.1.ebuild 1758 -MISC ChangeLog 2220 RMD160 deb87758713e3024966a8be1d76be52d0a79482f SHA1 7bf3306df4ba43e9b663277e567d1c6e6b0988d1 SHA256 533cfcd927ddb2a3588812acb3e469df96fa171f4d0f02f4ff30fde09b3fd474 -MD5 799759905d22a25ba672a3166b3ce42b ChangeLog 2220 -RMD160 deb87758713e3024966a8be1d76be52d0a79482f ChangeLog 2220 -SHA256 533cfcd927ddb2a3588812acb3e469df96fa171f4d0f02f4ff30fde09b3fd474 ChangeLog 2220 +MISC ChangeLog 2604 RMD160 07a640bb38e303ee7eeaeb31fc990d83d6e17ab6 SHA1 71da3a607ff87b298c63da603d65924de0ebeca7 SHA256 cd1c654a38fead2cacbaadb7bdeb606fad7faeedb808df9dee2a5fa58f6ad93f +MD5 88845114124aa1739afbbfb14ac8f097 ChangeLog 2604 +RMD160 07a640bb38e303ee7eeaeb31fc990d83d6e17ab6 ChangeLog 2604 +SHA256 cd1c654a38fead2cacbaadb7bdeb606fad7faeedb808df9dee2a5fa58f6ad93f ChangeLog 2604 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -32,3 +43,13 @@ SHA256 a71565242314c79297eafc39bf43da0d5e12a30fcd1f3ae78af13f5c84b1cfb4 files/di MD5 fdcf46f8fe00529b6413ace99a2d2d94 files/digest-commons-modeler-1.1-r2 244 RMD160 2b404db60bfe2b326ae635f8bd7cfd30a696720f files/digest-commons-modeler-1.1-r2 244 SHA256 a71565242314c79297eafc39bf43da0d5e12a30fcd1f3ae78af13f5c84b1cfb4 files/digest-commons-modeler-1.1-r2 244 +MD5 fdcf46f8fe00529b6413ace99a2d2d94 files/digest-commons-modeler-1.1-r3 244 +RMD160 2b404db60bfe2b326ae635f8bd7cfd30a696720f files/digest-commons-modeler-1.1-r3 244 +SHA256 a71565242314c79297eafc39bf43da0d5e12a30fcd1f3ae78af13f5c84b1cfb4 files/digest-commons-modeler-1.1-r3 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFeHxWcxLzpIGCsLQRAgjaAJoCXYnr2cajBxgpz9FsvRlXC5duZACfV1DQ +3zKWsK8iRz57uzI/FOGaNqU= +=d5mL +-----END PGP SIGNATURE----- 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 @@ + + + +- +- ++ ++ + +