From: Jan Brinkmann Date: Tue, 4 Jan 2005 18:44:36 +0000 (+0000) Subject: two manifest only jarfiles where generated. fixed. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c281f86043c647212af81f810cf9b02d6fdf03e1;p=gentoo.git two manifest only jarfiles where generated. fixed. --- diff --git a/dev-java/mockobjects/ChangeLog b/dev-java/mockobjects/ChangeLog index a6dfbbffdb8f..54f3e6438d9a 100644 --- a/dev-java/mockobjects/ChangeLog +++ b/dev-java/mockobjects/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/mockobjects -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.7 2004/10/17 19:17:41 axxo Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.8 2005/01/04 18:44:36 luckyduck Exp $ + + 04 Jan 2005; Jan Brinkmann -files/build.xml-0.09, + +files/mockobjects-0.09-gentoo.patch, mockobjects-0.09.ebuild: + two manifest only jarfiles where generated. fixed. 17 Oct 2004; Thomas Matthijs mockobjects-0.09.ebuild: keyword x86 diff --git a/dev-java/mockobjects/Manifest b/dev-java/mockobjects/Manifest index 0e2d95f4a38b..13be3687647c 100644 --- a/dev-java/mockobjects/Manifest +++ b/dev-java/mockobjects/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 147496a12bad11327996bf9ede36369d mockobjects-0.09.ebuild 1092 -MD5 7b827cc21203f4c818f22fdad5ef4ed2 ChangeLog 838 +MD5 c5200c13933bb70b4a071e76d0eb6bc5 mockobjects-0.09.ebuild 1499 +MD5 b5468d73b09eee7f0ac478ec64f5c677 ChangeLog 1037 MD5 36090122a8b5609d65e32b1f47333b61 metadata.xml 1548 MD5 c83c1a17a4d055ee848accd6747b9094 files/digest-mockobjects-0.09 80 -MD5 31b5927825c40f5b15e4227d9be3ebc7 files/build.xml-0.09 14879 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBcsVj/rLF9B432nYRAmUCAJwLawC7r/7QdiT9CEeT95Z+KyC2TwCfbi8h -dbc2QQD1hFyHfTcju+uYVz4= -=pg1L ------END PGP SIGNATURE----- +MD5 02a51d54e27c62cdc252e29f1c3e4579 files/mockobjects-0.09-gentoo.patch 1428 diff --git a/dev-java/mockobjects/files/build.xml-0.09 b/dev-java/mockobjects/files/build.xml-0.09 deleted file mode 100644 index 511d8757353b..000000000000 --- a/dev-java/mockobjects/files/build.xml-0.09 +++ /dev/null @@ -1,427 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch new file mode 100644 index 000000000000..826f5c1051ae --- /dev/null +++ b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch @@ -0,0 +1,44 @@ +--- build.xml.orig 2005-01-04 18:34:23.272737328 +0100 ++++ build.xml 2005-01-04 19:37:21.623340728 +0100 +@@ -234,7 +234,7 @@ + + + ++ depends="compile-j2ee, jar-core, jar-jdk, jar-j2ee"/> + + + + + +@@ -401,8 +401,8 @@ + ======================================================================== + --> + ++ depends="clean, jar, javadoc, dist" ++ description="do it all (clean, jar, javadoc, dist)"> + + + +@@ -423,5 +423,12 @@ + + + ++ ++ ++ ++ ++ ++ ++ + + diff --git a/dev-java/mockobjects/mockobjects-0.09.ebuild b/dev-java/mockobjects/mockobjects-0.09.ebuild index e0978df7a3c1..ff7a754cd3c6 100644 --- a/dev-java/mockobjects/mockobjects-0.09.ebuild +++ b/dev-java/mockobjects/mockobjects-0.09.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09.ebuild,v 1.7 2004/10/17 19:17:41 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09.ebuild,v 1.8 2005/01/04 18:44:36 luckyduck Exp $ -inherit java-pkg +inherit eutils java-pkg DESCRIPTION="Test-first development process for building object-oriented software" HOMEPAGE="http://mockobjects.sf.net" @@ -10,35 +10,55 @@ SRC_URI="http://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-${PV}-gen LICENSE="Apache-1.1" SLOT="0" KEYWORDS="x86 ~ppc ~amd64" -IUSE="doc junit" -DEPEND="=dev-java/junit-3.8*" -RDEPEND="" +IUSE="doc jikes junit source" +DEPEND=">=virtual/jdk-1.4 + junit? ( =dev-java/junit-3.8* ) + jikes? ( >=dev-java/jikes-1.21 ) + source? ( app-arch/zip ) + >=dev-java/ant-core-1.6.2" +RDEPEND=">=virtual/jre-1.4" + S=${WORKDIR}/mockobjects-java-${PV} src_unpack() { unpack ${A} cd ${S} - cp ${FILESDIR}/build.xml-${PV} build.xml || die - ( + + epatch ${FILESDIR}/${P}-gentoo.patch + + if use junit; then cd lib java-pkg_jar-from junit - ) + fi mkdir -p out/jdk/classes } src_compile() { - # karltk: add jikes support soon - ant jar || die "failed to build jar" - if use doc ; then - ant javadoc || die "failed to create javadoc" + local antflags="jar" + if use doc; then + antflags="${antflags} javadoc" + fi + if use jikes; then + antflags="${antflags} -Dbuild.compiler=jikes" fi - if use junit ; then - ant junit || die "failed to run junit" + if use junit; then + antflags="${antflags} junit" fi + if use source; then + antflags="${antflags} sourcezip" + fi + ant ${antflags} || die "ant build failed" } src_install() { java-pkg_dojar out/*.jar dodoc doc/README - java-pkg_dohtml -r out/doc/javadoc/* + + if use doc; then + java-pkg_dohtml -r out/doc/javadoc/* + fi + if use source; then + dodir /usr/share/doc/${PF}/source + cp out/${PN}-src.zip ${D}/usr/share/doc/${PF}/source + fi }