Make BSF support optional via new local USE flag and minor style tweaks; restrict test until it's at least compiling.

Package-Manager: portage-2.1.2.8

3 files changed, 41 insertions, 34 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index f8ae1655d5b2..16118ff8f531 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.23 2007/05/26 17:37:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.24 2007/05/27 20:02:16 caster Exp $
+
+  27 May 2007; Vlastimil Babka <caster@gentoo.org> groovy-1.0-r1.ebuild:
+  Make BSF support optional via new local USE flag and minor style tweaks;
+  restrict test until it's at least compiling.
 
   26 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> groovy-1.0-r1.ebuild:
   Add ~ppc.
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index f67d5f4cf382..d011811ae954 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml-1.0 6050 RMD160 fd445f4558c780d3518d5d845e993cfb5bab0762 SHA1 6312ff408db59840659768be94cc1fb3a1b18b24 SHA256 c1c67095b88ca3cb7a754a75c8a0a0c5d242371ee89036941ceacbd017392d30
 MD5 bcb9e6a7f381346030957dd4ccfb21b5 files/build.xml-1.0 6050
 RMD160 fd445f4558c780d3518d5d845e993cfb5bab0762 files/build.xml-1.0 6050
@@ -18,18 +15,18 @@ MD5 5f0b3b8d5848efe47815055e507ae196 files/groovy-1.0_rc01-compiler-exit-code.pa
 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3 files/groovy-1.0_rc01-compiler-exit-code.patch 1298
 DIST groovy-1.0-src.tar.gz 966931 RMD160 dad940d5bbe10a16686dc619a094c2cbdc0d52f1 SHA1 010a21f5694a8a35756f7c491ce0518ff954812c SHA256 63d1e47d80a31567792b65dfe19653ab98ce74a6876fb05b9423b83ecc960599
-EBUILD groovy-1.0-r1.ebuild 3289 RMD160 c3f123e2d48dc84300a79b3a4716877f022450d6 SHA1 46cf039e95c90a4a49a02041ba29d62964229bad SHA256 3e200c65acacecda36c0d7ac578160bd68491b3f03218b473d45c1d704141504
-MD5 4c964432c541fd55ce7ca4db93d83d32 groovy-1.0-r1.ebuild 3289
-RMD160 c3f123e2d48dc84300a79b3a4716877f022450d6 groovy-1.0-r1.ebuild 3289
-SHA256 3e200c65acacecda36c0d7ac578160bd68491b3f03218b473d45c1d704141504 groovy-1.0-r1.ebuild 3289
+EBUILD groovy-1.0-r1.ebuild 3795 RMD160 777cc5b34fae48af15ed9d12ab27743228e589fb SHA1 643de27a45bd27ad9c8f02f374a2434b9ff6c4dc SHA256 c92644594289a5fe033721831a4c4c47d4b507455ec6ed3a678ae0dc4d2b85ff
+MD5 aaeddd4e795fb4a948ade81be07c0a26 groovy-1.0-r1.ebuild 3795
+RMD160 777cc5b34fae48af15ed9d12ab27743228e589fb groovy-1.0-r1.ebuild 3795
+SHA256 c92644594289a5fe033721831a4c4c47d4b507455ec6ed3a678ae0dc4d2b85ff groovy-1.0-r1.ebuild 3795
 EBUILD groovy-1.0.ebuild 3297 RMD160 f8af7a10f4c6ac66b3ce813815b04c1619f77927 SHA1 2dac6ecfc38ed4920f55474b5d8f7f95e33125a8 SHA256 a04e14d533fb0915d341ec5207932ce55c0c2d74d7048501a775e80f2bb62f15
 MD5 b691de61f65c94243618e2ccc87da948 groovy-1.0.ebuild 3297
 RMD160 f8af7a10f4c6ac66b3ce813815b04c1619f77927 groovy-1.0.ebuild 3297
 SHA256 a04e14d533fb0915d341ec5207932ce55c0c2d74d7048501a775e80f2bb62f15 groovy-1.0.ebuild 3297
-MISC ChangeLog 4210 RMD160 fa7af300e69178de275e8e84c231d9e346482d0a SHA1 d19dff83e328f320422249f10ecec03f486833ff SHA256 c79fb8b2154b0a767c8f1312bb87db53a63c1f7a90328d7d0576fb1938f0cc21
-MD5 0229c1717eb297b0776868c267bed46f ChangeLog 4210
-RMD160 fa7af300e69178de275e8e84c231d9e346482d0a ChangeLog 4210
-SHA256 c79fb8b2154b0a767c8f1312bb87db53a63c1f7a90328d7d0576fb1938f0cc21 ChangeLog 4210
+MISC ChangeLog 4404 RMD160 333c4c43987835e82e3e3d9fb63b8e67bf8f3406 SHA1 53e1630585231103a244a9d5c34c0b5b636df2d4 SHA256 18f532d92f17e7ac4d2c9ea5bb2da95ab76a6e467b3f13e313dc480028eb89fa
+MD5 9d5c38001b9456bbd93129fcd85def2d ChangeLog 4404
+RMD160 333c4c43987835e82e3e3d9fb63b8e67bf8f3406 ChangeLog 4404
+SHA256 18f532d92f17e7ac4d2c9ea5bb2da95ab76a6e467b3f13e313dc480028eb89fa ChangeLog 4404
 MISC metadata.xml 830 RMD160 e44201b843377223db467fe70be144015cab7b59 SHA1 37a0746d1e2a77a17c787679a9999eb51dad7988 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab
 MD5 fa732ae92a71e90035cc94ba31d28449 metadata.xml 830
 RMD160 e44201b843377223db467fe70be144015cab7b59 metadata.xml 830
