Version bump (bug #481582). Unbundle commons-lang. Disable installation of

shared plugins and plugin updates due to write permissions. Use most of
Fedora's patchset. Temporarily use bundled bcprov as the required version is
not in the tree and would require a downgrade. Other misc fixes. Remove old.

Signed-off-by: Ryan Hill <rhill@gentoo.org>
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

13 files changed, 547 insertions, 146 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 0cd46426d2a5..6d646523f67a 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.58 2014/03/09 03:43:42 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.59 2014/03/09 07:38:47 rhill Exp $
+
+*vuze-5.3.0.0 (09 Mar 2014)
+
+  09 Mar 2014; Ryan Hill <rhill@gentoo.org> -vuze-4.7.1.2-r1.ebuild,
+  +vuze-5.3.0.0.ebuild, +files/vuze-5.3.0.0-cache-size.patch,
+  +files/vuze-5.3.0.0-disable-osx.patch,
+  +files/vuze-5.3.0.0-disable-shared-plugins.patch,
+  +files/vuze-5.3.0.0-disable-updaters.patch,
+  +files/vuze-5.3.0.0-invalid-characters.patch,
+  +files/vuze-5.3.0.0-java5.patch, +files/vuze-5.3.0.0-remove-classpath.patch,
+  +files/vuze-5.3.0.0-unbundle-commons.patch,
+  +files/vuze-5.3.0.0-unbundle-json.patch,
+  +files/vuze-5.3.0.0-use-jdk-cipher-only.patch:
+  Version bump (bug #481582). Unbundle commons-lang. Disable installation of
+  shared plugins and plugin updates due to write permissions. Use most of
+  Fedora's patchset. Temporarily use bundled bcprov as the required version is
+  not in the tree and would require a downgrade. Other misc fixes. Remove old.
 
   09 Mar 2014; Ryan Hill <rhill@gentoo.org> metadata.xml:
   Change my email.
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch b/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch
new file mode 100644
index 000000000000..16f9ffa7374d
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-cache-size.patch
@@ -0,0 +1,11 @@
+--- a/org/gudy/azureus2/core3/config/COConfigurationManager.java
++++ b/org/gudy/azureus2/core3/config/COConfigurationManager.java
+@@ -52,7 +52,7 @@ COConfigurationManager
+ 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
+ 	
+ 	static{
+-		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
++		long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
+ 	    long mb_1			= 1*1024*1024;
+ 	    long mb_32			= 32*mb_1;
+ 	    int size = (int)(( max_mem_bytes - mb_32 )/mb_1);	    
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
new file mode 100644
index 000000000000..070dae2d7562
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
@@ -0,0 +1,60 @@
+--- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
++++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+@@ -229,57 +229,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) {
+-					event.doit = UIFunctionsManager.getUIFunctions().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]);
+-					}
+-					
+-				} 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.3.0.0-disable-shared-plugins.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
new file mode 100644
index 000000000000..b459c8b38308
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000000..1bf78cf1009d
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch
@@ -0,0 +1,45 @@
+--- 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-invalid-characters.patch b/net-p2p/vuze/files/vuze-5.3.0.0-invalid-characters.patch
new file mode 100644
index 000000000000..3ef4d808ad77
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-invalid-characters.patch
@@ -0,0 +1,24 @@
+--- a/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
++++ b/com/aelitis/azureus/core/metasearch/impl/DateParserRegex.java
+@@ -50,17 +50,17 @@ public class DateParserRegex extends DateParser {
+ 	
+ 	private static final String[] MONTHS_LIST = new String[] {
+ 		" january janvier enero januar",
+-		" february fevrier fŽvrier febrero februar",
+-		" march mars marzo marz marz mŠrz" ,
++		" february fevrier febrero februar",
++		" march mars marzo marz marz" ,
+ 		" april avril abril april ",
+ 		" may mai mayo mai",
+ 		" june juin junio juni",
+ 		" july juillet julio juli",
+-		" august aout aožt agosto august",
++		" august aout agosto august",
+ 		" september septembre septiembre september",
+ 		" october octobre octubre oktober",
+ 		" november novembre noviembre november",
+-		" december decembre dŽcembre diciembre dezember"};
++		" december decembre diciembre dezember"};
+ 	
+ 	public DateParserRegex() {
+ 		this("GMT-7",true,null);
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
new file mode 100644
index 000000000000..9b19015f3b36
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..607b84a46d51
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
@@ -0,0 +1,10 @@
+--- 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-commons.patch b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch
new file mode 100644
index 000000000000..deed0af9c7b2
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-commons.patch
@@ -0,0 +1,110 @@
+--- a/com/aelitis/azureus/core/metasearch/Result.java
++++ b/com/aelitis/azureus/core/metasearch/Result.java
+@@ -27,7 +27,7 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.Random;
+ 
+-import org.apache.commons.lang.Entities;
++import org.apache.commons.lang.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.DisplayFormatters;
+ import org.json.simple.JSONObject;
+ 
+@@ -372,6 +372,6 @@ public abstract class Result {
+ 		if ( input == null ){
+ 			return( null );
+ 		}
+-		return( Entities.HTML40.unescape( input ));
++		return( StringEscapeUtils.unescapeHtml( input ));
+ 	}
+ }
+--- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
++++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+@@ -88,14 +88,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.unescapeHtml(name);
+ 		}
+ 	}
+ 	
+ 	public void setCommentsFromHTML(String comments) {
+ 		if(comments != null) {
+ 			comments = removeHTMLTags(comments);
+-			comments = Entities.HTML40.unescape(comments);
++			comments = StringEscapeUtils.unescapeHtml(comments);
+ 			comments = comments.replaceAll(",", "");
+ 			comments = comments.replaceAll(" ", "");
+ 			try{
+@@ -108,7 +108,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.unescapeHtml(category).trim();
+ 			/*int separator = this.category.indexOf(">");
+ 			
+ 			if(separator != -1) {
+@@ -133,7 +133,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.unescapeHtml(nbPeers);
+ 			nbPeersS = nbPeersS.replaceAll(",", "");
+ 			nbPeersS = nbPeersS.replaceAll(" ", "");
+ 			try {
+@@ -148,7 +148,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.unescapeHtml(nbSeeds);
+ 			nbSeedsS = nbSeedsS.replaceAll(",", "");
+ 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -163,7 +163,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.unescapeHtml(nbSuperSeeds);
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
+ 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
+ 			try {
+@@ -230,7 +230,7 @@ public class WebResult extends Result {
+ 	public void setPublishedDateFromHTML(String publishedDate) {
+ 		if(publishedDate != null) {
+ 			publishedDate = removeHTMLTags(publishedDate);
+-			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
++			String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
+ 			this.publishedDate = dateParser.parseDate(publishedDateS);
+ 		}
+ 	}
+@@ -239,7 +239,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.unescapeHtml(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");
+@@ -285,7 +285,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.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
+@@ -299,7 +299,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.unescapeHtml(votes_str);
+ 			votes_str = votes_str.replaceAll(",", "");
+ 			votes_str = votes_str.replaceAll(" ", "");
+ 			try {
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
new file mode 100644
index 000000000000..18d5ac7670ff
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch
@@ -0,0 +1,42 @@
+--- 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.3.0.0-use-jdk-cipher-only.patch b/net-p2p/vuze/files/vuze-5.3.0.0-use-jdk-cipher-only.patch
new file mode 100644
index 000000000000..596bd825f98d
--- /dev/null
+++ b/net-p2p/vuze/files/vuze-5.3.0.0-use-jdk-cipher-only.patch
@@ -0,0 +1,41 @@
+--- a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
++++ b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
+@@ -36,7 +36,6 @@ import org.bouncycastle.crypto.CipherParameters;
+ import org.bouncycastle.crypto.encodings.PKCS1Encoding;
+ import org.bouncycastle.crypto.engines.RSAEngine;
+ import org.bouncycastle.crypto.params.ParametersWithRandom;
+-import org.bouncycastle.jce.provider.RSAUtil;
+ import org.gudy.azureus2.core3.util.Debug;
+ import org.gudy.azureus2.core3.util.RandomUtils;
+ import org.gudy.azureus2.plugins.utils.StaticUtilities;
+@@ -83,30 +82,12 @@ SecureMessageServiceClientHelper
+ 				
+ 			byte[] secret_bytes = session_key.getEncoded();
+ 			
+-			try{
+ 				Cipher	rsa_cipher = Cipher.getInstance( "RSA" );
+ 		    
+ 				rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key );
+ 		    
+ 				encryped_session_key = rsa_cipher.doFinal( secret_bytes );
+ 				
+-			}catch( Throwable e ){
+-				
+-					// fallback to the BC implementation for jdk1.4.2 as JCE RSA not available
+-				
+-				RSAEngine	eng = new RSAEngine();
+-				
+-				PKCS1Encoding	padded_eng = new PKCS1Encoding( eng );
+-				
+-	            CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
+-	            
+-	            param = new ParametersWithRandom(param, RandomUtils.SECURE_RANDOM);
+-	            
+-	            padded_eng.init( true, param );
+-				
+-				encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length);
+-			}
+-
+ 		}catch( Throwable e ){
+ 			
+ 			e.printStackTrace();
diff --git a/net-p2p/vuze/vuze-4.7.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.7.1.2-r1.ebuild
deleted file mode 100644
index 0b1abb8acf5b..000000000000
--- a/net-p2p/vuze/vuze-4.7.1.2-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.7.1.2-r1.ebuild,v 1.1 2013/08/15 16:23:14 tomwij Exp $
-
-EAPI=2
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-
-PATCHSET_VER="4.5.0.2"
-PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
-PATCHSET="${PATCHSET_DIR}.tar.bz2"
-SRC_TARBALL="Vuze_${MY_PV}_source.zip"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
-	mirror://gentoo/${PATCHSET}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of commons-lang, but modified
-# bundles parts of http://www.programmers-friend.org/
-RDEPEND="
-	dev-java/json-simple:0
-	dev-java/bcprov:1.40
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	dev-java/swt:3.7[cairo]
-	!net-p2p/azureus-bin
-	>=virtual/jre-1.5"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.5"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	unpack ${PATCHSET}
-	mkdir "${S}" && cd "${S}" || die
-	unpack ${SRC_TARBALL}
-	# this is no longer needed
-	rm "${WORKDIR}/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch" || die
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	# hopefully that's just a packaging mistake
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
-
-	### Removes OS X files and entries.
-	rm -rv "org/gudy/azureus2/platform/macosx" \
-		   "org/gudy/azureus2/ui/swt/osx" || die
-
-	### Removes Windows files.
-	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	### Removes test files.
-	rm -rv org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-
-	### Removes bouncycastle (we use our own bcprov).
-	rm -rv "org/bouncycastle" || die
-
-	### Removes bundled json
-	rm -rv "org/json" || die
-
-	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
-	### It's runtime-conditional use is thus patched out in the patchset.
-	rm -rf "org/eclipse" || die
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.7,bcprov-1.40,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	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 || die
-
-	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 via ebuilds"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration"
-	elog "options will be placed in '~/.azureus/gentoo.config'."
-	elog "If you need to change some startup options, you should"
-	elog "modify this file, rather than the startup script."
-	elog "Using this config file you can start the console UI."
-	elog
-
-	if ! has_version dev-java/swt:3.7[webkit]; then
-		elog
-		elog "Your dev-java/swt:3.7 was built without webkit support. Features such as Vuze HD Network will not work."
-		elog "Rebuild swt with USE=webkit (needs net-libs/webkit-gtk:2) to use these features."
-	fi
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.3.0.0.ebuild b/net-p2p/vuze/vuze-5.3.0.0.ebuild
new file mode 100644
index 000000000000..e38825ce8b2c
--- /dev/null
+++ b/net-p2p/vuze/vuze-5.3.0.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v 1.1 2014/03/09 07:38:47 rhill Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators "")
+MY_SRC="Vuze_${MY_PV}"
+
+DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
+HOMEPAGE="http://www.vuze.com/"
+SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# bundles parts of http://www.programmers-friend.org/
+# bundles bcprov - 1.37 required but not in the tree
+RDEPEND="
+	dev-java/commons-cli
+	dev-java/commons-lang:2.1
+	dev-java/json-simple
+	dev-java/log4j
+	dev-java/swt:3.8[cairo]
+	>=virtual/jre-1.6"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/desktop-file-utils
+	>=virtual/jdk-1.6"
+
+PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
+
+pkg_pretend() {
+	if ! has_version dev-java/swt:3.8[webkit]; then
+		echo
+		ewarn "dev-java/swt:3.8 was built without webkit support."
+		ewarn "Web features such as Vuze HD Network will be disabled."
+	fi
+}
+
+src_unpack() {
+	mkdir -p "${S}" && cd "${S}"
+	unpack ${A}
+
+	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
+	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
+	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-cache-size.patch
+	epatch "${FILESDIR}"/${P}-java5.patch
+	epatch "${FILESDIR}"/${P}-remove-classpath.patch
+	epatch "${FILESDIR}"/${P}-disable-shared-plugins.patch
+	epatch "${FILESDIR}"/${P}-disable-osx.patch
+	epatch "${FILESDIR}"/${P}-disable-updaters.patch
+	epatch "${FILESDIR}"/${P}-invalid-characters.patch
+	epatch "${FILESDIR}"/${P}-unbundle-commons.patch
+	epatch "${FILESDIR}"/${P}-unbundle-json.patch
+#	epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
+
+	# OSX / Windows
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
+	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
+	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
+
+	# 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"
+EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
+
+src_compile() {
+	local mem
+	use amd64 && mem="320"
+	use x86   && mem="192"
+	use ppc   && mem="192"
+	use ppc64 && mem="256"
+	use sparc && mem="320"
+	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
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}