public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2014-01-05 18:38 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-01-05 18:38 UTC (permalink / raw
  To: gentoo-commits

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@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/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
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2014-01-05 18:38 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-01-05 18:38 UTC (permalink / raw
  To: gentoo-commits

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

Don't test the zip archive (thus avoid dep to 7z)

Package-Manager: portage-2.2.7

---
 dev-java/gluegen/ChangeLog                              |  4 ++++
 dev-java/gluegen/files/2.1.4_p1-dont-test-archive.patch | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index 6f31ba0..b8d37f8 100644
--- a/dev-java/gluegen/ChangeLog
+++ b/dev-java/gluegen/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jan 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/2.1.4_p1-dont-test-archive.patch:
+  Don't test the zip archive (thus avoid dep to 7z)
+
 *gluegen-2.1.4_p1 (04 Jan 2014)
 
   04 Jan 2014; Johann Schmitz <ercpe@gentoo.org>

diff --git a/dev-java/gluegen/files/2.1.4_p1-dont-test-archive.patch b/dev-java/gluegen/files/2.1.4_p1-dont-test-archive.patch
new file mode 100644
index 0000000..3eb061f
--- /dev/null
+++ b/dev-java/gluegen/files/2.1.4_p1-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>
+ 
+ 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2014-01-08 11:20 Justin Lecher
  0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-01-08 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     bc49e2659f4620da33d1b69a0dacf335ddce03f4
Author:     Johann Schmitz <johann <AT> j-schmitz <DOT> net>
AuthorDate: Tue Jan  7 17:26:51 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 17:26:51 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc49e265

It's actually a _rc not a _p

---
 .../{2.1.4_p1-dont-copy-jars.patch => 2.1.4_rc1-dont-copy-jars.patch}   | 0
 .../files/{2.1.4_p1-dont-strip.patch => 2.1.4_rc1-dont-strip.patch}     | 0
 ...1.4_p1-dont-test-archive.patch => 2.1.4_rc1-dont-test-archive.patch} | 0
 dev-java/gluegen/{gluegen-2.1.4_p1.ebuild => gluegen-2.1.4_rc1.ebuild}  | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/gluegen/files/2.1.4_p1-dont-copy-jars.patch b/dev-java/gluegen/files/2.1.4_rc1-dont-copy-jars.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_p1-dont-copy-jars.patch
rename to dev-java/gluegen/files/2.1.4_rc1-dont-copy-jars.patch

diff --git a/dev-java/gluegen/files/2.1.4_p1-dont-strip.patch b/dev-java/gluegen/files/2.1.4_rc1-dont-strip.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_p1-dont-strip.patch
rename to dev-java/gluegen/files/2.1.4_rc1-dont-strip.patch

diff --git a/dev-java/gluegen/files/2.1.4_p1-dont-test-archive.patch b/dev-java/gluegen/files/2.1.4_rc1-dont-test-archive.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_p1-dont-test-archive.patch
rename to dev-java/gluegen/files/2.1.4_rc1-dont-test-archive.patch

diff --git a/dev-java/gluegen/gluegen-2.1.4_p1.ebuild b/dev-java/gluegen/gluegen-2.1.4_rc1.ebuild
similarity index 98%
rename from dev-java/gluegen/gluegen-2.1.4_p1.ebuild
rename to dev-java/gluegen/gluegen-2.1.4_rc1.ebuild
index 796839c..10ee5b0 100644
--- a/dev-java/gluegen/gluegen-2.1.4_p1.ebuild
+++ b/dev-java/gluegen/gluegen-2.1.4_rc1.ebuild
@@ -9,7 +9,7 @@ WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
 
 inherit java-pkg-2 java-ant-2
 
-MY_PV="${PV/_p/_rc0}"
+MY_PV="${PV/_rc/_rc0}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="A tool which automatically generates the JNI code necessary to call C libraries"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2014-02-12  5:48 Guillaume Horel
  0 siblings, 0 replies; 7+ messages in thread
From: Guillaume Horel @ 2014-02-12  5:48 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0aa4a86e87de995c3265bc9617c44abe868418
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Feb 12 05:44:44 2014 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Feb 12 05:45:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bd0aa4a8

dev-java/gluegen: dev-java/gluegen version bump

Package-Manager: portage-2.2.8-r1

---
 dev-java/gluegen/ChangeLog                                       | 9 +++++++++
 ...2.1.4_rc1-dont-copy-jars.patch => 2.1.4-dont-copy-jars.patch} | 0
 .../files/{2.1.4_rc1-dont-strip.patch => 2.1.4-dont-strip.patch} | 0
 ...rc1-dont-test-archive.patch => 2.1.4-dont-test-archive.patch} | 0
 .../gluegen/{gluegen-2.1.4_rc1.ebuild => gluegen-2.1.4.ebuild}   | 7 +------
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index b8d37f8..3eee9bc 100644
--- a/dev-java/gluegen/ChangeLog
+++ b/dev-java/gluegen/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gluegen-2.1.4 (12 Feb 2014)
+
+  12 Feb 2014; Guillaume Horel <guillaume.horel@gmail.com>
+  +files/2.1.4-dont-copy-jars.patch, +files/2.1.4-dont-strip.patch,
+  +files/2.1.4-dont-test-archive.patch, +gluegen-2.1.4.ebuild,
+  -files/2.1.4_rc1-dont-copy-jars.patch, -files/2.1.4_rc1-dont-strip.patch,
+  -files/2.1.4_rc1-dont-test-archive.patch, -gluegen-2.1.4_rc1.ebuild:
+  dev-java/gluegen: dev-java/gluegen version bump
+
   04 Jan 2014; Johann Schmitz <ercpe@gentoo.org>
   +files/2.1.4_p1-dont-test-archive.patch:
   Don't test the zip archive (thus avoid dep to 7z)