@@ -40,10 +37,3 @@ SHA256 86adb88603d4ef7218667268db25c73d92e569fd957c8789c1939949351d10ad files/di
 MD5 dae7d800484aece65ea06c5433a4a519 files/digest-groovy-1.0-r1 244
 RMD160 dcce0e075b49e04314fa12775a00066907750490 files/digest-groovy-1.0-r1 244
 SHA256 86adb88603d4ef7218667268db25c73d92e569fd957c8789c1939949351d10ad files/digest-groovy-1.0-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGWHDHgo/w9rxVVVERAkgDAJ9D8HEvveY+/O5P9kUtQXk6ZJPhcgCePXgY
-sLjFKcIa+KRk3C94zeglNeg=
-=xuKf
------END PGP SIGNATURE-----
diff --git a/dev-java/groovy/groovy-1.0-r1.ebuild b/dev-java/groovy/groovy-1.0-r1.ebuild
index f9e56bc49e94..f59ae2d6c017 100644
--- a/dev-java/groovy/groovy-1.0-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0-r1.ebuild,v 1.2 2007/05/26 17:37:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0-r1.ebuild,v 1.3 2007/05/27 20:02:16 caster Exp $
 
 inherit versionator java-pkg-2 java-ant-2
 
@@ -13,7 +13,9 @@ SRC_URI="http://dist.codehaus.org/groovy/distributions/${MY_P/JSR/jsr}-src.tar.g
 LICENSE="codehaus-groovy"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source"
+IUSE="bsf"
+# testcases won't even compile in current state
+RESTRICT="test"
 
 COMMON_DEPS="
 	=dev-java/asm-2.2*
@@ -24,27 +26,28 @@ COMMON_DEPS="
 	=dev-java/junit-3*
 	dev-java/qdox
 	>=dev-java/commons-cli-1.0
-	>=dev-java/bsf-2.3.0_rc1
 	>=dev-java/mockobjects-0.09
 	~dev-java/servletapi-2.4
 	=dev-java/mx4j-core-3.0*"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPS}"
 # FIXME doesn't compile with 1.6 due to JDBC api change
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	bsf? ( >=dev-java/bsf-2.3 )
 	${COMMON_DEPS}"
+# needs to be keyworded
+#	test? ( dev-java/jmock )
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 #	epatch ${FILESDIR}/${P}-compiler-exit-code.patch
 
-	mkdir -p ${S}/target/lib
+	mkdir -p target/lib && cd target/lib
 
-	cd ${S}/target/lib
 	java-pkg_jar-from commons-cli-1
 	java-pkg_jar-from xerces-2
 	java-pkg_jar-from ant-core ant.jar
@@ -54,11 +57,21 @@ src_unpack() {
 	java-pkg_jar-from mockobjects
 	java-pkg_jar-from junit
 	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from bsf-2.3
 	java-pkg_jar-from mx4j-core-3.0
-
-	cd ${S}
-
+#	use test && java-pkg_jar-from --build-only jmock-1.0
+	if use bsf; then
+		# build-only because it's invoked only from bsf itself
+		# so no need to pollute classpath
+		java-pkg_jar-from --build-only bsf-2.3
+	else
+		cd "${S}"
+		# remove the adapter classes
+		rm -rf src/{main,test}/org/codehaus/groovy/bsf || die
+		sed -i -e '/org.codehaus.groovy.bsf/d' -e '/BSFTest/d' \
+			src/test/AllCodehausJavaTestsSuite.java || die
+	fi
+
+	cd "${S}"
 	# We use ant NOT maven. This build.xml is generated using 'maven ant', and
 	# then the following tweaks:
 	#  - change libdir from /root/.ant/maven to target/lib
@@ -91,6 +104,10 @@ src_compile() {
 	jar uf ../../target/${MY_P}.jar  $(find -name *.class) || die "Failed to backpatch Console*.class"
 }
 
+src_test() {
+	eant test
+}
+
 src_install() {
 	java-pkg_newjar target/${MY_P}.jar
 	java-pkg_dolauncher "grok" --main org.codehaus.groovy.tools.Grok
@@ -99,7 +116,3 @@ src_install() {
 	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
 	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
 }
-
-src_test() {
-	eant test
-}