[gentoo-commits] repo/gentoo:master commit in: net-p2p/vuze/, profiles/, net-p2p/vuze/files/

[David Seifert]

commit:     02518ec3e41bba4a3ca4cd68a4d2ce5dce23826f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:43:07 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:43:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02518ec3

net-p2p/vuze: treeclean

Closes: https://bugs.gentoo.org/857663
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-p2p/vuze/Manifest                              |   1 -
 net-p2p/vuze/files/build.xml                       |  68 --------
 net-p2p/vuze/files/vuze-4.1.0.0-pre                |  75 ---------
 .../vuze-5.3.0.0-disable-shared-plugins.patch      |  33 ----
 .../vuze/files/vuze-5.3.0.0-disable-updaters.patch |  45 ------
 net-p2p/vuze/files/vuze-5.3.0.0-java5.patch        |  11 --
 .../vuze/files/vuze-5.3.0.0-remove-classpath.patch |  10 --
 .../vuze/files/vuze-5.3.0.0-unbundle-json.patch    |  42 -----
 net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch  |  71 ---------
 net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch | 174 ---------------------
 net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch | 130 ---------------
 net-p2p/vuze/files/vuze.desktop                    |   9 --
 net-p2p/vuze/metadata.xml                          |  11 --
 net-p2p/vuze/vuze-5.7.6.0-r2.ebuild                | 147 -----------------
 profiles/package.mask                              |   6 -
 15 files changed, 833 deletions(-)

diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
deleted file mode 100644
index 4756bf87d1bb..000000000000
--- a/net-p2p/vuze/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5

diff --git a/net-p2p/vuze/files/build.xml b/net-p2p/vuze/files/build.xml
deleted file mode 100644
index 7b060c14b2f2..000000000000
--- a/net-p2p/vuze/files/build.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	
-NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compile this project successfully.
-
--->
-
-	
-<project default="jar" name="Azureus" basedir=".">
-
-   <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
-   <property name="libs.dir" value="build/libs" />
-   <property name="dist.dir" value="dist" />
-   
-   <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
-   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
-   <!-- <property name="dist.source.excludes" value="${generic.excludes} **/*.class" /> -->
-   
-   
-   <target name="init" >
-      <echo message="Building Azureus2.jar..." />
-
-      <tstamp/>
-
-      <!-- <condition property="libs.dir" value="build/libs">
-         <not>  <isset property="libs.dir" />  </not>
-      </condition> -->
-       
-      <mkdir dir="${root.dir}/${dist.dir}" />
-   </target>
-
-   
-   <target name="compile" depends="init" >
-      <path id="libs.classpath">
-         <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
-      </path>
-   
-   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-         <classpath refid="libs.classpath" />
-      </javac>
-   </target>
-
-
-   <target name="jar" depends="compile" >
-      <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-         <manifest>
-            <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
-         </manifest>
-      </jar>
-      
-      <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="." excludes="${dist.source.excludes}" /> -->
-
-   </target>
-
-
-   <target name="clean" >
-      <delete quiet="true" >
-         <fileset dir="${root.dir}/com" includes="**/*.class"/>
-         <fileset dir="${root.dir}/org" includes="**/*.class"/>
-      </delete>
-      
-      <delete dir="${root.dir}/${dist.dir}" />
-   </target>
-
-</project>
-