diff --git a/dev-java/gluegen/files/2.1.4_rc1-dont-copy-jars.patch b/dev-java/gluegen/files/2.1.4-dont-copy-jars.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_rc1-dont-copy-jars.patch
rename to dev-java/gluegen/files/2.1.4-dont-copy-jars.patch

diff --git a/dev-java/gluegen/files/2.1.4_rc1-dont-strip.patch b/dev-java/gluegen/files/2.1.4-dont-strip.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_rc1-dont-strip.patch
rename to dev-java/gluegen/files/2.1.4-dont-strip.patch

diff --git a/dev-java/gluegen/files/2.1.4_rc1-dont-test-archive.patch b/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
similarity index 100%
rename from dev-java/gluegen/files/2.1.4_rc1-dont-test-archive.patch
rename to dev-java/gluegen/files/2.1.4-dont-test-archive.patch

diff --git a/dev-java/gluegen/gluegen-2.1.4_rc1.ebuild b/dev-java/gluegen/gluegen-2.1.4.ebuild
similarity index 90%
rename from dev-java/gluegen/gluegen-2.1.4_rc1.ebuild
rename to dev-java/gluegen/gluegen-2.1.4.ebuild
index 10ee5b0..a11f999 100644
--- a/dev-java/gluegen/gluegen-2.1.4_rc1.ebuild
+++ b/dev-java/gluegen/gluegen-2.1.4.ebuild
@@ -9,12 +9,9 @@ WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
 
 inherit java-pkg-2 java-ant-2
 
-MY_PV="${PV/_rc/_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"
+SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2.1"
@@ -36,8 +33,6 @@ DEPEND="${COMMON_DEP}
 		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"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2015-04-03 20:25 Guillaume Horel
  0 siblings, 0 replies; 7+ messages in thread
