[gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/

[Justin Lecher]

commit:     fe9c5238ac0624b802e0adc16a33d137985269fb
Author:     Johann Schmitz <johann <AT> j-schmitz <DOT> net>
AuthorDate: Sat Jan  4 07:26:56 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 07:26:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe9c5238

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

---
 dev-java/gluegen/ChangeLog                         | 12 +++-
 .../gluegen/files/2.1.4_p1-dont-copy-jars.patch    | 17 +++++
 dev-java/gluegen/files/2.1.4_p1-dont-strip.patch   | 22 +++++++
 dev-java/gluegen/gluegen-2.1.4_p1.ebuild           | 74 ++++++++++++++++++++++
 4 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index 8b5ba2a..6f31ba0 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@g.o>
+  +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@g.o> gluegen-2.0_rc8.ebuild,
   metadata.xml:
   Keyworded for ~x86
@@ -31,4 +40,3 @@
   14 May 2012; Sébastien Fabbro <bicatali@g.o>
   +gluegen-20080421.ebuild, +metadata.xml:
   import from the java overlay
-

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 0000000..dca10dc
--- /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 0000000..02020d2
--- /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 0000000..796839c
--- /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
+}