gentoo auto-resync : 05:01:2023 - 12:08:57

4 files changed, 43 insertions, 5 deletions

diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
index 88c241b3da65..4f943fac128d 100644
--- a/net-p2p/biglybt/Manifest
+++ b/net-p2p/biglybt/Manifest
@@ -1,3 +1,5 @@
+AUX biglybt-3.2.0.0-disable-SWTUpdateChecker.patch 407 BLAKE2B 63b34dfc13d2c3a6002b66da1bf652a7e98b0f4c92d48d1af90001742cebc0ba89c81c72f5c8d81bb29c6f7a5fb412b00dc1a18daf9f5ab6601e446e49b030c0 SHA512 87743e1a437d15e929b51b67bd5fb329ce67fc44f93c3172634056fe52d575db22102d915d9507df9644c4f800e399fed2cb327f0451eb6506c27e5bf776f2f6
+AUX biglybt-3.2.0.0-disable-shared-plugins.patch 553 BLAKE2B b4844e817c76ddb03ac1f029d4c3626483d02fc81460e8f028719e9252e4b74765db04e2c0e0561dd9237ecbf6687ef93a5c75fed58342f259839935af5e976e SHA512 5f8eeb6caf6b719b77f3b2d7857723335b0dbe8c5c4e09454471ed10e6ad01a82f566e9a42614b65821d5c33e44eb958d6933ffb1d30025512a75114346a6b45
 DIST biglybt-3.2.0.0.tar.gz 34985099 BLAKE2B 385a6cf4f89b0922f06a2a5c7e89a4c9b717922f491717ade3cb13251c88e497cd2f807fa67ce3384bc3fcf3f37af368d20c2bb8984eff9d4237519d2be0f89d SHA512 0a39243271153758482ac3eaef50e4a83464cf67779b531fb29d7289fa49f2ec7dbe5c1c9de1d6b3bed555a6c581c4e95563e333aad4a9e32cf158db1325fef0
-EBUILD biglybt-3.2.0.0.ebuild 2781 BLAKE2B 4377f5a4e4b3f46cf1ccffd1b4866660b80899467ac1cef2cc25b543857ba63252f9f8cefaca5238c392e6b5ee57a1944181bba981789942a87d298a71431116 SHA512 db80eadc94e69a50bae647b99ab2c14a3f14af58c14ce3bba896ffe9dfc9233271b9769556b1291e8fb3b2f810424b98aa3dbca0ed6d4b7f3cc172b0109a74de
+EBUILD biglybt-3.2.0.0-r1.ebuild 3236 BLAKE2B 04a491dc4a8c1e13bddafab9d4a045ec4f7c39a7fcd3d5754982e851d2a19bf56fe6f389671b7d4a279df3e1bb5476fb83cfad229a60f4e0f4bb7b6be01aa136 SHA512 46052bb811a1c2b02cfb3cbd883f1d98628dcd418a1c14dedcc7efa37b3f33b70988bc6e6ce178358445981beebe5d7eb4fec84b170db11ebf1386ea91414eb4
 MISC metadata.xml 303 BLAKE2B 50bccebf39b34f65100881ac87064f02f74e3e896b0acdd31ce764736d51e87c2d86b27c7476bc520cc6a23f8b2d105cd22a0cde40be20bb09b2df4225114842 SHA512 88e1418a7184746f6f6a8eb49451f2b34923ee6770191acf2b776ade8b91e50d659b8ed2f2a48f5c61558a64f0959cfcf9b73bcd1e5a44e8cea44b77227229d5
diff --git a/net-p2p/biglybt/biglybt-3.2.0.0.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild
index 1bc1a2708f1c..dfe931337994 100644
--- a/net-p2p/biglybt/biglybt-3.2.0.0.ebuild
+++ b/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -35,8 +35,11 @@ CP_DEPEND="
 # test? org.assertj:assertj-core:3.12.1 -> !!!suitable-mavenVersion-not-found!!!
 # test? org.junit.jupiter:junit-jupiter:5.4.0 -> !!!groupId-not-found!!!
 
+# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8
+# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \
+# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 "
 
@@ -53,13 +56,18 @@ DOCS=(
 	TRANSLATE.md
 )
 
+PATCHES=(
+	"${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
+	"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
+)
+
 S="${WORKDIR}/BiglyBT-${PV}"
 
 src_prepare() {
 	default
-	# This directory would break compilation with jdk >= 11
+	# AENameServiceDescriptor fails to compile with jdk >= 11
 	# "error: package sun.net.spi.nameservice does not exist"
-	rm -r core/src/com/biglybt/core/util/spi || die
+	rm -r core/src/com/biglybt/core/util/spi/AENameServiceDescriptor.java || die
 
 	cp -r core/{src,resources} || die
 	find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch
new file mode 100644
index 000000000000..b801a20c93c2
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch
@@ -0,0 +1,10 @@
+--- a/uis/src/com/biglybt/ui/swt/updater2/SWTUpdateChecker.java
++++ b/uis/src/com/biglybt/ui/swt/updater2/SWTUpdateChecker.java
+@@ -65,7 +65,6 @@ public class SWTUpdateChecker implements UpdatableComponent
+   public static void
+   initialize()
+   {
+-  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
+   }
+ 
+   public SWTUpdateChecker() {
diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch
new file mode 100644
index 000000000000..fe110d590692
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch
@@ -0,0 +1,18 @@
+--- a/uis/src/com/biglybt/ui/swt/plugininstaller/IPWFilePanel.java
++++ b/uis/src/com/biglybt/ui/swt/plugininstaller/IPWFilePanel.java
+@@ -162,12 +162,12 @@ public class IPWFilePanel extends AbstractWizardPanel<InstallPluginWizard> {
+   }
+   
+ 	public boolean 
+-	isNextEnabled() 
++	isFinishEnabled()
+ 	{
+ 	   return valid;
+ 	}
+ 	
+-	public IWizardPanel<InstallPluginWizard> getNextPanel() {
+-	   return new IPWInstallModePanel(wizard,this);
++	public IWizardPanel<InstallPluginWizard> getFinishPanel() {
++	   return new IPWFinishPanel(wizard,this);
+ 	}
+ }