From 1448dbff949c6441a74b80805c94b66c0e01b662 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 3 Mar 2021 12:40:38 +0100 Subject: dev-java/gluegen: also EAPI bump old version Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- 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(-) (limited to 'dev-java') 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} 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 @@ 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} 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() { -- cgit v1.2.3-65-gdbad