diff --git a/net-p2p/vuze/files/vuze-4.1.0.0-pre b/net-p2p/vuze/files/vuze-4.1.0.0-pre
deleted file mode 100644
index 505a7e704df3..000000000000
--- a/net-p2p/vuze/files/vuze-4.1.0.0-pre
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2005, Petteri Räty <betelgeuse@g.o>
-# Copyright (c) 2004, Jochen Maes <sejo@g.o>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@g.o>
-# Copyright (c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-
-# The Azureus config dir has moved
-olddotazudir="${HOME}/.Azureus"
-oldgentoocfg="${olddotazudir}/gentoo.config"
-dotazudir="${HOME}/.azureus"
-gentoocfg="${dotazudir}/gentoo.config"
-
-if [[ -f "${oldgentoocfg}" && -f "${gentoocfg}" ]]; then
-	cat > /dev/stderr <<END
-You have gentoo.config files in both 
-${dotazudir} and
-${olddotazudir}
-${olddotazudir} is deprecated and you can delete this directory.
-
-END
-fi
-
-create_initial_config() {
-	if [[ ! -e "${dotazudir}" ]] ; then
-		mkdir "${dotazudir}"
-		echo "Creating ${dotazudir}" 
-	fi
-
-	[[ ${UI} ]] && UI="swt"
-
-	echo "Creating ${gentoocfg}"
-
-	# Create the config file
-	cat > "${gentoocfg}" <<END
-# User Interface options:
-# console   - console based
-# swt       - swt (GUI) based
-UI="${UI}"
-
-# Options you want to pass to the java binary
-JAVA_OPTIONS=""
-END
-}
-
-if [[ -f "${gentoocfg}" ]] ; then
-	. "${gentoocfg}"
-	echo "using ${gentoocfg}"
-elif [[ -f "${oldgentoocfg}" ]]; then
-	. "${oldgentoocfg}"
-	echo "using ${oldgentoocfg}"
-else
-	create_initial_config
-fi
-
-if [[ -z "${UI}" && -n "${UI_OPTIONS}" ]]; then
-	echo '${UI_OPTIONS} is no longer supported. ${UI} should be used instead instead' > /dev/stderr
-	echo 'Unsetting ${UI_OPTIONS} and trying to migrate to ${UI}' > /dev/stderr
-	if [[ ${UI_OPTIONS} = *--ui=console* ]]; then
-		UI=console
-	elif [[ ${UI_OPTIONS} = *--ui=swt* ]]; then
-		UI=swt
-	else
-		echo 'Could not make $UI from $UI_OPTIONS' > /dev/stderr
-	fi
-	unset UI_OPTIONS
-fi
-
-if [[ -z "${UI}" ]]; then
-	echo '$UI not set defaulting to swt' > /dev/stderr
-	UI="swt"
-fi
-
-[[ ! -e "${dotazudir}" ]] && create_initial_config

diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
deleted file mode 100644
index b459c8b38308..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Disallow users to install into the shared plugin directory,
-which they won't have write access to.  This doesn't disable
-shared plugins, just removes the installation UI.
-
-
---- a/org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java
-+++ b/org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java
-@@ -234,13 +234,13 @@ public class IPWListPanel extends AbstractWizardPanel<InstallPluginWizard> {
-   	}
-   
- 	public boolean 
--	isNextEnabled() 
-+	isFinishEnabled()
- 	{
- 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
- 	}
- 	
--  public IWizardPanel<InstallPluginWizard> getNextPanel() {
--    return new IPWInstallModePanel(wizard,this);
-+  public IWizardPanel<InstallPluginWizard> getFinishPanel() {
-+    return new IPWFinishPanel(wizard,this);
-   }
- 	
-   public void updateList() {
-@@ -252,7 +252,7 @@ public class IPWListPanel extends AbstractWizardPanel<InstallPluginWizard> {
-       }
-     }
-     wizard.setPluginList( list );
--    wizard.setNextEnabled( isNextEnabled() );
-+    wizard.setFinishEnabled( isFinishEnabled() );
-     
-   }
- }

diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch
deleted file mode 100644
index 1bf78cf1009d..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-@@ -130,18 +130,6 @@ PluginInitializer
- 					"Magnet URI Handler",
- 					"true",
- 					"false"},
--			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
--   					"org.gudy.azureus2.update.CoreUpdateChecker", 
--   					"azbpcoreupdater", 
--   					"CoreUpdater",
--					"true",
--					"true"},
--			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
--   					"org.gudy.azureus2.update.CorePatchChecker", 
--   					"azbpcorepatcher", 
--   					"CorePatcher",
--					"true",
--					"true"},
- 	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
-    					"org.gudy.azureus2.platform.PlatformManagerPluginDelegate", 
-    					"azplatform2", 
---- a/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
-+++ b/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
-@@ -562,6 +562,10 @@ PluginUpdatePlugin
- 					}
- 				}
- 				
-+				if ( pi.getPluginState().isShared()) {
-+					continue;
-+				}
-+
- 				String	mand = pi.getPluginProperties().getProperty( "plugin.mandatory");
- 				
- 				boolean	pi_mandatory = mand != null && mand.trim().toLowerCase().equals("true");
---- a/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
-+++ b/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
-@@ -64,7 +64,7 @@ public class SWTUpdateChecker implements UpdatableComponent
-   public static void
-   initialize()
-   {
--  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
-+//  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
-   }
-   
-   public SWTUpdateChecker() {    

diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch b/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
deleted file mode 100644
index b6d2a59c43a2..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -36,7 +36,7 @@ NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compil
-          <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
-       </path>
-    
--   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-+   	<javac encoding="8859_1" srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-          <classpath refid="libs.classpath" />
-       </javac>
-    </target>

diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch b/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
deleted file mode 100644
index 290b902203a8..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -46,7 +46,6 @@ NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compil
-       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-          <manifest>
-             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
--            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
-          </manifest>
-       </jar>
-       

diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch
deleted file mode 100644
index 18d5ac7670ff..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/com/aelitis/azureus/util/ImportExportUtils.java
-+++ b/com/aelitis/azureus/util/ImportExportUtils.java
-@@ -360,7 +360,7 @@ public final class ImportExportUtils {
- 	
- 		throws IOException
- 	{
--		List	l = new JSONArray(data.length);
-+		List	l = new JSONArray();
- 		
- 		map.put( key, l );
- 		
---- a/com/aelitis/azureus/util/JSONUtils.java
-+++ b/com/aelitis/azureus/util/JSONUtils.java
-@@ -74,7 +74,7 @@ public class JSONUtils
- 	 * @since 3.0.1.5
- 	 */
- 	public static JSONObject encodeToJSONObject(Map map) {
--		JSONObject newMap = new JSONObject((int)(map.size()*1.5));
-+		JSONObject newMap = new JSONObject();
- 
- 		for (Map.Entry<String, Object> entry: ((Map<String,Object>)map).entrySet()){
- 			String key 		= entry.getKey();
-@@ -105,9 +105,7 @@ public class JSONUtils
- 	 */
- 	public static String encodeToJSON(Map map) {
- 		JSONObject jobj = encodeToJSONObject(map);		
--		StringBuilder	sb = new StringBuilder(8192);
--		jobj.toString( sb );
--		return( sb.toString());
-+		return( jobj.toString());
- 	}
- 
- 	public static String encodeToJSON(Collection list) {
-@@ -138,7 +136,7 @@ public class JSONUtils
- 	 * @since 3.0.1.5
- 	 */
- 	private static JSONArray encodeToJSONArray(Collection list) {
--		JSONArray newList = new JSONArray(list.size());
-+		JSONArray newList = new JSONArray();
- 
- 		for ( Object value: list ){
- 

diff --git a/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
deleted file mode 100644
index 6ae2301e75e3..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-index 256daff..68010b9 100644
---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-@@ -231,66 +231,6 @@ public class SWTThread {
- 			}
- 		});
- 
--		if (Constants.isOSX) {
--			
--			// On Cocoa, we get a Close trigger on display.  Need to check if all
--			// platforms send this.
--			display.addListener(SWT.Close, new Listener() {
--				public void handleEvent(Event event) {
--					UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--					if (uiFunctions != null) {
--						event.doit = uiFunctions.dispose(false, false);
--					}
--				}
--			});
--
--			String platform = SWT.getPlatform();
--			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
--			if (platform.equals("carbon")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
--					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
--
--					constructor.newInstance(new Object[] {});
--
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			} else if (platform.equals("cocoa")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
--
--					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
--					Object claObj = mGetInstance.invoke(null, new Object[0] );
--
--					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
--					if (mHookAppMenu != null) {
--						mHookAppMenu.invoke(claObj, new Object[0]);
--					}
--
--					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
--					if (mHookDocOpen != null) {
--						mHookDocOpen.invoke(claObj, new Object[0]);
--					}
--					
--					Method mIsRetinaDisplay = claObj.getClass().getMethod("isRetinaDisplay");
--					if (mIsRetinaDisplay != null) {
--						isRetinaDisplay = (Boolean) mIsRetinaDisplay.invoke(claObj);
--					}
--
--					
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			}
--		}   
--
- 		if (app != null) {
- 			app.runInSWTThread();
- 			runner = new Thread(new AERunnable() {

diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
deleted file mode 100644
index a03995d167a6..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
-index bec05e1..9588f9a 100644
---- a/com/aelitis/azureus/core/metasearch/Result.java
-+++ b/com/aelitis/azureus/core/metasearch/Result.java
-@@ -28,7 +28,7 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.Random;
- 
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.DisplayFormatters;
- import org.gudy.azureus2.core3.util.HostNameToIPResolver;
-@@ -464,6 +464,6 @@ public abstract class Result {
- 		if ( input == null ){
- 			return( null );
- 		}
--		return( Entities.HTML40.unescape( input ));
-+		return( StringEscapeUtils.unescapeHtml4( input ));
- 	}
- }
-diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-index 2d353b8..e03916b 100644
---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -22,7 +22,7 @@ package com.aelitis.azureus.core.metasearch.impl.web;
- import java.util.Date;
- import java.util.StringTokenizer;
- 
--import org.apache.commons.lang.*;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.Base32;
- import org.gudy.azureus2.core3.util.ByteFormatter;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -87,14 +87,14 @@ public class WebResult extends Result {
- 	public void setNameFromHTML(String name) {
- 		if(name != null) {
- 			name = removeHTMLTags(name);
--			this.name = Entities.HTML40.unescape(name);
-+			this.name = StringEscapeUtils.unescapeHtml4(name);
- 		}
- 	}
- 	
- 	public void setCommentsFromHTML(String comments) {
- 		if(comments != null) {
- 			comments = removeHTMLTags(comments);
--			comments = Entities.HTML40.unescape(comments);
-+			comments = StringEscapeUtils.unescapeHtml4(comments);
- 			comments = comments.replaceAll(",", "");
- 			comments = comments.replaceAll(" ", "");
- 			try{
-@@ -107,7 +107,7 @@ public class WebResult extends Result {
- 	public void setCategoryFromHTML(String category) {
- 		if(category != null) {
- 			category = removeHTMLTags(category);
--			this.category = Entities.HTML40.unescape(category).trim();
-+			this.category = StringEscapeUtils.unescapeHtml4(category).trim();
- 			/*int separator = this.category.indexOf(">");
- 			
- 			if(separator != -1) {
-@@ -136,7 +136,7 @@ public class WebResult extends Result {
- 	public void setNbPeersFromHTML(String nbPeers) {
- 		if(nbPeers != null) {
- 			nbPeers = removeHTMLTags(nbPeers);
--			String nbPeersS = Entities.HTML40.unescape(nbPeers);
-+			String nbPeersS = StringEscapeUtils.unescapeHtml4(nbPeers);
- 			nbPeersS = nbPeersS.replaceAll(",", "");
- 			nbPeersS = nbPeersS.replaceAll(" ", "");
- 			try {
-@@ -151,7 +151,7 @@ public class WebResult extends Result {
- 	public void setNbSeedsFromHTML(String nbSeeds) {
- 		if(nbSeeds != null) {
- 			nbSeeds = removeHTMLTags(nbSeeds);
--			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
-+			String nbSeedsS = StringEscapeUtils.unescapeHtml4(nbSeeds);
- 			nbSeedsS = nbSeedsS.replaceAll(",", "");
- 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
- 			try {
-@@ -166,7 +166,7 @@ public class WebResult extends Result {
- 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
- 		if(nbSuperSeeds != null) {
- 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
--			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
-+			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml4(nbSuperSeeds);
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
- 			try {
-@@ -248,7 +248,7 @@ public class WebResult extends Result {
- 	public void setPublishedDateFromHTML(String publishedDate) {
- 		if(publishedDate != null && publishedDate.length() > 0) {
- 			publishedDate = removeHTMLTags(publishedDate);
--			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
-+			String publishedDateS = StringEscapeUtils.unescapeHtml4(publishedDate).replace((char)160,(char)32);
- 			this.publishedDate = dateParser.parseDate(publishedDateS);
- 		}
- 	}
-@@ -257,7 +257,7 @@ public class WebResult extends Result {
- 	public void setSizeFromHTML(String size) {
- 		if(size != null) {
- 			size = removeHTMLTags(size);
--			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
-+			String sizeS = StringEscapeUtils.unescapeHtml4(size).replace((char)160,(char)32);
- 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
- 			//Add a space between the digits and unit if there is none
- 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
-@@ -303,7 +303,7 @@ public class WebResult extends Result {
- 	public void setVotesFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-@@ -317,7 +317,7 @@ public class WebResult extends Result {
- 	public void setVotesDownFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java
-index 2558313..8cafd8a 100644
---- a/org/gudy/azureus2/core3/util/AddressUtils.java
-+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
-@@ -592,11 +592,11 @@ AddressUtils
- 			try{
- 					// unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with -
- 				
--				char[]	encoded = to_decode.toCharArray();
-+				byte[]	encoded = to_decode.getBytes();
- 				
- 				for ( int i=0;i<encoded.length;i++){
- 					
--					char c = encoded[i];
-+					byte c = encoded[i];
- 					
- 					if ( c == '~' ){
- 						encoded[i] = '/';
-diff --git a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-index 1035997..5270c35 100644
---- a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-@@ -25,7 +25,7 @@ package org.gudy.azureus2.pluginsimpl.local.utils.xml.simpleparser;
- import javax.xml.parsers.*;
- 
- import org.xml.sax.*;
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.Constants;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -679,17 +679,8 @@ SimpleXMLParserDocumentImpl
- 		     					replacement = new String( buffer, 0, buffer_pos );
- 		     					
- 		     				}else{
--		     							     							     					
--			     				int num = Entities.HTML40.entityValue( ref );
--			     					
--		     					if ( num != -1 ){
--		     					
--		     						replacement = "&#" + num + ";";
--		     						
--		     					}else{
--		     						
--		     						replacement = new String( buffer, 0, buffer_pos );
--		     					}
-+
-+								replacement = StringEscapeUtils.escapeHtml4(ref);
- 		     				}
- 		     				
- 		     				char[] chars = replacement.toCharArray();

diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
deleted file mode 100644
index 4bcce5d5f32d..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From d960f15294c451bda338e4d9998e8d009970f380 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@×××××.com>
-Date: Fri, 18 Feb 2022 12:47:20 -0800
-Subject: [PATCH] Migrate from Log4j 1.2 to log4j-1.2-api bridge from Log4j 2
-
-Signed-off-by: Yuan Liao <liaoyuan@×××××.com>
----
- org/gudy/azureus2/ui/common/Main.java         |  7 +++---
- .../azureus2/ui/console/ConsoleInput.java     |  8 +++---
- .../azureus2/ui/console/commands/Log.java     | 25 ++++++++++---------
- 3 files changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/org/gudy/azureus2/ui/common/Main.java b/org/gudy/azureus2/ui/common/Main.java
-index 8c533fb..f93e685 100644
---- a/org/gudy/azureus2/ui/common/Main.java
-+++ b/org/gudy/azureus2/ui/common/Main.java
-@@ -43,7 +43,8 @@ import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
- import org.apache.log4j.Logger;
- import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- 
- import com.aelitis.azureus.core.*;
- import com.aelitis.azureus.core.impl.AzureusCoreSingleInstanceClient;
-@@ -113,9 +114,9 @@ public class Main {
-   public static void initRootLogger() {
-     if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
-       Appender app;
--      app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+      app = new ConsoleAppender();
-       app.setName("ConsoleAppender");
--      app.addFilter( new DenyAllFilter() );  //'log off' by default
-+      app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) );  //'log off' by default
-       Logger.getRootLogger().addAppender(app);
-     }
-   }
-diff --git a/org/gudy/azureus2/ui/console/ConsoleInput.java b/org/gudy/azureus2/ui/console/ConsoleInput.java
-index d660bbb..0559f72 100644
---- a/org/gudy/azureus2/ui/console/ConsoleInput.java
-+++ b/org/gudy/azureus2/ui/console/ConsoleInput.java
-@@ -34,8 +34,8 @@ import java.util.Vector;
- import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
- import org.apache.log4j.Logger;
--import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- import org.gudy.azureus2.core3.config.COConfigurationManager;
- import org.gudy.azureus2.core3.download.DownloadManager;
- import org.gudy.azureus2.core3.download.DownloadManagerState;
-@@ -157,9 +157,9 @@ public class ConsoleInput extends Thread {
- 				
- 		if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
- 	      Appender app;
--	      app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+	      app = new ConsoleAppender();
- 	      app.setName("ConsoleAppender");
--	      app.addFilter( new DenyAllFilter() );  //'log off' by default
-+	      app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) );  //'log off' by default
- 	      Logger.getRootLogger().addAppender(app);
- 	    }
- 		
-diff --git a/org/gudy/azureus2/ui/console/commands/Log.java b/org/gudy/azureus2/ui/console/commands/Log.java
-index 43f66d5..8e9b222 100644
---- a/org/gudy/azureus2/ui/console/commands/Log.java
-+++ b/org/gudy/azureus2/ui/console/commands/Log.java
-@@ -18,10 +18,13 @@ import org.apache.commons.cli.Option;
- import org.apache.commons.cli.Options;
- import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
--import org.apache.log4j.FileAppender;
- import org.apache.log4j.Logger;
- import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.AppenderWrapper;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.log4j.bridge.LayoutAdapter;
-+import org.apache.logging.log4j.core.appender.FileAppender;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- import org.gudy.azureus2.plugins.PluginInterface;
- import org.gudy.azureus2.plugins.logging.LoggerChannel;
- import org.gudy.azureus2.plugins.logging.LoggerChannelListener;
-@@ -54,7 +57,7 @@ public class Log extends OptionsConsoleCommand {
- 			String subcommand = (String) args.get(0);
- 			if ("off".equalsIgnoreCase(subcommand) ) {
- 				if ( args.size() == 1 ){
--					con.addFilter(new DenyAllFilter());
-+					con.addFilter(new FilterWrapper(DenyAllFilter.newBuilder().build()));
- 					ci.out.println("> Console logging off");
- 				}else{
- 					
-@@ -81,25 +84,23 @@ public class Log extends OptionsConsoleCommand {
- 					{
- 						// send log output to a file
- 						String filename = commandLine.getOptionValue('f');
--						
--						try
--						{
--							Appender newAppender = new FileAppender(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n"), filename, true);
-+
-+							Appender newAppender = new AppenderWrapper(FileAppender.newBuilder()
-+									.setLayout(new LayoutAdapter(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n")))
-+									.withFileName(filename)
-+									.withAppend(true)
-+									.build());
- 							newAppender.setName("ConsoleAppender");
- 							Logger.getRootLogger().removeAppender(con);
- 							Logger.getRootLogger().addAppender(newAppender);
- 							ci.out.println("> Logging to filename: " + filename);
--						} catch (IOException e)
--						{
--							ci.out.println("> Unable to log to file: " + filename + ": " + e);
--						}					
- 					}
- 					else
- 					{
- 						if( ! (con instanceof ConsoleAppender) )
- 						{
- 							Logger.getRootLogger().removeAppender(con);
--							con = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+							con = new ConsoleAppender();
- 							con.setName("ConsoleAppender");
- 						    Logger.getRootLogger().addAppender(con);
- 						}
--- 
-2.34.1
-

diff --git a/net-p2p/vuze/files/vuze.desktop b/net-p2p/vuze/files/vuze.desktop
deleted file mode 100644
index cee9fcae3824..000000000000
--- a/net-p2p/vuze/files/vuze.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Vuze
-Comment=Vuze BitTorrent Client
-Exec=vuze
-Icon=vuze
-Terminal=false
-Categories=Network;
-Type=Application
-MimeType=application/x-bittorrent;

diff --git a/net-p2p/vuze/metadata.xml b/net-p2p/vuze/metadata.xml
deleted file mode 100644
index 71a06860d27c..000000000000
--- a/net-p2p/vuze/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">azureus</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
deleted file mode 100644
index 476d04539447..000000000000
--- a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-
-MY_PV=$(ver_rs 1- "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="https://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-CP_DEPEND="
-	dev-java/log4j-12-api:2
-	dev-java/log4j-core:2
-	dev-java/swt:3.8[cairo]
-	dev-java/commons-cli:1
-	dev-java/commons-text:0
-	dev-java/json-simple:0"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-# does not compile with java 11, uses classes deprecated even in java 8
-DEPEND="
-	${CP_DEPEND}
-	virtual/jdk:1.8"
-
-BDEPEND="app-arch/unzip"
-
-IDEPEND="dev-util/desktop-file-utils"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-commons-lang.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-log4j-12-api.patch
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	if [[ -f build.xml ]]; then
-		die "upstream has build.xml again, don't overwrite"
-	fi
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-src_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	default
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	local mem
-	use amd64 && mem="512"
-	use x86   && mem="448"
-	use ppc   && mem="384"
-	use ppc64 && mem="448"
-	use sparc && mem="512"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 2c9943d79703..13d8a078b8e0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -304,12 +304,6 @@ dev-python/pkgutil_resolve_name
 # Breaks reverse dependencies: bug #889694, bug #888579.
 =sys-fs/btrfs-progs-6.1.1
 
-# Volkmar W. Pogatzki <gentoo@××××××××.net> (2022-12-29)
-# Upstream is dead, last activity in Nov 2017. Does not
-# work with newer log4j, bug #857663. Use net-p2p/biglybt
-# instead. Removal on 2023-02-28.
-net-p2p/vuze
-
 # Sam James <sam@g.o> (2022-12-27)
 # Regression in listing subvolumes (no UUIDs), bug #888549
 # https://github.com/kdave/btrfs-progs/issues/562