[gentoo-commits] repo/proj/guru:dev commit in: dev-java/gluegen/files/, dev-java/gluegen/

["Alessandro Barbieri" <lssndrbarbieri@gmail.com>]

commit:     171d97cb3d4767dbd9be655220810616e1a76f3b
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jul  7 15:44:25 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Jul  7 15:44:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=171d97cb

dev-java/gluegen: redo the patch

Closes: https://bugs.gentoo.org/856853
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch | 3 ++-
 dev-java/gluegen/gluegen-2.3.2.ebuild                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
index 0a06e96c5..cad139ea6 100644
--- a/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
+++ b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
@@ -1,6 +1,6 @@
 --- a/make/gluegen-cpptasks-base.xml
 +++ b/make/gluegen-cpptasks-base.xml
-@@ -1872,16 +1872,6 @@
+@@ -1779,17 +1779,6 @@
         - Helper strip.libraries for stripping off debug information
        -->
      <target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
@@ -12,6 +12,7 @@
 -          <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.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild
index d8cfd0826..eba0fc875 100644
--- a/dev-java/gluegen/gluegen-2.3.2.ebuild
+++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
@@ -64,7 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"
 
 	"${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
-	"${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
+	"${FILESDIR}/${PN}-2.3.2-dont-strip.patch"
 	"${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
 )
 EANT_BUILD_TARGET="all.no_junit"