Migrate to split-ant; add examples USEflag, fix source installation, tweak style.

(Portage version: 2.1.2.7)

1 files changed, 13 insertions, 12 deletions

diff --git a/dev-java/mockobjects/mockobjects-0.09-r2.ebuild b/dev-java/mockobjects/mockobjects-0.09-r2.ebuild
index 5a629f45fd59..555c0e3767d0 100644
--- a/dev-java/mockobjects/mockobjects-0.09-r2.ebuild
+++ b/dev-java/mockobjects/mockobjects-0.09-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09-r2.ebuild,v 1.1 2007/01/07 16:34:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09-r2.ebuild,v 1.2 2007/05/07 16:37:30 caster Exp $
 
+JAVA_PKG_IUSE="doc examples source test"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Test-first development process for building object-oriented software"
@@ -11,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-${PV}-gen
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source test"
+IUSE=""
 
 CDEPEND="=dev-java/junit-3.8*"
 # limiting to 1.4 jdk because there's some jdk-specific tests in build.xml that end with 1.4
@@ -19,9 +20,7 @@ CDEPEND="=dev-java/junit-3.8*"
 # feel free to fix that and investigate workingness with 1.5+
 DEPEND="${CDEPEND}
 	=virtual/jdk-1.4*
-	!test? ( dev-java/ant-core )
-	test? ( dev-java/ant )
-	source? ( app-arch/zip )"
+	test? ( dev-java/ant-junit )"
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.4"
 
@@ -31,26 +30,28 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-junit.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-junit.patch"
 
-	mkdir -p out/jdk/classes
+	mkdir -p out/jdk/classes || die
 
-	cd lib
+	cd lib || die
 	java-pkg_jar-from junit
 }
 
 src_test() {
 	# doesn't seem any tests get actually run, why?
-	eant junit
+	ANT_TASKS="ant-junit" eant junit
 }
 
 src_install() {
 	java-pkg_newjar out/${PN}-alt-jdk1.4-${PV}.jar ${PN}-alt-jdk1.4.jar
 	java-pkg_newjar out/${PN}-jdk1.4-${PV}.jar ${PN}-jdk1.4.jar
 	java-pkg_newjar out/${PN}-core-${PV}.jar ${PN}-core.jar
-	dodoc doc/README
+	dodoc doc/README || die
 
 	use doc && java-pkg_dojavadoc out/doc/javadoc
-	use source && java-pkg_dosrc ${S}/src/*
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/core/com src/extensions/com \
+		src/jdk/common/com src/jdk/1.4/com
 }