Skip to content

Commit 1448dbf

Browse files
Nowa-AmmerlaanNowa-Ammerlaan
committed
dev-java/gluegen: also EAPI bump old version
Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
1 parent dfdd467 commit 1448dbf

7 files changed

Lines changed: 28 additions & 26 deletions

‎dev-java/gluegen/files/2.1.4-dont-strip.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a//make/gluegen-cpptasks-base.xml b//make/gluegen-cpptasks-base.xml
1+
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
22
index 8b8b82e..ec39aeb 100755
3-
--- a//make/gluegen-cpptasks-base.xml
4-
+++ b//make/gluegen-cpptasks-base.xml
3+
--- a/make/gluegen-cpptasks-base.xml
4+
+++ b/make/gluegen-cpptasks-base.xml
55
@@ -1511,17 +1511,6 @@
66
- Helper strip.libraries for stripping off debug information
77
-->

‎dev-java/gluegen/files/2.1.4-dont-test-archive.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a//make/build-test.xml b//make/build-test.xml
1+
diff --git a/make/build-test.xml b/make/build-test.xml
22
index 31dc773..e872a0a 100644
3-
--- a//make/build-test.xml
4-
+++ b//make/build-test.xml
3+
--- a/make/build-test.xml
4+
+++ b/make/build-test.xml
55
@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
66

77
<!-- updates / create the test results zip file -->

‎dev-java/gluegen/files/2.2.4-dont-copy-jars.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a//make/build.xml b//make/build.xml
1+
diff --git a/make/build.xml b/make/build.xml
22
index 55ef270..bce6d12 100644
3-
--- a//make/build.xml
4-
+++ b//make/build.xml
3+
--- a/make/build.xml
4+
+++ b/make/build.xml
55
@@ -806,12 +806,6 @@
66
</fileset>
77
</jar>

‎dev-java/gluegen/files/2.2.4-dont-strip.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a//make/gluegen-cpptasks-base.xml b//make/gluegen-cpptasks-base.xml
1+
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
22
index 8b8b82e..ec39aeb 100755
3-
--- a//make/gluegen-cpptasks-base.xml
4-
+++ b//make/gluegen-cpptasks-base.xml
3+
--- a/make/gluegen-cpptasks-base.xml
4+
+++ b/make/gluegen-cpptasks-base.xml
55
@@ -1511,17 +1511,6 @@
66
- Helper strip.libraries for stripping off debug information
77
-->

‎dev-java/gluegen/files/2.2.4-dont-test-archive.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a//make/build-test.xml b//make/build-test.xml
1+
diff --git a/make/build-test.xml b/make/build-test.xml
22
index 31dc773..e872a0a 100644
3-
--- a//make/build-test.xml
4-
+++ b//make/build-test.xml
3+
--- a/make/build-test.xml
4+
+++ b/make/build-test.xml
55
@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
66

77
<!-- updates / create the test results zip file -->

‎dev-java/gluegen/gluegen-2.1.4.ebuild‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 1999-2021 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

4-
EAPI=5
4+
EAPI=7
55

66
JAVA_PKG_IUSE="doc source test"
77
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
1515
LICENSE="BSD"
1616
SLOT="2.1"
1717
KEYWORDS="~amd64 ~x86"
18-
IUSE=""
1918

2019
COMMON_DEP="
2120
dev-java/ant-core:0
@@ -42,9 +41,15 @@ EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
4241
EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
4342
EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
4443

45-
java_prepare() {
44+
PATCHES=(
45+
"${FILESDIR}/${PV}-dont-copy-jars.patch"
46+
"${FILESDIR}/${PV}-dont-strip.patch"
47+
"${FILESDIR}/${PV}-dont-test-archive.patch"
48+
)
49+
50+
src_prepare() {
4651
rm -rf make/lib
47-
epatch "${FILESDIR}"/${PV}-*.patch
52+
default
4853
java-ant_bsfix_files "${S}/make/build-test.xml"
4954
}
5055

@@ -56,7 +61,7 @@ src_install() {
5661
java-pkg_dojar build/${PN}{,-rt}.jar
5762
java-pkg_doso build/obj/*.so
5863

59-
use doc && dohtml -r doc/manual
64+
use doc && dodoc -r doc/manual
6065
use source && java-pkg_dosrc src/java/*
6166

6267
# for building jogl

‎dev-java/gluegen/gluegen-2.2.4.ebuild‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@ EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
4242
EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
4343

4444
PATCHES=(
45-
"${FILESDIR}/2.1.4-dont-copy-jars.patch"
46-
"${FILESDIR}/2.1.4-dont-strip.patch"
47-
"${FILESDIR}/2.1.4-dont-test-archive.patch"
48-
#"${FILESDIR}/2.2.4-dont-copy-jars.patch"
49-
#"${FILESDIR}/2.2.4-dont-strip.patch"
50-
#"${FILESDIR}/2.2.4-dont-test-archive.patch"
45+
"${FILESDIR}/${PV}-dont-copy-jars.patch"
46+
"${FILESDIR}/${PV}-dont-strip.patch"
47+
"${FILESDIR}/${PV}-dont-test-archive.patch"
5148
)
5249

5350
src_prepare() {

0 commit comments

Comments
 (0)