From: Petteri Räty Date: Fri, 27 Apr 2007 22:16:16 +0000 (+0000) Subject: Fix dependencies, migrate to splitted ant and add the source use flag. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53f3ce34008ae7824435920fb2c6529227bb500e;p=gentoo.git Fix dependencies, migrate to splitted ant and add the source use flag. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-java/commons-graph/ChangeLog b/dev-java/commons-graph/ChangeLog index 520cec49a883..21dbc446a758 100644 --- a/dev-java/commons-graph/ChangeLog +++ b/dev-java/commons-graph/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/commons-graph -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/ChangeLog,v 1.5 2006/07/22 22:48:22 nelchael Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/ChangeLog,v 1.6 2007/04/27 22:16:16 betelgeuse Exp $ + +*commons-graph-0.8.1_p20040118-r2 (27 Apr 2007) + + 27 Apr 2007; Petteri Räty + commons-graph-0.8.1_p20040118-r1.ebuild, + +commons-graph-0.8.1_p20040118-r2.ebuild: + Fix dependencies, migrate to splitted ant and add the source use flag. *commons-graph-0.8.1_p20040118-r1 (22 Jul 2006) diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest index 3f5f58b7bb54..8ff7dff9b153 100644 --- a/dev-java/commons-graph/Manifest +++ b/dev-java/commons-graph/Manifest @@ -6,18 +6,22 @@ MD5 361f23cd46c14f40fbb6590b564f20a5 files/commons-graph-0.8.1_p20040118-gentoo. RMD160 809f522b66de01508a0817e63403ec0c4bfe7e60 files/commons-graph-0.8.1_p20040118-gentoo.diff 758 SHA256 874c080625cc87f968e6f0c150e5b0e15e6df335bc480eb698a49c9bf8d4f4db files/commons-graph-0.8.1_p20040118-gentoo.diff 758 DIST graph2-0.8.1.cvs20040118.tar.gz 42653 RMD160 cd5cf77dfcc90ca5b0b05279c4e6492a6aed3c38 SHA1 0bc9cb578317b722c44b0ec7f0b7f95d70824e8d SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 -EBUILD commons-graph-0.8.1_p20040118-r1.ebuild 1744 RMD160 1ea79c1922925bb1fbda2f9eb9285d4f3d38be58 SHA1 16fda851e97fd6a54af0c88ae8128518ed81b85a SHA256 ded3ca2b400d249ffd28bf5bd5d704be998998ed2b300f5b7081c9105ea8e441 -MD5 77c1fc8b90005b647b3b186c7387a467 commons-graph-0.8.1_p20040118-r1.ebuild 1744 -RMD160 1ea79c1922925bb1fbda2f9eb9285d4f3d38be58 commons-graph-0.8.1_p20040118-r1.ebuild 1744 -SHA256 ded3ca2b400d249ffd28bf5bd5d704be998998ed2b300f5b7081c9105ea8e441 commons-graph-0.8.1_p20040118-r1.ebuild 1744 +EBUILD commons-graph-0.8.1_p20040118-r1.ebuild 1428 RMD160 db5e267248c6a33e15b35e0166f0e8fb4379ba4d SHA1 8118165f936a65f82c316d0394e1582a932b1cad SHA256 f236e809401dd2c8fc4b649a8e22b3adc45c35f69d0fb0ceb3b37fe61683ff3b +MD5 0b43ee4c3d5d775c1e06d0f30c8a6fc8 commons-graph-0.8.1_p20040118-r1.ebuild 1428 +RMD160 db5e267248c6a33e15b35e0166f0e8fb4379ba4d commons-graph-0.8.1_p20040118-r1.ebuild 1428 +SHA256 f236e809401dd2c8fc4b649a8e22b3adc45c35f69d0fb0ceb3b37fe61683ff3b commons-graph-0.8.1_p20040118-r1.ebuild 1428 +EBUILD commons-graph-0.8.1_p20040118-r2.ebuild 1433 RMD160 d2c181fc22e67112de45118ff99f72b225a9d88f SHA1 da043057d2385d79a347c282dd07a7bc3740ee15 SHA256 4c52f97a74c0c6fa57ff23eab39481390a4634684a40ab41d053238a2cb73b7e +MD5 cbbcfa01cd1353414f99ac1547b107eb commons-graph-0.8.1_p20040118-r2.ebuild 1433 +RMD160 d2c181fc22e67112de45118ff99f72b225a9d88f commons-graph-0.8.1_p20040118-r2.ebuild 1433 +SHA256 4c52f97a74c0c6fa57ff23eab39481390a4634684a40ab41d053238a2cb73b7e commons-graph-0.8.1_p20040118-r2.ebuild 1433 EBUILD commons-graph-0.8.1_p20040118.ebuild 1817 RMD160 24d07cbe08088f2b78e24df186cb080e4c495e6b SHA1 6250a8c08c303ef38375c906a468ad289b3939ac SHA256 2b370c2cd9532ae0cce0a12463be0c5fdc44e493a6d46bc14a0533050b446f12 MD5 56fa9e9e8de2cc629d436b2684f2269d commons-graph-0.8.1_p20040118.ebuild 1817 RMD160 24d07cbe08088f2b78e24df186cb080e4c495e6b commons-graph-0.8.1_p20040118.ebuild 1817 SHA256 2b370c2cd9532ae0cce0a12463be0c5fdc44e493a6d46bc14a0533050b446f12 commons-graph-0.8.1_p20040118.ebuild 1817 -MISC ChangeLog 1018 RMD160 78556aa080205800c51227bef1c9f98efba01b47 SHA1 8976cabdf7210a7c63de4715a58569d64715191d SHA256 b702be220293ff78176a356bf34303f867349396cf26d95bceff0fd7e0d369d7 -MD5 0597d4d0180de3b5886e1432cd2733c6 ChangeLog 1018 -RMD160 78556aa080205800c51227bef1c9f98efba01b47 ChangeLog 1018 -SHA256 b702be220293ff78176a356bf34303f867349396cf26d95bceff0fd7e0d369d7 ChangeLog 1018 +MISC ChangeLog 1283 RMD160 27e81d5a1c782e759decf35a0b2ed7f4974a9e01 SHA1 8a0776a926b5d5b756c8ad7820d6f160a5b7a303 SHA256 131d39ebe6014b96b2c624e0e2f839cfe76c591eedae4cf234ec0ffaf464832f +MD5 28fcbb8a19819883b11e215f1d9250ba ChangeLog 1283 +RMD160 27e81d5a1c782e759decf35a0b2ed7f4974a9e01 ChangeLog 1283 +SHA256 131d39ebe6014b96b2c624e0e2f839cfe76c591eedae4cf234ec0ffaf464832f ChangeLog 1283 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -28,10 +32,13 @@ SHA256 4637a35a766944d930b43936db6139b8176c67447be3a51d8ff7bd818e596d29 files/di MD5 b0af4caa7b8d84180b3c41899eb18d8c files/digest-commons-graph-0.8.1_p20040118-r1 271 RMD160 b58d8d50db5de89518723f2255357575b2d9ce8e files/digest-commons-graph-0.8.1_p20040118-r1 271 SHA256 4637a35a766944d930b43936db6139b8176c67447be3a51d8ff7bd818e596d29 files/digest-commons-graph-0.8.1_p20040118-r1 271 +MD5 b0af4caa7b8d84180b3c41899eb18d8c files/digest-commons-graph-0.8.1_p20040118-r2 271 +RMD160 b58d8d50db5de89518723f2255357575b2d9ce8e files/digest-commons-graph-0.8.1_p20040118-r2 271 +SHA256 4637a35a766944d930b43936db6139b8176c67447be3a51d8ff7bd818e596d29 files/digest-commons-graph-0.8.1_p20040118-r2 271 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFEwqs/go/w9rxVVVERAgDdAJ95SmNVUhi/nUUTiy9ZU+RRUmyPNwCfczGo -YcD+TfLVQcsGx7TegH9itfk= -=QaF2 +iD8DBQFGMnYycxLzpIGCsLQRAnnoAKCc2pYrBoZmeHnfc0jRKc0yMHhA0gCeN0Lo +N7/h29ioGTMhvXIjZEvsE0w= +=Ad3N -----END PGP SIGNATURE----- diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild index 265aa38850c7..2de048c0877e 100644 --- a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild +++ b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild @@ -1,6 +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-graph/commons-graph-0.8.1_p20040118-r1.ebuild,v 1.1 2006/07/22 22:48:22 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild,v 1.2 2007/04/27 22:16:16 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 eutils MY_PN=graph2 @@ -12,12 +14,11 @@ DESCRIPTION="A toolkit for managing graphs and graph based data structures" HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/" # this was extracted from a source rpm at jpackage SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz" -COMMON_DEP="dev-java/log4j +COMMON_DEP=" dev-java/commons-collections - dev-java/xml-commons" + dev-java/jdepend" DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core - test? ( dev-java/ant-tasks ) + test? ( dev-java/ant-junit ) ${COMMON_DEP}" RDEPEND=">=virtual/jre-1.3 ${COMMON_DEP}" @@ -25,39 +26,28 @@ RDEPEND=">=virtual/jre-1.3 LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc test" +IUSE="" S=${WORKDIR}/${MY_P} src_unpack(){ unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.diff + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.diff" mkdir -p target/lib cd target/lib - java-pkg_jar-from log4j java-pkg_jar-from commons-collections - java-pkg_jar-from xml-commons xml-apis.jar - -} - -src_compile(){ - local antflags="jar -Dnoget=true" - use doc && antflags="${antflags} javadoc" - eant ${antflags} || die "compile failed" + java-pkg_jar-from jdepend } src_install(){ java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar - use doc && java-pkg_dohtml -r dist/docs/api + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/* } src_test() { - if use test; then - local antflags="test -Dnoget=true" - eant ${antflags} || die "test failed" - else - ewarn "You must include 'test' in your use flags in order to" - ewarn "get the dependencies needed to run unit tests" - ewarn "Skipping unit tests" - fi + cd "${S}/target/lib" + java-pkg_jar-from junit + cd "${S}" + ANT_TASKS="ant-junit" eant test } diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild new file mode 100644 index 000000000000..bda316c795e6 --- /dev/null +++ b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild,v 1.1 2007/04/27 22:16:16 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 eutils +MY_PN=graph2 +MY_PV=${PV%%_*}.cvs${PV##*_p} +MY_P=${MY_PN}-${MY_PV} +API_PV=${PV%%_*} +DESCRIPTION="A toolkit for managing graphs and graph based data structures" +# There doesn't seem to be a real home page, so we'll point to a viewcvs +HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/" +# this was extracted from a source rpm at jpackage +SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz" +COMMON_DEP=" + dev-java/commons-collections + dev-java/jdepend" +DEPEND=">=virtual/jdk-1.3 + test? ( dev-java/ant-junit ) + ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.3 + ${COMMON_DEP}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +S=${WORKDIR}/${MY_P} + +src_unpack(){ + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.diff" + mkdir -p target/lib + cd target/lib + java-pkg_jar-from commons-collections + java-pkg_jar-from jdepend +} + +src_install(){ + java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} + +src_test() { + cd "${S}/target/lib" + java-pkg_jar-from junit + cd "${S}" + ANT_TASKS="ant-junit" eant test +} diff --git a/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r2 b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r2 new file mode 100644 index 000000000000..071634f706c7 --- /dev/null +++ b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r2 @@ -0,0 +1,3 @@ +MD5 2f0b4b570e383321675e56d3a2bbfa08 graph2-0.8.1.cvs20040118.tar.gz 42653 +RMD160 cd5cf77dfcc90ca5b0b05279c4e6492a6aed3c38 graph2-0.8.1.cvs20040118.tar.gz 42653 +SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 graph2-0.8.1.cvs20040118.tar.gz 42653