Updated and polished ebuild for gluegen (dep of jogl) as per #171.

Someone needs to burrow in the cpptasks stuff to get the user's LDFLAGS passed before this ebuild can be added to the tree.

Package-Manager: portage-2.2.7

5 files changed, 124 insertions, 2 deletions

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index 8b5ba2af2..6f31ba01c 100644
--- a/dev-java/gluegen/ChangeLog
+++ b/dev-java/gluegen/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for dev-java/gluegen
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gluegen-2.1.4_p1 (04 Jan 2014)
+
+  04 Jan 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/2.1.4_p1-dont-copy-jars.patch, +files/2.1.4_p1-dont-strip.patch,
+  +gluegen-2.1.4_p1.ebuild:
+  Updated and polished ebuild for gluegen (dep of jogl) as per #171.  Someone
+  needs to burrow in the cpptasks stuff to get the user's LDFLAGS passed before
+  this ebuild can be added to the tree.
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> gluegen-2.0_rc8.ebuild,
   metadata.xml:
   Keyworded for ~x86
@@ -31,4 +40,3 @@
   14 May 2012; Sébastien Fabbro <bicatali@gentoo.org>
   +gluegen-20080421.ebuild, +metadata.xml:
   import from the java overlay
-
diff --git a/dev-java/gluegen/Manifest b/dev-java/gluegen/Manifest
index e2e2eb5d1..679f26002 100644
--- a/dev-java/gluegen/Manifest
+++ b/dev-java/gluegen/Manifest
@@ -1,3 +1,4 @@
+DIST gluegen-2.1.4_p1.tar.gz 42230983 SHA256 3e744e0527e448da0ede986162546f0fa77ce2d076f39ad0b06368d1161d3a7f SHA512 ef79cbc0622e75b2fbb762b99d1156b02541f57f3ae552cf1669277bb4a983717cadb08facf79940320e07fc6b51ceff0f7194db71e18d6a9031326b0b3ab50c WHIRLPOOL 865bec959627a3715163ac7289aced9f979b8b951e86a68a900a71df26c0eabe981df36471d58b5eb63c5df5325667f0afbf9179fca641206a68b65ae1124d50
 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.1.2.tar.7z 38625189 SHA256 6b84a60cbcf2db8082b37d8591d7a883144d07b672e8a754a407f246cfc10915 SHA512 a7c9e9c0c3850ba2be609ba0130ab42074632c5b4fdd2ff6597b2b43143f496103e762073c2f1a55e4f40a33bc13c2a82b3099d022895b85dd2dda19c9a0dc35 WHIRLPOOL eaa6a1c443c12b0b04eca86e82d5b171b9123ae760051ce4f3b7d066177553286abe7b3cca88ce3f62e3fe96dad55836ea1f08150caf235c0386853120e05398
diff --git a/dev-java/gluegen/files/2.1.4_p1-dont-copy-jars.patch b/dev-java/gluegen/files/2.1.4_p1-dont-copy-jars.patch
new file mode 100644
index 000000000..dca10dce8
--- /dev/null
+++ b/dev-java/gluegen/files/2.1.4_p1-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.1.4_p1-dont-strip.patch b/dev-java/gluegen/files/2.1.4_p1-dont-strip.patch
new file mode 100644
index 000000000..02020d2ae
--- /dev/null
+++ b/dev-java/gluegen/files/2.1.4_p1-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/gluegen-2.1.4_p1.ebuild b/dev-java/gluegen/gluegen-2.1.4_p1.ebuild
new file mode 100644
index 000000000..796839c31
--- /dev/null
+++ b/dev-java/gluegen/gluegen-2.1.4_p1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+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="${PV/_p/_rc0}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A tool which automatically generates the JNI code necessary to call C libraries"
+HOMEPAGE="http://jogamp.org/gluegen/www/"
+SRC_URI="https://github.com/sgothel/gluegen/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/antlr:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-java/cpptasks:0
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_XML="make/build.xml"
+EANT_BUILD_TARGET="all.no_junit"
+EANT_DOC_TARGET=""
+EANT_GENTOO_CLASSPATH="antlr,ant-core"
+EANT_NEEDS_TOOLS="yes"
+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"
+
+java_prepare() {
+	rm -rf make/lib
+	epatch "${FILESDIR}"/${PV}-*.patch
+	java-ant_bsfix_files "${S}/make/build-test.xml"
+}
+
+src_test() {
+	EANT_TASKS="ant-junit4" java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}{,-rt}.jar
+	java-pkg_doso build/obj/*.so
+
+	use doc && dohtml -r doc/manual
+	use source && java-pkg_dosrc src/java/*
+
+	# for building jogl
+	insinto /usr/share/${PN}-${SLOT}/make
+	doins -r make/*
+	insinto /usr/share/${PN}-${SLOT}/build
+	doins build/artifact.properties
+}