From 014ddf12f68b86522c20c25e60d3c187dd02cc03 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 25 Jan 2007 11:52:05 +0000 Subject: [PATCH] Ebuild cleanup - less build.xml patching, testing moved to src_test - no junit useflag. Package-Manager: portage-2.1.2-r3 --- dev-java/commons-cli/ChangeLog | 9 +++- dev-java/commons-cli/Manifest | 30 +++++-------- .../commons-cli/commons-cli-1.0-r5.ebuild | 45 +++++++++---------- .../files/commons-cli-1.0-build.xml.patch | 11 +++++ 4 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog index b727d4b7b12e..bbf677cb56d1 100644 --- a/dev-java/commons-cli/ChangeLog +++ b/dev-java/commons-cli/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-cli -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.25 2006/12/07 22:34:34 flameeyes Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.26 2007/01/25 11:52:05 caster Exp $ + + 25 Jan 2007; Vlastimil Babka + +files/commons-cli-1.0-build.xml.patch, commons-cli-1.0-r5.ebuild: + Ebuild cleanup - less build.xml patching, testing moved to src_test - no + junit useflag. 07 Dec 2006; Diego Pettenò commons-cli-1.0-r5.ebuild: diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest index 4d11814926dd..fa5813c6e5d5 100644 --- a/dev-java/commons-cli/Manifest +++ b/dev-java/commons-cli/Manifest @@ -1,6 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX commons-cli-1.0-build.xml.patch 538 RMD160 f79ef3f22208148bd1eac16d13f39517ab260429 SHA1 826f57ba4f61cb64ad0bf14616e5e46d03127799 SHA256 a646f9ad190583253f1881c0cf71464e93b755bea5d4bbe605906e8ee1325533 +MD5 43014e5f5d8c10141c8239149a93da89 files/commons-cli-1.0-build.xml.patch 538 +RMD160 f79ef3f22208148bd1eac16d13f39517ab260429 files/commons-cli-1.0-build.xml.patch 538 +SHA256 a646f9ad190583253f1881c0cf71464e93b755bea5d4bbe605906e8ee1325533 files/commons-cli-1.0-build.xml.patch 538 AUX commons-cli-1.0-gentoo.diff 4407 RMD160 c6db9a74f8f0c1f3649f2c64bdfd9fb0f3683c03 SHA1 dabb6e45b7d925acbd79a21521c8fc44348101ac SHA256 03cbd6e210c3cb0521e0db870d40248c2f5279f3639e67cc2ef71d467b5b16fb MD5 b534e655c6a40ff5b01098dddcda205c files/commons-cli-1.0-gentoo.diff 4407 RMD160 c6db9a74f8f0c1f3649f2c64bdfd9fb0f3683c03 files/commons-cli-1.0-gentoo.diff 4407 @@ -10,14 +11,14 @@ EBUILD commons-cli-1.0-r4.ebuild 1609 RMD160 9aef570d2625ac6f9e0781c255e18f222e5 MD5 b25f74f6e33b9431548773cd49bdd72e commons-cli-1.0-r4.ebuild 1609 RMD160 9aef570d2625ac6f9e0781c255e18f222e5133fe commons-cli-1.0-r4.ebuild 1609 SHA256 d589435b288eccb9f231cf2b90e887096c9a8045ff42a2d6f153ec1f1958eca9 commons-cli-1.0-r4.ebuild 1609 -EBUILD commons-cli-1.0-r5.ebuild 1537 RMD160 dd26af635146c676cf23f7d568bd79fef7d95bf6 SHA1 a4ae06d1d369c4cad7ff3317b775e2c2f9c0e367 SHA256 a730c3758b7a58ed1702781dde629e90bff1c1fa0151a8808ec12c1571b0a0ad -MD5 def048797605d55f0804010b53f66229 commons-cli-1.0-r5.ebuild 1537 -RMD160 dd26af635146c676cf23f7d568bd79fef7d95bf6 commons-cli-1.0-r5.ebuild 1537 -SHA256 a730c3758b7a58ed1702781dde629e90bff1c1fa0151a8808ec12c1571b0a0ad commons-cli-1.0-r5.ebuild 1537 -MISC ChangeLog 3778 RMD160 4f224513de60777db7541533eb2b0d66ce1f3246 SHA1 a01ed45f2ba70bc1f37bcb57df336426f8881fcc SHA256 6a82b642d81fe809b76e6b9224e7bb8a10a8cede28d13506c9d413b9f1f0b896 -MD5 4933f8411d2e3295c6f9d79567f04a05 ChangeLog 3778 -RMD160 4f224513de60777db7541533eb2b0d66ce1f3246 ChangeLog 3778 -SHA256 6a82b642d81fe809b76e6b9224e7bb8a10a8cede28d13506c9d413b9f1f0b896 ChangeLog 3778 +EBUILD commons-cli-1.0-r5.ebuild 1269 RMD160 d3d67565f2a18c095e78fcc6e89c2eda9336312a SHA1 0e1aa222dea11bb72ef0abb4c94518bd868f0401 SHA256 e981546169ee968250a017aceb31fe6df92edafd05672d2aeb2eb4069638b2b2 +MD5 315103725c28c4ee905535a0a91367c0 commons-cli-1.0-r5.ebuild 1269 +RMD160 d3d67565f2a18c095e78fcc6e89c2eda9336312a commons-cli-1.0-r5.ebuild 1269 +SHA256 e981546169ee968250a017aceb31fe6df92edafd05672d2aeb2eb4069638b2b2 commons-cli-1.0-r5.ebuild 1269 +MISC ChangeLog 3988 RMD160 eda652f3e938ee4c43d520f115fed0ecdd8e4a45 SHA1 a4acb095a8ec2f62c8ba160b0602f22d464e610c SHA256 d4f83836704f5220a438fd66a53178a5a5be4ad8291a4abb91e1cdc028df8290 +MD5 b78a01facfde6bf7c8213e0b52a44dde ChangeLog 3988 +RMD160 eda652f3e938ee4c43d520f115fed0ecdd8e4a45 ChangeLog 3988 +SHA256 d4f83836704f5220a438fd66a53178a5a5be4ad8291a4abb91e1cdc028df8290 ChangeLog 3988 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -28,10 +29,3 @@ SHA256 e6405828df63ae65405c8d0179a59d35d48d61978567edd62087dc966247894f files/di MD5 122734c89e73972b32a56d81a06c8fa1 files/digest-commons-cli-1.0-r5 232 RMD160 2c1fd6034b918bd744c903ae81a01539ed71d356 files/digest-commons-cli-1.0-r5 232 SHA256 e6405828df63ae65405c8d0179a59d35d48d61978567edd62087dc966247894f files/digest-commons-cli-1.0-r5 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFeJcBAiZjviIA2XgRAmAgAKDRwmqsTvKWMq+NlJHX70vB3EOyFwCfcYhj -6WV8P3Bd4Q56RgT9D1XEPMs= -=+hpZ ------END PGP SIGNATURE----- diff --git a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild index 4547c825ec26..f92f2256fbf4 100644 --- a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild +++ b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.5 2006/12/07 22:34:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.6 2007/01/25 11:52:05 caster Exp $ +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 eutils DESCRIPTION="The CLI library provides a simple and easy to use API for working with the command line arguments and options." @@ -11,39 +12,37 @@ SRC_URI="mirror://apache/jakarta/commons/cli/source/cli-${PV}-src.tar.gz" LICENSE="Apache-1.1" SLOT="1" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc junit source" +IUSE="" -RDEPEND=">=virtual/jre-1.3 - >=dev-java/commons-logging-1.0 +CDEPEND="dev-java/commons-logging =dev-java/commons-lang-2.0*" -DEPEND=">=virtual/jdk-1.3 - ${RDEPEND} - junit? ( >=dev-java/junit-3.7 >=dev-java/ant-tasks-1.6.2 ) - source? ( app-arch/zip ) - >=dev-java/ant-core-1.6.2" +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.4 + test? ( =dev-java/junit-3* dev-java/ant ) + !test? ( dev-java/ant-core ) + ${CDEPEND}" src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${P}-gentoo.diff - echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties - echo "commons-lang.jar=$(java-pkg_getjars commons-lang)" >> build.properties - use junit && echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties + epatch ${FILESDIR}/${P}-build.xml.patch + + mkdir lib && cd lib + java-pkg_jar-from commons-logging commons-logging.jar + java-pkg_jar-from commons-lang } -src_compile() { - local antflags="jar" - use doc && antflags="${antflags} javadoc" - use junit && antflags="${antflags} test" - eant ${antflags} || die "compilation failed" +src_test() { + java-pkg_jar-from --into lib junit + eant test } src_install() { - java-pkg_newjar target/${P}.jar ${PN}.jar + java-pkg_newjar target/${P}.jar dodoc README.txt - use doc && java-pkg_dohtml -r target/docs/ - use source && java-pkg_dosrc src/java/* + use doc && java-pkg_dojavadoc target/docs/apidocs + use source && java-pkg_dosrc src/java/org } - diff --git a/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch b/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch new file mode 100644 index 000000000000..c46b72582282 --- /dev/null +++ b/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2007-01-25 10:48:56.000000000 +0100 ++++ build.xml 2007-01-25 10:49:33.000000000 +0100 +@@ -8,7 +8,7 @@ + + + +- ++ + + + -- 2.26.2