dev-java/gluegen: rework ebuild starting from 2.1.4

Package-Manager: portage-2.2.18

6 files changed, 79 insertions, 43 deletions

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index c8a71e9d7..4982a6bbb 100644
--- a/dev-java/gluegen/ChangeLog
+++ b/dev-java/gluegen/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
+  +files/2.2.4-dont-copy-jars.patch, +files/2.2.4-dont-strip.patch,
+  +files/2.2.4-dont-test-archive.patch, gluegen-2.2.4.ebuild:
+  dev-java/gluegen: rework ebuild starting from 2.1.4
+
 *gluegen-2.2.4 (03 Apr 2015)
 
   03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/dev-java/gluegen/Manifest b/dev-java/gluegen/Manifest
index 69ccac4ca..763f377fd 100644
--- a/dev-java/gluegen/Manifest
+++ b/dev-java/gluegen/Manifest
@@ -1,4 +1,4 @@
 DIST gluegen-2.1.4.tar.gz 42235490 SHA256 18826c58b136dc44089346791e6ed57c7e2828a1ee4d6279d15e26cb12c2b926 SHA512 196478de92686b168d6f35e2e7141a31f682d22a7f96b5bc84d46905c42eb5bf25bacd74ccc51975fc7894e2e0ba2e236a4a68c101bbabaaa5193e4bdc50f607 WHIRLPOOL c05e723d85021f464d49b48fc2a0f11e5979d42355e6ac0d7437c40407d34829d5a531bf2687d47fa29cd8affd14d400a333fe90624a7ecda832a1cf76696440
+DIST gluegen-2.2.4.tar.gz 43113191 SHA256 e931cf9924076a9cbf8ea040f8f5ab22edb9eed3c56f35806c8508fac0b70cc9 SHA512 53e973ca8478f4513f9662d1375406af95f2181dae3fb3e3247e4752960e60e741f7eae36981967dba10ac7bc3dc0e85c159c193323c177ce733a9eb0540b98b WHIRLPOOL 62aa65b0cea7eb9186e6aaf90b9c453656327b1a1562d0ec7ac91deaf91f4a3213bd52862ca792878cae9ea2e22ea94cf0b22dd117bac0535abe954fdc71318b
 DIST gluegen-20080421.tar.bz2 1044951 SHA256 15ef8f499afc2256615bf453b318fbc22fbe146293ca4c6ca87c98577bf5a026 SHA512 3bffb55ec8723ac452b38d41f1bc596ee3065b1f791b8c7aec06d8acffdfd83d81553d9090fc273b56fa748b501f3a25f8dc4736bad291bc77f15d211957470d WHIRLPOOL 6171345011955517e84c9b82d187e2fe0c96fc1733ee6427248159fd8456472ea15c9cd223bd784a33478a4cfc568ddcfd73ea0addd13daa1b483b7a8cfe66c1
 DIST gluegen-v2.0-rc8.tar.7z 35196696 SHA256 8cae313dfe03d13cdd165aa7d9e698897affae290e7ce7c4a27479fe6522c0dc SHA512 9845246f9776139cd205f197203349eba28150d5018bd086e6f7484df765b4cd122d78fbf836780a10b0d6395c645eb8ec7a256b8f832453c0b20155a11b3a0f WHIRLPOOL 427d6ef990a0702b81a4f62a74dce628594144507392cb8d25b5af5cbeca186faef987c809eeb1faf5d99b8f867213c7786d43f4418f85d04ac68d96595b83b3