From: Guillaume Horel @ 2015-04-03 20:25 UTC (permalink / raw
  To: gentoo-commits

commit:     365b7d96ce16ca62a8ddfd590cff1932b37064f4
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Apr  3 20:23:01 2015 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Apr  3 20:23:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=365b7d96

dev-java/gluegen: rework ebuild starting from 2.1.4

Package-Manager: portage-2.2.18

 dev-java/gluegen/ChangeLog                         |  5 ++
 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 ++++++
 dev-java/gluegen/gluegen-2.2.4.ebuild              | 60 +++++++---------------
 5 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog
index c8a71e9..4982a6b 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/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 0000000..dca10dc
--- /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 0000000..02020d2
--- /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 0000000..3eb061f
--- /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 3ecca4b..e2f5a47 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() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2021-03-03  9:20 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-03-03  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4ca808e56ce1f8f47678257e8d0a054f9ad5cc44
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar  3 09:19:45 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar  3 09:19:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4ca808e5

dev-java/gluegen: fix build, EAPI bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/gluegen/files/2.1.4-dont-copy-jars.patch    |  6 +++---
 dev-java/gluegen/files/2.1.4-dont-strip.patch        |  6 +++---
 dev-java/gluegen/files/2.1.4-dont-test-archive.patch |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-copy-jars.patch    |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-strip.patch        |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-test-archive.patch |  6 +++---
 dev-java/gluegen/gluegen-2.2.4.ebuild                | 18 +++++++++++++-----
 7 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/dev-java/gluegen/files/2.1.4-dont-copy-jars.patch b/dev-java/gluegen/files/2.1.4-dont-copy-jars.patch
index dca10dce8..6f51d6811 100644
--- a/dev-java/gluegen/files/2.1.4-dont-copy-jars.patch
+++ b/dev-java/gluegen/files/2.1.4-dont-copy-jars.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/build.xml b/gluegen-2.1.4_rc01/make/build.xml
+diff --git a/make/build.xml b/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
+--- a/make/build.xml
++++ b/make/build.xml
 @@ -806,12 +806,6 @@
        </fileset>
      </jar>

diff --git a/dev-java/gluegen/files/2.1.4-dont-strip.patch b/dev-java/gluegen/files/2.1.4-dont-strip.patch
index 02020d2ae..23f62b80b 100644
--- a/dev-java/gluegen/files/2.1.4-dont-strip.patch
+++ b/dev-java/gluegen/files/2.1.4-dont-strip.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml
+diff --git a//make/gluegen-cpptasks-base.xml b//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
+--- a//make/gluegen-cpptasks-base.xml
++++ b//make/gluegen-cpptasks-base.xml
 @@ -1511,17 +1511,6 @@
         - Helper strip.libraries for stripping off debug information
        -->

diff --git a/dev-java/gluegen/files/2.1.4-dont-test-archive.patch b/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
index 3eb061f27..183df447d 100644
--- a/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
+++ b/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/build-test.xml b/gluegen-2.1.4_rc01/make/build-test.xml
+diff --git a//make/build-test.xml b//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
+--- a//make/build-test.xml
++++ b//make/build-test.xml
 @@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
  
      <!-- updates / create the test results zip file -->

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
index dca10dce8..eed581659 100644
--- a/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/build.xml b/gluegen-2.1.4_rc01/make/build.xml
+diff --git a//make/build.xml b//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
+--- a//make/build.xml
++++ b//make/build.xml
 @@ -806,12 +806,6 @@
        </fileset>
      </jar>

diff --git a/dev-java/gluegen/files/2.2.4-dont-strip.patch b/dev-java/gluegen/files/2.2.4-dont-strip.patch
index 02020d2ae..23f62b80b 100644
--- a/dev-java/gluegen/files/2.2.4-dont-strip.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-strip.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml
+diff --git a//make/gluegen-cpptasks-base.xml b//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
+--- a//make/gluegen-cpptasks-base.xml
++++ b//make/gluegen-cpptasks-base.xml
 @@ -1511,17 +1511,6 @@
         - Helper strip.libraries for stripping off debug information
        -->

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
index 3eb061f27..183df447d 100644
--- a/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
@@ -1,7 +1,7 @@
-diff --git a/gluegen-2.1.4_rc01/make/build-test.xml b/gluegen-2.1.4_rc01/make/build-test.xml
+diff --git a//make/build-test.xml b//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
+--- a//make/build-test.xml
++++ b//make/build-test.xml
 @@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
  
      <!-- updates / create the test results zip file -->

diff --git a/dev-java/gluegen/gluegen-2.2.4.ebuild b/dev-java/gluegen/gluegen-2.2.4.ebuild
index a1992bcf2..67c6c32ac 100644
--- a/dev-java/gluegen/gluegen-2.2.4.ebuild
+++ b/dev-java/gluegen/gluegen-2.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
@@ -15,7 +15,6 @@ SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="2.2"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 COMMON_DEP="
 	dev-java/ant-core:0
@@ -42,9 +41,18 @@ 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() {
+PATCHES=(
+	"${FILESDIR}/2.1.4-dont-copy-jars.patch"
+	"${FILESDIR}/2.1.4-dont-strip.patch"
+	"${FILESDIR}/2.1.4-dont-test-archive.patch"
+	#"${FILESDIR}/2.2.4-dont-copy-jars.patch"
+	#"${FILESDIR}/2.2.4-dont-strip.patch"
+	#"${FILESDIR}/2.2.4-dont-test-archive.patch"
+)
+
+src_prepare() {
 	rm -rf make/lib
-	epatch "${FILESDIR}"/${PV}-*.patch
+	default
 	java-ant_bsfix_files "${S}/make/build-test.xml"
 }
 
@@ -56,7 +64,7 @@ src_install() {
 	java-pkg_dojar build/${PN}{,-rt}.jar
 	java-pkg_doso build/obj/*.so
 
-	use doc && dohtml -r doc/manual
+	use doc && dodoc -r doc/manual
 	use source && java-pkg_dosrc src/java/*
 
 	# for building jogl


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/
@ 2021-03-03 11:40 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-03-03 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     1448dbff949c6441a74b80805c94b66c0e01b662
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar  3 11:40:38 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar  3 11:40:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1448dbff

dev-java/gluegen: also EAPI bump old version

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/gluegen/files/2.1.4-dont-strip.patch        |  6 +++---
 dev-java/gluegen/files/2.1.4-dont-test-archive.patch |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-copy-jars.patch    |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-strip.patch        |  6 +++---
 dev-java/gluegen/files/2.2.4-dont-test-archive.patch |  6 +++---
 dev-java/gluegen/gluegen-2.1.4.ebuild                | 15 ++++++++++-----
 dev-java/gluegen/gluegen-2.2.4.ebuild                |  9 +++------
 7 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/dev-java/gluegen/files/2.1.4-dont-strip.patch b/dev-java/gluegen/files/2.1.4-dont-strip.patch
index 23f62b80b..d64c742cd 100644
--- a/dev-java/gluegen/files/2.1.4-dont-strip.patch
+++ b/dev-java/gluegen/files/2.1.4-dont-strip.patch
@@ -1,7 +1,7 @@
-diff --git a//make/gluegen-cpptasks-base.xml b//make/gluegen-cpptasks-base.xml
+diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
 index 8b8b82e..ec39aeb 100755
---- a//make/gluegen-cpptasks-base.xml
-+++ b//make/gluegen-cpptasks-base.xml
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
 @@ -1511,17 +1511,6 @@
         - Helper strip.libraries for stripping off debug information
        -->

diff --git a/dev-java/gluegen/files/2.1.4-dont-test-archive.patch b/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
index 183df447d..f03a28399 100644
--- a/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
+++ b/dev-java/gluegen/files/2.1.4-dont-test-archive.patch
@@ -1,7 +1,7 @@
-diff --git a//make/build-test.xml b//make/build-test.xml
+diff --git a/make/build-test.xml b/make/build-test.xml
 index 31dc773..e872a0a 100644
---- a//make/build-test.xml
-+++ b//make/build-test.xml
+--- a/make/build-test.xml
++++ b/make/build-test.xml
 @@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
  
      <!-- updates / create the test results zip file -->

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
index eed581659..6f51d6811 100644
--- a/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch
@@ -1,7 +1,7 @@
-diff --git a//make/build.xml b//make/build.xml
+diff --git a/make/build.xml b/make/build.xml
 index 55ef270..bce6d12 100644
---- a//make/build.xml
-+++ b//make/build.xml
+--- a/make/build.xml
++++ b/make/build.xml
 @@ -806,12 +806,6 @@
        </fileset>
      </jar>

diff --git a/dev-java/gluegen/files/2.2.4-dont-strip.patch b/dev-java/gluegen/files/2.2.4-dont-strip.patch
index 23f62b80b..d64c742cd 100644
--- a/dev-java/gluegen/files/2.2.4-dont-strip.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-strip.patch
@@ -1,7 +1,7 @@
-diff --git a//make/gluegen-cpptasks-base.xml b//make/gluegen-cpptasks-base.xml
+diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
 index 8b8b82e..ec39aeb 100755
---- a//make/gluegen-cpptasks-base.xml
-+++ b//make/gluegen-cpptasks-base.xml
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
 @@ -1511,17 +1511,6 @@
         - Helper strip.libraries for stripping off debug information
        -->

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
index 183df447d..f03a28399 100644
--- a/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
+++ b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch
@@ -1,7 +1,7 @@
-diff --git a//make/build-test.xml b//make/build-test.xml
+diff --git a/make/build-test.xml b/make/build-test.xml
 index 31dc773..e872a0a 100644
---- a//make/build-test.xml
-+++ b//make/build-test.xml
+--- a/make/build-test.xml
++++ b/make/build-test.xml
 @@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
  
      <!-- updates / create the test results zip file -->

diff --git a/dev-java/gluegen/gluegen-2.1.4.ebuild b/dev-java/gluegen/gluegen-2.1.4.ebuild
index 578be9b15..e98823dba 100644
--- a/dev-java/gluegen/gluegen-2.1.4.ebuild
+++ b/dev-java/gluegen/gluegen-2.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
@@ -15,7 +15,6 @@ SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 COMMON_DEP="
 	dev-java/ant-core:0
@@ -42,9 +41,15 @@ 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() {
+PATCHES=(
+	"${FILESDIR}/${PV}-dont-copy-jars.patch"
+	"${FILESDIR}/${PV}-dont-strip.patch"
+	"${FILESDIR}/${PV}-dont-test-archive.patch"
+)
+
+src_prepare() {
 	rm -rf make/lib
-	epatch "${FILESDIR}"/${PV}-*.patch
+	default
 	java-ant_bsfix_files "${S}/make/build-test.xml"
 }
 
@@ -56,7 +61,7 @@ src_install() {
 	java-pkg_dojar build/${PN}{,-rt}.jar
 	java-pkg_doso build/obj/*.so
 
-	use doc && dohtml -r doc/manual
+	use doc && dodoc -r doc/manual
 	use source && java-pkg_dosrc src/java/*
 
 	# for building jogl

diff --git a/dev-java/gluegen/gluegen-2.2.4.ebuild b/dev-java/gluegen/gluegen-2.2.4.ebuild
index 67c6c32ac..cd15a0c2a 100644
--- a/dev-java/gluegen/gluegen-2.2.4.ebuild
+++ b/dev-java/gluegen/gluegen-2.2.4.ebuild
@@ -42,12 +42,9 @@ EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
 EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
 
 PATCHES=(
-	"${FILESDIR}/2.1.4-dont-copy-jars.patch"
-	"${FILESDIR}/2.1.4-dont-strip.patch"
-	"${FILESDIR}/2.1.4-dont-test-archive.patch"
-	#"${FILESDIR}/2.2.4-dont-copy-jars.patch"
-	#"${FILESDIR}/2.2.4-dont-strip.patch"
-	#"${FILESDIR}/2.2.4-dont-test-archive.patch"
+	"${FILESDIR}/${PV}-dont-copy-jars.patch"
+	"${FILESDIR}/${PV}-dont-strip.patch"
+	"${FILESDIR}/${PV}-dont-test-archive.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-03-03 11:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-03 11:40 [gentoo-commits] proj/sci:master commit in: dev-java/gluegen/, dev-java/gluegen/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-03-03  9:20 Andrew Ammerlaan
2015-04-03 20:25 Guillaume Horel
2014-02-12  5:48 Guillaume Horel
2014-01-08 11:20 Justin Lecher
2014-01-05 18:38 Justin Lecher
2014-01-05 18:38 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox