From: Petteri Räty Date: Wed, 14 Feb 2007 09:44:25 +0000 (+0000) Subject: Corrected LICENSE to Apache-2.0, added missing junit dependency for src_test, changed... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1a780be13a2d12bfd2ee088944890a73d68ac28;p=gentoo.git Corrected LICENSE to Apache-2.0, added missing junit dependency for src_test, changed to use java-pkg_dojavadoc and removed pkg_postinst notice about moving to mx4j from sun-jmx because of fetch restrictions because with the splitted mx4j does not bring in a huge deptree any more. Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog index ce6755add082..addc0c8fa4ac 100644 --- a/dev-java/commons-modeler/ChangeLog +++ b/dev-java/commons-modeler/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/commons-modeler # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.21 2007/02/13 22:33:15 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.22 2007/02/14 09:44:25 betelgeuse Exp $ + + 14 Feb 2007; Petteri Räty + commons-modeler-2.0.ebuild: + Corrected LICENSE to Apache-2.0, added missing junit dependency for + src_test, changed to use java-pkg_dojavadoc and removed pkg_postinst notice + about moving to mx4j from sun-jmx because of fetch restrictions because with + the splitted mx4j does not bring in a huge deptree any more. *commons-modeler-2.0 (13 Feb 2007) diff --git a/dev-java/commons-modeler/Manifest b/dev-java/commons-modeler/Manifest index 044995a22858..79616da685ce 100644 --- a/dev-java/commons-modeler/Manifest +++ b/dev-java/commons-modeler/Manifest @@ -1,3 +1,6 @@ +-----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 @@ -24,14 +27,14 @@ EBUILD commons-modeler-1.1.ebuild 1758 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3 MD5 06ed7856de3e3cbeb14fca948fb55bae commons-modeler-1.1.ebuild 1758 RMD160 6245530bdbe6b26660da7505ac1fdb9ee3cb1649 commons-modeler-1.1.ebuild 1758 SHA256 0fbc22d6e7fed13c8318ce99172c073925f746946f03fc16686d7f450673603c commons-modeler-1.1.ebuild 1758 -EBUILD commons-modeler-2.0.ebuild 2102 RMD160 589387cc1737b14502baae148b51ce09da11451d SHA1 a5df1370e25d9a22c3c6d9b5a32f34dbdc4114b4 SHA256 28d945cffe5151f324425bcb933c2a9f4e86d7bdfe1d76afa8c63ffd38e56fcf -MD5 cfc98553e79cfe77286d16e2f5fc0ed4 commons-modeler-2.0.ebuild 2102 -RMD160 589387cc1737b14502baae148b51ce09da11451d commons-modeler-2.0.ebuild 2102 -SHA256 28d945cffe5151f324425bcb933c2a9f4e86d7bdfe1d76afa8c63ffd38e56fcf commons-modeler-2.0.ebuild 2102 -MISC ChangeLog 3212 RMD160 5b0f1823cbcd729ac95e6a17ef98ab03a60e4f0f SHA1 ef000f68fc17b819c83aa8ef60848c86b8c97f17 SHA256 303bd4f28ff59ec756f507786827a47dd3998e7b3bd07b69d72665e550d23250 -MD5 4d906fcc76d1ef3dd685844df15d3339 ChangeLog 3212 -RMD160 5b0f1823cbcd729ac95e6a17ef98ab03a60e4f0f ChangeLog 3212 -SHA256 303bd4f28ff59ec756f507786827a47dd3998e7b3bd07b69d72665e550d23250 ChangeLog 3212 +EBUILD commons-modeler-2.0.ebuild 1973 RMD160 106fa62cd3fbe4905aa507c70093ced09c205462 SHA1 c74060602ade7b123684ff628be3ebf8f23091b0 SHA256 81c9aa4b130b8b5504c96b7e381ff4f4afcfb7ce10b93c55d6db17b757b82ab2 +MD5 bfad1300d6f8ff39b36f4e421e04b327 commons-modeler-2.0.ebuild 1973 +RMD160 106fa62cd3fbe4905aa507c70093ced09c205462 commons-modeler-2.0.ebuild 1973 +SHA256 81c9aa4b130b8b5504c96b7e381ff4f4afcfb7ce10b93c55d6db17b757b82ab2 commons-modeler-2.0.ebuild 1973 +MISC ChangeLog 3591 RMD160 ca4eeef017399aadcbb83130c3bef5cda832c068 SHA1 117992d4550c9ad34464c2bb5cb1db4ab09f4a3b SHA256 ce57edbf9567af0a804b0b96b5d400fc4fceb0a8fe0076a1a679d27ac9dcb6e3 +MD5 6bcb8bd0568407b1d5eef0de9a7429b9 ChangeLog 3591 +RMD160 ca4eeef017399aadcbb83130c3bef5cda832c068 ChangeLog 3591 +SHA256 ce57edbf9567af0a804b0b96b5d400fc4fceb0a8fe0076a1a679d27ac9dcb6e3 ChangeLog 3591 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -51,3 +54,10 @@ SHA256 a71565242314c79297eafc39bf43da0d5e12a30fcd1f3ae78af13f5c84b1cfb4 files/di MD5 8e3030dc8e47b74acfe4cf69a6e45dca files/digest-commons-modeler-2.0 271 RMD160 6b3d2cd27822c09689d66166c6e7aecc871043ce files/digest-commons-modeler-2.0 271 SHA256 b77c1275aceb71a7f97552f825cf97a3506a952d684d3700db520be55e987fee files/digest-commons-modeler-2.0 271 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF0toIcxLzpIGCsLQRAib1AJ9SxM5hnciSjOCx9U3hQRojXrCklQCdFr7X +nFFoDY5LYRW6cOsalLcQKyY= +=I1ZS +-----END PGP SIGNATURE----- diff --git a/dev-java/commons-modeler/commons-modeler-2.0.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.ebuild index c31ddb13578d..2171440ed5c9 100644 --- a/dev-java/commons-modeler/commons-modeler-2.0.ebuild +++ b/dev-java/commons-modeler/commons-modeler-2.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-2.0.ebuild,v 1.1 2007/02/13 22:33:15 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-2.0.ebuild,v 1.2 2007/02/14 09:44:25 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/${P}-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/commons/modeler/" -LICENSE="Apache-1.1" +LICENSE="Apache-2.0" SLOT="0" # Provides ant tasks for ant to use @@ -18,7 +18,8 @@ RDEPEND=">=virtual/jre-1.4 commons-digester? ( >=dev-java/commons-digester-1.4.1 )" DEPEND=">=virtual/jdk-1.4 ${RDEPEND} - source? ( app-arch/zip )" + source? ( app-arch/zip ) + test? ( dev-java/junit )" KEYWORDS="~amd64 ~x86 ~x86-fbsd" IUSE="commons-digester doc source test" @@ -27,7 +28,7 @@ S=${WORKDIR}/${P}-src src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # epatch "${FILESDIR}/1.1-commons-digester.patch" @@ -45,9 +46,7 @@ src_unpack() { mkdir dist } -src_compile() { - eant $(use_doc) prepare jar -} +EANT_BUILD_TARGET="prepare jar" src_test() { eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar) @@ -55,11 +54,7 @@ src_test() { src_install() { java-pkg_dojar dist/${PN}.jar - dodoc RELEASE-NOTES.txt RELEASE-NOTES.txt - use doc && java-pkg_dohtml -r dist/docs/* + dodoc RELEASE-NOTES.txt || die + use doc && java-pkg_dojavadoc dist/docs/api 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" -}