From a70c195420a9e2340315c43d04253b2848542548 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Fri, 27 Apr 2007 22:45:59 +0000 Subject: [PATCH] Revbump that depends on split-ant and stops symlinking to /usr/share/ant-core/lib; Also don't generate javadoc without USE=doc. Package-Manager: portage-2.1.2.4 --- dev-java/junit/ChangeLog | 12 +++++- dev-java/junit/Manifest | 38 +++++++++---------- dev-java/junit/files/digest-junit-3.8.1-r1 | 3 -- dev-java/junit/files/digest-junit-3.8.2-r1 | 3 ++ dev-java/junit/files/junit-3.8.2-build.xml | 13 ++++--- dev-java/junit/junit-3.8.1-r1.ebuild | 44 ---------------------- dev-java/junit/junit-3.8.2-r1.ebuild | 44 ++++++++++++++++++++++ dev-java/junit/junit-3.8.2.ebuild | 6 +-- 8 files changed, 87 insertions(+), 76 deletions(-) delete mode 100644 dev-java/junit/files/digest-junit-3.8.1-r1 create mode 100644 dev-java/junit/files/digest-junit-3.8.2-r1 delete mode 100644 dev-java/junit/junit-3.8.1-r1.ebuild create mode 100644 dev-java/junit/junit-3.8.2-r1.ebuild diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog index c7b659093188..17fbfe469669 100644 --- a/dev-java/junit/ChangeLog +++ b/dev-java/junit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/junit -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.32 2006/11/24 21:45:43 corsair Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.33 2007/04/27 22:45:59 caster Exp $ + +*junit-3.8.2-r1 (27 Apr 2007) + + 27 Apr 2007; Vlastimil Babka + files/junit-3.8.2-build.xml, -junit-3.8.1-r1.ebuild, junit-3.8.2.ebuild, + +junit-3.8.2-r1.ebuild: + Revbump that depends on split-ant and stops symlinking to + /usr/share/ant-core/lib; Also don't generate javadoc without USE=doc. 24 Nov 2006; Markus Rothe junit-3.8.1-r3.ebuild: Stable on ppc64; bug #155261 diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest index 7b5f84ef5e0a..5fe966282a00 100644 --- a/dev-java/junit/Manifest +++ b/dev-java/junit/Manifest @@ -1,35 +1,35 @@ -AUX junit-3.8.2-build.xml 3176 RMD160 1f224d755db6c5b0c255620b2b33d503078ba3c8 SHA1 43087ed52528088f63b03b1934240a5962931d09 SHA256 827fda6bc6f3f4983ce79fc7f8934ada5163e49966336b15d4a709c26549eeb1 -MD5 a74ea05f4ad4295a7fae9c7e54f5cfe3 files/junit-3.8.2-build.xml 3176 -RMD160 1f224d755db6c5b0c255620b2b33d503078ba3c8 files/junit-3.8.2-build.xml 3176 -SHA256 827fda6bc6f3f4983ce79fc7f8934ada5163e49966336b15d4a709c26549eeb1 files/junit-3.8.2-build.xml 3176 +AUX junit-3.8.2-build.xml 3179 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e SHA1 e4f2e9076f93c2700e096f05a426402cb7730ad3 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 +MD5 00f9e3548251e4bf938ff9d059955bdc files/junit-3.8.2-build.xml 3179 +RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e files/junit-3.8.2-build.xml 3179 +SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 files/junit-3.8.2-build.xml 3179 DIST junit3.8.1.zip 441665 RMD160 d9f63f651dd0954ffca8975a8bcf2e53c6b14574 SHA1 049bcda1172e4190925d0d343fcc32158d4f1089 SHA256 884953028bc3d2d554f99b5f627a84d7f92a42754560c63829b0ab732ff9bab8 DIST junit3.8.2.zip 461426 RMD160 c66d64d8aa738460490e62fd332c112076d9b662 SHA1 701578302e244e5173dca3040cce0774a5c39645 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a -EBUILD junit-3.8.1-r1.ebuild 1184 RMD160 734dd520518f8330d93b4e92c9e8e5e2c8113817 SHA1 7419b1ea5e8e7df2fe21c2f25e4a4d9325a5c010 SHA256 877a4e0d16d4bcc84fe88ceb05aa3e9a16f6783ff17b155a92d2403bc8227631 -MD5 bc3834146854c3df88757c9f505c95c3 junit-3.8.1-r1.ebuild 1184 -RMD160 734dd520518f8330d93b4e92c9e8e5e2c8113817 junit-3.8.1-r1.ebuild 1184 -SHA256 877a4e0d16d4bcc84fe88ceb05aa3e9a16f6783ff17b155a92d2403bc8227631 junit-3.8.1-r1.ebuild 1184 EBUILD junit-3.8.1-r3.ebuild 1032 RMD160 610f5fe99a1b94296d4442ad4d5d4abace2738f3 SHA1 0f53305260f302e65a438b419515010003839bf6 SHA256 eb49f321b398afff7371a3b309e4617e15e1078bda3b4541d01915b53c6a9a99 MD5 d77b5937242a3a2bfd68b66919e48ee7 junit-3.8.1-r3.ebuild 1032 RMD160 610f5fe99a1b94296d4442ad4d5d4abace2738f3 junit-3.8.1-r3.ebuild 1032 SHA256 eb49f321b398afff7371a3b309e4617e15e1078bda3b4541d01915b53c6a9a99 junit-3.8.1-r3.ebuild 1032 -EBUILD junit-3.8.2.ebuild 1077 RMD160 ba27e6200796d75abf1b10021a939ce6096f121f SHA1 18d330587b344d7a41e86c03411bdfdedf4665d7 SHA256 8156b8f60993725ef1d42a3e3bc5b1d1b5823b43e772eac7b1000c494b212c25 -MD5 a72e1d45d00fa38f709e9497e631a50f junit-3.8.2.ebuild 1077 -RMD160 ba27e6200796d75abf1b10021a939ce6096f121f junit-3.8.2.ebuild 1077 -SHA256 8156b8f60993725ef1d42a3e3bc5b1d1b5823b43e772eac7b1000c494b212c25 junit-3.8.2.ebuild 1077 -MISC ChangeLog 4598 RMD160 bedf5687c21df56ece17af8b0e73abaa2ab45d3a SHA1 6cd46139f3d3d75da66c6eaee74d1c5b29f554ca SHA256 73627596ddbd07ad40909083f0cd87fa7e45e68583cb5e87024851488fe64873 -MD5 dbeb517ce7d6e8caef73d7bcfd74b787 ChangeLog 4598 -RMD160 bedf5687c21df56ece17af8b0e73abaa2ab45d3a ChangeLog 4598 -SHA256 73627596ddbd07ad40909083f0cd87fa7e45e68583cb5e87024851488fe64873 ChangeLog 4598 +EBUILD junit-3.8.2-r1.ebuild 1084 RMD160 55cae1877626fa8e013a34cfa5039b82a240d3e8 SHA1 27a948a102e268ab59bda484bd347d3ee6723c2e SHA256 542745cdc7c8e1e1f728b77186883780777bf9c8b1663f5c8f1e9f79e5f17e50 +MD5 a7daf283d3a1cacf61bf5b85233da19d junit-3.8.2-r1.ebuild 1084 +RMD160 55cae1877626fa8e013a34cfa5039b82a240d3e8 junit-3.8.2-r1.ebuild 1084 +SHA256 542745cdc7c8e1e1f728b77186883780777bf9c8b1663f5c8f1e9f79e5f17e50 junit-3.8.2-r1.ebuild 1084 +EBUILD junit-3.8.2.ebuild 1089 RMD160 c91f10a1f78d703d42830b92b08d3c1bb19a659b SHA1 76cd176bb20999d441c4a6609bcd1552c8f5f5a5 SHA256 ddcfd89dd03e9cee446ee2f8a3d75d3f4c690983ead229cf8743d61f30ab1efd +MD5 e553cb68a950f2d95ce3407f1b6066b1 junit-3.8.2.ebuild 1089 +RMD160 c91f10a1f78d703d42830b92b08d3c1bb19a659b junit-3.8.2.ebuild 1089 +SHA256 ddcfd89dd03e9cee446ee2f8a3d75d3f4c690983ead229cf8743d61f30ab1efd junit-3.8.2.ebuild 1089 +MISC ChangeLog 4913 RMD160 9cfdca1f26122aad763d58775bb68a853b18c12e SHA1 d525f524ca67d15888313cfcc783af3417546d10 SHA256 224307dac5010029e38cd19be6f9753f782066542b4c1779c54db99f3db1d2d4 +MD5 1cc64d1da186db26de679f538f01b77b ChangeLog 4913 +RMD160 9cfdca1f26122aad763d58775bb68a853b18c12e ChangeLog 4913 +SHA256 224307dac5010029e38cd19be6f9753f782066542b4c1779c54db99f3db1d2d4 ChangeLog 4913 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157 -MD5 1e220f8c51044cd151cb7f53717a6e94 files/digest-junit-3.8.1-r1 223 -RMD160 85890d132d4e959ef8a5abec7f417bbd6202920e files/digest-junit-3.8.1-r1 223 -SHA256 b703de60a9ac48aebed2afce4c0dca09a09ec663068e9a630adea6fe59f3f375 files/digest-junit-3.8.1-r1 223 MD5 1e220f8c51044cd151cb7f53717a6e94 files/digest-junit-3.8.1-r3 223 RMD160 85890d132d4e959ef8a5abec7f417bbd6202920e files/digest-junit-3.8.1-r3 223 SHA256 b703de60a9ac48aebed2afce4c0dca09a09ec663068e9a630adea6fe59f3f375 files/digest-junit-3.8.1-r3 223 MD5 20bad8c34272b0d3eca7d68c76f38982 files/digest-junit-3.8.2 223 RMD160 5b40a50f6c18d4440f831722aaf9d4f1ed8f80ce files/digest-junit-3.8.2 223 SHA256 51dc8c731634d957e6ba33a2b68e03b483baefdcc9a5605f86662ef829a5df46 files/digest-junit-3.8.2 223 +MD5 20bad8c34272b0d3eca7d68c76f38982 files/digest-junit-3.8.2-r1 223 +RMD160 5b40a50f6c18d4440f831722aaf9d4f1ed8f80ce files/digest-junit-3.8.2-r1 223 +SHA256 51dc8c731634d957e6ba33a2b68e03b483baefdcc9a5605f86662ef829a5df46 files/digest-junit-3.8.2-r1 223 diff --git a/dev-java/junit/files/digest-junit-3.8.1-r1 b/dev-java/junit/files/digest-junit-3.8.1-r1 deleted file mode 100644 index 973034ec1d10..000000000000 --- a/dev-java/junit/files/digest-junit-3.8.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5110326e4b7f7497dfa60ede4b626751 junit3.8.1.zip 441665 -RMD160 d9f63f651dd0954ffca8975a8bcf2e53c6b14574 junit3.8.1.zip 441665 -SHA256 884953028bc3d2d554f99b5f627a84d7f92a42754560c63829b0ab732ff9bab8 junit3.8.1.zip 441665 diff --git a/dev-java/junit/files/digest-junit-3.8.2-r1 b/dev-java/junit/files/digest-junit-3.8.2-r1 new file mode 100644 index 000000000000..7e3137b5e787 --- /dev/null +++ b/dev-java/junit/files/digest-junit-3.8.2-r1 @@ -0,0 +1,3 @@ +MD5 9b8963ba2147a64bd5f1574b6fd289cb junit3.8.2.zip 461426 +RMD160 c66d64d8aa738460490e62fd332c112076d9b662 junit3.8.2.zip 461426 +SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a junit3.8.2.zip 461426 diff --git a/dev-java/junit/files/junit-3.8.2-build.xml b/dev-java/junit/files/junit-3.8.2-build.xml index ff5ec0fc80ae..4e47d949bdaf 100644 --- a/dev-java/junit/files/junit-3.8.2-build.xml +++ b/dev-java/junit/files/junit-3.8.2-build.xml @@ -36,11 +36,6 @@ - - - - - @@ -52,6 +47,14 @@ + + + + + + + + diff --git a/dev-java/junit/junit-3.8.1-r1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild deleted file mode 100644 index dc66d174ee05..000000000000 --- a/dev-java/junit/junit-3.8.1-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.10 2006/10/05 17:58:33 gustavoz Exp $ - -inherit java-pkg - -MY_P=${P/-/} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Simple framework to write repeatable tests" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -HOMEPAGE="http://www.junit.org/" -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="x86 ppc amd64 ppc64" -IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.3 - jikes? ( >=dev-java/jikes-1.21 ) - source? ( app-arch/zip ) - >=dev-java/ant-core-1.4 - >=app-arch/unzip-5.50-r1" -RDEPEND=">=virtual/jre-1.3" - -src_unpack() { - unpack ${A} - cd ${S} - unzip src.jar - rm -f junit.jar -} - -src_compile() { - local antflags="dist" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - ant ${antflags} || die "failed to build" -} - -src_install() { - use source && java-pkg_dosrc junit - cd ${MY_P} - java-pkg_dojar junit.jar - dodir /usr/share/ant-core/lib - dosym /usr/share/junit/lib/junit.jar /usr/share/ant-core/lib/ - java-pkg_dohtml -r README.html cpl-v10.html || die "failed to install docs" - use doc && java-pkg_dohtml -r doc javadoc -} diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild new file mode 100644 index 000000000000..0b045f893bc3 --- /dev/null +++ b/dev-java/junit/junit-3.8.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.2-r1.ebuild,v 1.1 2007/04/27 22:45:59 caster Exp $ + +JAVA_PKG_IUSE="doc source" +# because it doesn't symlink to ant-core/lib anymore +WANT_SPLIT_ANT="true" +inherit java-pkg-2 java-ant-2 + +MY_P=${P/-/} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Simple framework to write repeatable tests" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" +HOMEPAGE="http://www.junit.org/" +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip" +RDEPEND=">=virtual/jre-1.4" + +src_unpack() { + unpack ${A} + cd "${S}" + + unzip src.jar || die + rm -v *.jar || die + rm -rf javadoc ${PN}${PV} || die + cp "${FILESDIR}/${P}-build.xml" build.xml || die +} + +EANT_BUILD_TARGET="dist" + +src_install() { + use source && java-pkg_dosrc ${PN} + cd ${MY_P} + java-pkg_dojar ${PN}.jar + dohtml README.html cpl-v10.html || die + if use doc; then + dohtml -r doc || die + java-pkg_dojavadoc javadoc + fi +} diff --git a/dev-java/junit/junit-3.8.2.ebuild b/dev-java/junit/junit-3.8.2.ebuild index aa38d9a83d2b..de421dab1a40 100644 --- a/dev-java/junit/junit-3.8.2.ebuild +++ b/dev-java/junit/junit-3.8.2.ebuild @@ -1,6 +1,6 @@ -# 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/junit/junit-3.8.2.ebuild,v 1.1 2006/11/15 03:46:13 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.2.ebuild,v 1.2 2007/04/27 22:45:59 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -28,7 +28,7 @@ src_unpack() { } src_compile() { - eant dist + eant dist $(use_doc) } src_install() { -- 2.26.2