gentoo auto-resync : 14:09:2022 - 11:10:10

3 files changed, 84 insertions, 4 deletions

diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 7a403410c40b..45f04ebcb050 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -1,6 +1,7 @@
 AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a748eed64ab323bbfc33feec828d56bb9243f64ec800e9750b094e84c6347ee6c25e74d6881ab2f9b012e13f6b28a06b6 SHA512 db0496b6e826ece8db2d9bae4758134b56204982e07783986cf0406df7a3c7006a39ccb56dcd4b303bf1b1227acc43b98533546dd5957ae6334fe56e3ad63378
+AUX hyperestraier-java-11.patch 2602 BLAKE2B 718462095f4ff2746b2193cddd366de547591047eba53fc855c48be7d90069284771b2c007e4d13c80e7d11a74ae3c9ab7ffec6dcb1b86739fc81b2d1a0ffc04 SHA512 81077f319830d6ab28164cfbd5e57d89a0ddf0197135dbf71b3d33f1edc2b21e253431604122f1f82e718dae125228da57a93585d2ce9bce478ddcb8dceb17d8
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13-r1.ebuild 3597 BLAKE2B 575af47ddd4732ecd3cbdb5e8f16d4cf9287de0fe3e58a8511dfc67745b570c4aea850f1d084c0f079a2312f104b5e241c60097a0403e2031217c67a540ae32a SHA512 383d5223c9d0b1bc59450a148cd3bd58640b0f2ea984ba0053a124589baa49ff34eb91b680ffabe490dd7f692405acfc74384527f7b4597a6c58f4bd84801ac5
+EBUILD hyperestraier-1.4.13-r2.ebuild 3625 BLAKE2B 9554c2161a8b2bca6d07dd6131f3d4679c3b7eaadeccf161fc5a88ada40f0b0d5da42ded6d8b47d7d887909525d09cc49735332b252943c9d5a9683988f3666d SHA512 cd839f574b65c39ce30f6826e66e627f787fe91ca10cc2d02f03b754c9c75b0cafae8ad552963d40ce925adf35b815fffe83465f3b082ec9a45945b2ac686e1b
 MISC metadata.xml 441 BLAKE2B d0c43a24b0a988b9b5d30a7c0d002ca45587c13f166dc2b43cfabac3b4c73f78a57cbee98d5967609dcaff3bb8e25b6be2df2f6328fb6b441e5b15d3dc0ce9bf SHA512 aab164bf0b80548a5867b8347963f9bc8dde159e879fc464e8b12e9a1f7bfa0dad572d453a28ab5d0fb6169cc6238f9a2f79016ee835b0560396f1631b3f3e85
diff --git a/app-text/hyperestraier/files/hyperestraier-java-11.patch b/app-text/hyperestraier/files/hyperestraier-java-11.patch
new file mode 100644
index 000000000000..fa143fb23872
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-java-11.patch
@@ -0,0 +1,78 @@
+--- a/javanative/Database.java
++++ b/javanative/Database.java
+@@ -135,7 +135,7 @@
+   /** last happened error code */
+   private int ecode;
+   /** callback function to inform of database events */
+-  private DatabaseInformer informer;
++  private long informer;
+   //----------------------------------------------------------------
+   // constructors and finalizers
+   //----------------------------------------------------------------
+--- a/javanative/database.c
++++ b/javanative/database.c
+@@ -19,7 +19,7 @@
+ 
+ 
+ /* global variables */
+-JNIEnv *infoenv = NULL;
++static JavaVM* jvm = NULL;
+ 
+ 
+ /* private function prototypes */
+@@ -181,8 +181,8 @@
+     err = TRUE;
+   }
+   (*env)->SetLongField(env, obj, fid, 0);
+-  fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+-  if((infoobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++  fid = (*env)->GetFieldID(env, cls, "informer", "J");
++  if((infoobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+     (*env)->DeleteGlobalRef(env, infoobj);
+   (*env)->SetObjectField(env, obj, fid, NULL);
+   return err ? FALSE : TRUE;
+@@ -735,16 +735,17 @@
+     throwillarg(env);
+     return;
+   }
+-  fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+-  if((oldobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++  fid = (*env)->GetFieldID(env, cls, "informer", "J");
++  if((oldobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+     (*env)->DeleteGlobalRef(env, oldobj);
+   (*env)->SetObjectField(env, obj, fid, NULL);
+   if(!(informer = (*env)->NewGlobalRef(env, informer))){
+     throwoutmem(env);
+     return;
+   }
+-  (*env)->SetObjectField(env, obj, fid, informer);
+-  infoenv = env;
++  (*env)->SetLongField(env, obj, fid, (PTRNUM)informer);
++  if(jvm == NULL)
++    (*env)->GetJavaVM(env, &jvm);
+   est_mtdb_set_informer((ESTMTDB *)(PTRNUM)coreptr, dbinform, informer);
+ }
+ 
+@@ -767,10 +768,12 @@
+ 
+ /* callback function for database events */
+ static void dbinform(const char *message, void *opaque){
++  JNIEnv *infoenv;
+   jstring msgobj;
+   jobject opobj;
+   jclass cls;
+   jmethodID mid;
++  (*jvm)->GetEnv(jvm, (void **)&infoenv, JNI_VERSION_1_8);
+   if(!(msgobj = (*infoenv)->NewStringUTF(infoenv, message))) return;
+   opobj = (jobject)opaque;
+   cls = (*infoenv)->GetObjectClass(infoenv, opobj);
+--- a/javanative/myconf.h
++++ b/javanative/myconf.h
+@@ -69,7 +69,6 @@
+ #define CLSDOC         "estraier/Document"
+ #define CLSCOND        "estraier/Condition"
+ #define CLSDB          "estraier/Database"
+-#define CLSDBINFO      "estraier/DatabaseInformer"
+ #define CLSRES         "estraier/Result"
+ 
+ 
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
index 28d438f7c840..c6658e72af58 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI="8"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_OPTIONAL="yes"
 
 inherit autotools java-pkg-opt-2 perl-functions ruby-ng
@@ -31,6 +31,7 @@ S="${WORKDIR}/all/${P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-java-11.patch
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 )