-DIST gluegen-v2.2.4.tar.7z 39334025 SHA256 6ad7b35f7c8fc81ec57d986f54b93c5c93127cd6c2b0efc2fb3950022feb15da SHA512 2062924428e8be83a51c3d73ed8e17df45ad4ea1d9a3e03ce2cd55c960229f463f9bdddc3db91728207ae86364b8edba9391dff22e6d42a4b97e41329d2e51bb WHIRLPOOL 51937261ebdc86b03089ee6090f853e92207c6324c693aa4c676eda2c5e1aea8b03b77fd3b35115a2738f5eb241a165b79fbf20676c77de61bb0669889c5a5bd
diff --git a/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
new file mode 100644
index 000000000..dca10dce8
--- /dev/null
+++ b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
@@ -0,0 +1,17 @@
+diff --git a/gluegen-2.1.4_rc01/make/build.xml b/gluegen-2.1.4_rc01/make/build.xml
+index 55ef270..bce6d12 100644
+--- a/gluegen-2.1.4_rc01/make/build.xml
++++ b/gluegen-2.1.4_rc01/make/build.xml
+@@ -806,12 +806,6 @@
+       </fileset>
+     </jar>
+ 
+-    <!-- Copy antlr.jar into build directory for convenience so
+-         gluegen.jar can be run via "java -jar". antlr.jar is
+-         referenced via a Class-Path entry in the Manifest of
+-         gluegen.jar. -->
+-    <copy file="${antlr.jar}" todir="${build}" />
+-    
+     <!-- copy a jnlp with empty codebase into build folder for local testing 
+          overwrite property in gluegen.proerpties if desired             -->
+     <property name="gluegen.jnlp.codebase" value=""/>
diff --git a/dev-java/gluegen/files/2.2.4-dont-strip.patch b/dev-java/gluegen/files/2.2.4-dont-strip.patch
new file mode 100644
index 000000000..02020d2ae
--- /dev/null
+++ b/dev-java/gluegen/files/2.2.4-dont-strip.patch
@@ -0,0 +1,22 @@
+diff --git a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml
+index 8b8b82e..ec39aeb 100755
+--- a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml
++++ b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml
+@@ -1511,17 +1511,6 @@
+        - Helper strip.libraries for stripping off debug information
+       -->
+     <target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
+-      <echo message="Strip symbols from libs in ${libdir}" />
+-      <apply dir="${libdir}" executable="${c.strip.tool}" parallel="false" 
+-             failonerror="true">
+-        <arg line="${c.strip.args}"/>
+-        <fileset dir="${libdir}">
+-          <include name="**/*.so"/>     <!-- unix    -->
+-          <include name="**/*.dll"/>    <!-- windows -->
+-          <include name="**/*.dylib"/>  <!-- macosx  -->
+-          <include name="**/*.jnilib"/> <!-- macosx  -->
+-        </fileset>
+-      </apply>
+     </target>
+ 
+     <!-- ================================================================== -->
diff --git a/dev-java/gluegen/files/2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
new file mode 100644
index 000000000..3eb061f27
--- /dev/null
+++ b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
@@ -0,0 +1,16 @@
+diff --git a/gluegen-2.1.4_rc01/make/build-test.xml b/gluegen-2.1.4_rc01/make/build-test.xml
+index 31dc773..e872a0a 100644
+--- a/gluegen-2.1.4_rc01/make/build-test.xml
++++ b/gluegen-2.1.4_rc01/make/build-test.xml
+@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
+ 
+     <!-- updates / create the test results zip file -->
+     <target name="test-zip-archive" depends="init">
++    	<!--
+         <archive.7z destfile="${build}/${test.archive.name}.7z"
+                     basedir="${project.root}" 
+                     includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
++        -->
+     </target>
+ 
+ 
diff --git a/dev-java/gluegen/gluegen-2.2.4.ebuild b/dev-java/gluegen/gluegen-2.2.4.ebuild
index 3ecca4bb4..e2f5a47d3 100644
--- a/dev-java/gluegen/gluegen-2.2.4.ebuild
+++ b/dev-java/gluegen/gluegen-2.2.4.ebuild
@@ -2,24 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-###############################################################################
-# WARNING: don't add to main tree without fixing QA issues first!
-###############################################################################
-
 EAPI=5
 
-RESTRICT="test" #require jardiff
-
 JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
 
 inherit java-pkg-2 java-ant-2
-MY_PV=v"${PV}"
-MY_P="${PN}"-"${MY_PV}"
 
-DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI
-code necessary to call C libraries"
+DESCRIPTION="Automatically generate the JNI code necessary to call C libraries"
 HOMEPAGE="http://jogamp.org/gluegen/www/"
-SRC_URI="http://jogamp.org/deployment/archive/rc/${MY_PV}/archive/Sources/${MY_P}.tar.7z"
+SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2.2"
@@ -31,50 +23,34 @@ COMMON_DEP="
 	dev-java/antlr:0"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.5"
+
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.5
-	app-arch/p7zip
-	dev-java/ant-antlr:0
-	dev-java/ant-contrib:0
-	dev-java/ant-nodeps:0
 	dev-java/cpptasks:0
-	test? ( dev-java/junit:4 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-	unpack ./${MY_P}.tar
-}
-
-java_prepare() {
-	rm -rf make/lib
-}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4
+	)"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-
 EANT_BUILD_XML="make/build.xml"
-EANT_BUILD_TARGET="init gluegen.build.java gluegen.build.c tag.build"
-EANT_TEST_TARGET="junit.run"
+EANT_BUILD_TARGET="all.no_junit"
 EANT_DOC_TARGET=""
 EANT_GENTOO_CLASSPATH="antlr,ant-core"
 EANT_NEEDS_TOOLS="yes"
-EANT_ANT_TASKS="ant-antlr ant-contrib ant-nodeps cpptasks"
-
-src_configure() {
-	use test && EANT_GENTOO_CLASSPATH+=",junit-4"
-	default
-}
+EANT_TEST_TARGET="junit.run"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
+EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
 
-src_compile() {
-	# FIXME don't copy around jars
-	EANT_EXTRA_ARGS+=" -Dantlr.jar=\"$(java-pkg_getjar --build-only antlr antlr.jar)\""
-	java-pkg-2_src_compile
+java_prepare() {
+	rm -rf make/lib
+	epatch "${FILESDIR}"/${PV}-*.patch
+	java-ant_bsfix_files "${S}/make/build-test.xml"
 }
 
 src_test() {
-	EANT_EXTRA_ARGS+=" -Djunit.jar=\"$(java-pkg_getjar --build-only junit-4 junit.jar)\""
-	java-pkg-2_src_test
+	EANT_TASKS="ant-junit4" java-pkg-2_src_test
 }
 
 src_install() {