From 365b7d96ce16ca62a8ddfd590cff1932b37064f4 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Fri, 3 Apr 2015 16:23:01 -0400
Subject: dev-java/gluegen: rework ebuild starting from 2.1.4

Package-Manager: portage-2.2.18
---
 dev-java/gluegen/files/2.2.4-dont-copy-jars.patch  | 17 +++++++++++++++++
 dev-java/gluegen/files/2.2.4-dont-strip.patch      | 22 ++++++++++++++++++++++
 .../gluegen/files/2.2.4-dont-test-archive.patch    | 16 ++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
 create mode 100644 dev-java/gluegen/files/2.2.4-dont-strip.patch
 create mode 100644 dev-java/gluegen/files/2.2.4-dont-test-archive.patch

(limited to 'dev-java/gluegen/files')

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>
+ 
+ 
-- 
cgit v1.2.3-65-gdbad