Version bump. Cleanup files, move patchsets to distfiles.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

20 files changed, 57 insertions, 743 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index c5f0b0aabda2..f706d10ad86d 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.20 2009/07/19 10:31:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.21 2009/09/29 05:36:34 caster Exp $
+
+*vuze-4.2.0.8 (28 Sep 2009)
+
+  28 Sep 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.pa
+  tch,
+  -files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch,
+  -files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.p
+  atch,
+  -files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.
+  patch,
+  -files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch,
+  vuze-3.0.4.2-r1.ebuild, -files/patches-4.1.0.0/remove-osx-platform.diff,
+  -files/patches-4.1.0.0/tableimpl-remove-win32-import.diff,
+  -files/patches-4.1.0.0/use-jdk-cipher-only.diff, vuze-4.1.0.4.ebuild,
+  -files/patches-4.2.0.0/0001-remove-osx-platform.patch,
+  -files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch,
+  -files/patches-4.2.0.0/0003-disable-core-updater.patch,
+  vuze-4.2.0.2.ebuild, -vuze-4.2.0.2-r1.ebuild, -vuze-4.2.0.4.ebuild,
+  vuze-4.2.0.4-r1.ebuild, +vuze-4.2.0.8.ebuild, -files/vuze.png:
+  Version bump. Cleanup files, move patchsets to distfiles.
 
 *vuze-4.2.0.4-r1 (19 Jul 2009)
 
diff --git a/net-p2p/vuze/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch b/net-p2p/vuze/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch
deleted file mode 100644
index e731b7bb0a43..000000000000
--- a/net-p2p/vuze/files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.patch
+++ /dev/null
@@ -1,210 +0,0 @@
---- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2007-07-30 14:13:28.000000000 +0200
-+++ Azureus_3.0.3.4_source/com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java	2007-11-02 16:46:56.000000000 +0100
-@@ -30,8 +30,6 @@
- import org.gudy.azureus2.platform.PlatformManager;
- import org.gudy.azureus2.platform.PlatformManagerFactory;
- import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
--import org.gudy.azureus2.platform.win32.access.AEWin32Access;
--import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
- import org.gudy.azureus2.update.UpdaterUtils;
- 
- import com.aelitis.azureus.core.AzureusCore;
-@@ -297,140 +295,6 @@
- 		return null;
- 	}
- 
--  private boolean restartViaEXE(PrintWriter log,
--  		String exeUpdater,
--      String[]  properties,
--      String[]  parameters,
--      String backupJavaRunString,
--      boolean update_only) 
--  {
--		String azRunner = null;
--		File fileRestart = null;
--		if (!update_only) {
--  		try {
--  			azRunner = PlatformManagerFactory.getPlatformManager().getApplicationCommandLine();
--  		} catch (PlatformManagerException e) {
--  			// TODO Auto-generated catch block
--  			e.printStackTrace();
--  		}
--		}
--
--		try {
--			int result;
--			AEWin32Access accessor = AEWin32Manager.getAccessor(true);
--			if (accessor == null) {
--				result = -123;
--			} else {
--				if (azRunner != null) {
--					// create a batch file to run the updater, then to restart azureus
--					// bceause the updater would restart azureus as administrator user
--					// and confuse the user
--					fileRestart = FileUtil.getUserFile("restart.bat");
--					String s = "title Azureus Updater Runner\r\n";
--					s += exeUpdater + " \"updateonly\"";
--					for (int i = 1; i < parameters.length; i++) {
--						s += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
--					}
--					s += "\r\n";
--					s += "start \"\" \"" + azRunner + "\"";
--					FileUtil.writeBytesAsFile(fileRestart.getAbsolutePath(), s.getBytes());
--
--					result = accessor.shellExecute(null, fileRestart.getAbsolutePath(),
--							null, SystemProperties.getApplicationPath(),
--							AEWin32Access.SW_SHOWMINIMIZED);
--				} else {
--					String execEXE = "\"-J" + getClassPath().replaceAll("\\\"", "")
--							+ "\" ";
--
--					for (int i = 0; i < properties.length; i++) {
--						execEXE += "\"-J" + properties[i].replaceAll("\\\"", "") + "\" ";
--					}
--
--					for (int i = 0; i < parameters.length; i++) {
--						execEXE += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
--					}
--
--					log.println("Launch via " + exeUpdater + " params " + execEXE);
--					result = accessor.shellExecute(null, exeUpdater, execEXE,
--							SystemProperties.getApplicationPath(), AEWin32Access.SW_NORMAL);
--				}
--			}
--
--			/*
--			 * Some results:
--			 * 0: OOM
--			 * 2: FNF
--			 * 3: Path Not Foud
--			 * 5: Access Denied (User clicked cancel on admin access dialog)
--			 * 8: OOM
--			 * 11: Bad Format
--			 * 26: Sharing Violation
--			 * 27: Association incomplete
--			 * 28: DDE Timeout
--			 * 29: DDE Fail
--			 * 30: DDE Busy
--			 * 31: No Association
--			 * 32: DLL Not found
--			 * >32: OK!
--			 */
--			log.println("   -> " + result);
--
--			if (result <= 32) {
--				String sErrorReason = "";
--				String key = null;
--
--				switch (result) {
--					case 0:
--					case 8:
--						key = "oom";
--						break;
--
--					case 2:
--						key = "fnf";
--						break;
--
--					case 3:
--						key = "pnf";
--						break;
--
--					case 5:
--						key = "denied";
--						break;
--
--					case 11:
--						key = "bad";
--						break;
--
--					case -123:
--						key = "nowin32";
--						break;
--
--					default:
--						sErrorReason = "" + result;
--						break;
--				}
--				if (key != null) {
--					sErrorReason = MessageText.getString("restart.error." + key,
--							new String[] {
--								exeUpdater,
--								SystemProperties.getApplicationPath(),
--							});
--				}
--				Logger.log(new LogAlert(false, LogAlert.AT_ERROR,
--						MessageText.getString("restart.error", new String[] {
--							sErrorReason
--						})));
--				return false;
--			}
--		} catch (Throwable f) {
--
--			f.printStackTrace(log);
--
--			return javaSpawn(log, backupJavaRunString);
--		}
--
--		return true;
--	}
-   
- 
-   // ****************** This code is copied into Restarter / Updater so make changes there too !!!
-@@ -446,57 +310,9 @@
-     String[]  parameters,
-     boolean update_only) 
-   {
--    if(Constants.isOSX){
--    	
--    	restartAzureus_OSX(log,mainClass,properties,parameters);
--    	
--    }else if( Constants.isUnix ){
--    	
-     	restartAzureus_Unix(log,mainClass,properties,parameters);
--      
--    }else{
--    	
--    	restartAzureus_win32(log,mainClass,properties,parameters,update_only);
--    }
-   }
-   
--  private void 
--  restartAzureus_win32(
--      PrintWriter log,
--    String    mainClass,
--    String[]  properties,
--    String[]  parameters,
--    boolean	update_only) 
--  {
--  	String exeUpdater = getExeUpdater(log);  // Not for Updater.java
--
--  	String exec;
--
--		//Classic restart way using Runtime.exec directly on java(w)
--		exec = "\"" + JAVA_EXEC_DIR + "javaw\" " + getClassPath() + getLibraryPath();
--
--		for (int i = 0; i < properties.length; i++) {
--			exec += properties[i] + " ";
--		}
--
--		exec += mainClass;
--
--		for (int i = 0; i < parameters.length; i++) {
--			exec += " \"" + parameters[i] + "\"";
--		}
--
--		if (exeUpdater != null) {
--			restartViaEXE(log, exeUpdater, properties, parameters, exec, update_only);
--		} else {
--			if (log != null) {
--				log.println("  " + exec);
--			}
--
--			if (!win32NativeRestart(log, exec)) {
--				javaSpawn(log, exec);
--			}
--		}
--	}
-   
- 
- 	private boolean
diff --git a/net-p2p/vuze/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch b/net-p2p/vuze/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch
deleted file mode 100644
index fc23c0cefbf8..000000000000
--- a/net-p2p/vuze/files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java	2007-10-01 14:48:00.000000000 +0200
-+++ Azureus_3.0.3.4_source/com/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java	2007-11-02 16:37:00.000000000 +0100
-@@ -64,7 +64,6 @@
- import com.aelitis.azureus.ui.swt.views.TorrentListViewListener;
- import com.aelitis.azureus.util.AdManager;
- import com.aelitis.azureus.util.Constants;
--import com.aelitis.azureus.util.win32.Win32Utils;
- 
- import org.gudy.azureus2.plugins.PluginInterface;
- import org.gudy.azureus2.plugins.PluginManager;
-@@ -602,17 +601,6 @@
- 	 * @param string
- 	 */
- 	private static boolean runInMediaPlayer(String mediaFile) {
--		if (Constants.isWindows) {
--			String wmpEXE = Win32Utils.getWMP();
--			if (new File(wmpEXE).exists()) {
--				try {
--					Runtime.getRuntime().exec(wmpEXE + " \"" + mediaFile + "\"");
--					return true;
--				} catch (IOException e) {
--					Debug.out("error playing " + mediaFile + " via WMP " + mediaFile, e);
--				}
--			}
--		}
- 		return false;
- 	}
- 
diff --git a/net-p2p/vuze/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch b/net-p2p/vuze/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch
deleted file mode 100644
index ebabaf7f7107..000000000000
--- a/net-p2p/vuze/files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Azureus_3.0.3.4_source.orig/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java	2007-07-25 13:02:00.000000000 +0200
-+++ Azureus_3.0.3.4_source/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java	2007-11-02 17:04:31.000000000 +0100
-@@ -23,7 +23,6 @@
- import java.util.Properties;
- 
- import org.gudy.azureus2.platform.unix.PlatformManagerUnixPlugin;
--import org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker;
- 
- import org.gudy.azureus2.plugins.Plugin;
- import org.gudy.azureus2.plugins.PluginException;
-@@ -45,10 +44,7 @@
- 		PlatformManager platform = PlatformManagerFactory.getPlatformManager();
- 
- 		int platformType = platform.getPlatformType();
--		if (platformType == PlatformManager.PT_WINDOWS) {
--			PlatformManagerUpdateChecker plugin = new PlatformManagerUpdateChecker();
--			plugin.initialize(pluginInterface);
--		} else if (platformType == PlatformManager.PT_UNIX) {
-+		if (platformType == PlatformManager.PT_UNIX) {
- 			PlatformManagerUnixPlugin plugin = new PlatformManagerUnixPlugin();
- 			plugin.initialize(pluginInterface);
- 		} else {
diff --git a/net-p2p/vuze/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch b/net-p2p/vuze/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch
deleted file mode 100644
index 99ea20a237fa..000000000000
--- a/net-p2p/vuze/files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Azureus_3.0.3.4_source.orig/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-01-12 13:39:24.000000000 +0100
-+++ Azureus_3.0.3.4_source/org/gudy/azureus2/platform/PlatformManagerFactory.java	2007-11-02 16:51:05.000000000 +0100
-@@ -46,23 +46,7 @@
- 			if ( platform_manager == null ){
- 										  
- 				try{
--					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
--						
--						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
--						
--					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
--						
--	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
--	                    
--					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
--						
-             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
--
--					}
--				}catch( PlatformManagerException e ){
--					
--						// exception will already have been logged
--					
- 				}catch( Throwable e ){
- 					
- 					Debug.printStackTrace(e);
diff --git a/net-p2p/vuze/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch b/net-p2p/vuze/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch
deleted file mode 100644
index b5f129cdbe08..000000000000
--- a/net-p2p/vuze/files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Azureus_3.0.3.4_source.orig/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2006-09-28 08:02:36.000000000 +0200
-+++ Azureus_3.0.3.4_source/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2007-11-02 17:14:25.000000000 +0100
-@@ -36,7 +36,7 @@
- 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.bouncycastle.jce.provider.DSAUtil;
- import org.gudy.azureus2.core3.util.Debug;
- import org.gudy.azureus2.plugins.utils.StaticUtilities;
- 
-@@ -97,7 +97,7 @@
- 				
- 				PKCS1Encoding	padded_eng = new PKCS1Encoding( eng );
- 				
--	            CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
-+	            CipherParameters param = DSAUtil.generatePublicKeyParameter(public_key);
- 	            
- 	            param = new ParametersWithRandom(param, new SecureRandom());
- 	            
diff --git a/net-p2p/vuze/files/patches-4.1.0.0/remove-osx-platform.diff b/net-p2p/vuze/files/patches-4.1.0.0/remove-osx-platform.diff
deleted file mode 100644
index 9821573e4e55..000000000000
--- a/net-p2p/vuze/files/patches-4.1.0.0/remove-osx-platform.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig	2008-07-06 22:58:18.000000000 +0200
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2008-07-06 22:59:21.000000000 +0200
-@@ -50,10 +50,6 @@
- 						
- 						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
- 						
--					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
--						
--	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
--	                    
- 					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
- 						
-             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
-@@ -89,10 +85,6 @@
- 
- 			return (PlatformManager.PT_WINDOWS );
- 
--		} else if (Constants.isOSX) {
--
--			return (PlatformManager.PT_MACOSX );
--
- 		} else if (Constants.isUnix) {
- 
- 			return (PlatformManager.PT_UNIX );
diff --git a/net-p2p/vuze/files/patches-4.1.0.0/tableimpl-remove-win32-import.diff b/net-p2p/vuze/files/patches-4.1.0.0/tableimpl-remove-win32-import.diff
deleted file mode 100644
index 91aabb4f1192..000000000000
--- a/net-p2p/vuze/files/patches-4.1.0.0/tableimpl-remove-win32-import.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/org/gudy/azureus2/ui/swt/views/table/impl/TableViewSWTImpl.java	2009-01-22 03:14:04.000000000 +0100
-+++ b/org/gudy/azureus2/ui/swt/views/table/impl/TableViewSWTImpl.java	2009-02-06 00:32:22.000000000 +0100
-@@ -29,7 +29,6 @@
- import org.eclipse.swt.dnd.*;
- import org.eclipse.swt.events.*;
- import org.eclipse.swt.graphics.*;
--import org.eclipse.swt.internal.ole.win32.COM;
- import org.eclipse.swt.layout.*;
- import org.eclipse.swt.widgets.*;
- 
diff --git a/net-p2p/vuze/files/patches-4.1.0.0/use-jdk-cipher-only.diff b/net-p2p/vuze/files/patches-4.1.0.0/use-jdk-cipher-only.diff
deleted file mode 100644
index cc5055cbd770..000000000000
--- a/net-p2p/vuze/files/patches-4.1.0.0/use-jdk-cipher-only.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.orig	2008-07-06 22:54:36.000000000 +0200
-+++ com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2008-07-06 22:56:29.000000000 +0200
-@@ -36,7 +36,6 @@
- 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.plugins.utils.StaticUtilities;
- 
-@@ -82,30 +81,12 @@
- 				
- 			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, new SecureRandom());
--	            
--	            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/files/patches-4.2.0.0/0001-remove-osx-platform.patch b/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch
deleted file mode 100644
index 4a8388bdb628..000000000000
--- a/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/org/gudy/azureus2/platform/PlatformManagerFactory.java b/org/gudy/azureus2/platform/PlatformManagerFactory.java
-index 156e5ac..b0fd283 100644
---- a/org/gudy/azureus2/platform/PlatformManagerFactory.java
-+++ b/org/gudy/azureus2/platform/PlatformManagerFactory.java
-@@ -50,10 +50,6 @@ PlatformManagerFactory
- 						
- 						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
- 						
--					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
--						
--	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
--	                    
- 					}else if( getPlatformType() == PlatformManager.PT_UNIX ){
- 						
-             platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
-@@ -89,10 +85,6 @@ PlatformManagerFactory
- 
- 			return (PlatformManager.PT_WINDOWS );
- 
--		} else if (Constants.isOSX) {
--
--			return (PlatformManager.PT_MACOSX );
--
- 		} else if (Constants.isUnix) {
- 
- 			return (PlatformManager.PT_UNIX );
--- 
-1.6.2
-
diff --git a/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch b/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch
deleted file mode 100644
index 7a57e53dee11..000000000000
--- a/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
-index f4e1754..80d931f 100644
---- 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();
--- 
-1.6.2
-
diff --git a/net-p2p/vuze/files/patches-4.2.0.0/0003-disable-core-updater.patch b/net-p2p/vuze/files/patches-4.2.0.0/0003-disable-core-updater.patch
deleted file mode 100644
index ecb2502b2cee..000000000000
--- a/net-p2p/vuze/files/patches-4.2.0.0/0003-disable-core-updater.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fe2f94e1235ddc2d24d05b58fef39e7b352e3cc1 Mon Sep 17 00:00:00 2001
-From: Caster <caster@gentoo.org>
-Date: Wed, 24 Jun 2009 14:38:23 +0200
-Subject: [PATCH 3/3] disable core updater
-
-Provided by Hanno Meyer-Thurow <h.mth@web.de> in bug #218959.
----
- .../pluginsimpl/local/PluginInitializer.java       |   12 ------------
- 1 files changed, 0 insertions(+), 12 deletions(-)
-
-diff --git a/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java b/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-index efc11e9..b450ea7 100644
---- a/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-@@ -125,18 +125,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", 
--- 
-1.6.3.1
-
diff --git a/net-p2p/vuze/files/vuze-2.5.0.0-pre b/net-p2p/vuze/files/vuze-2.5.0.0-pre
deleted file mode 100644
index 505a7e704df3..000000000000
--- a/net-p2p/vuze/files/vuze-2.5.0.0-pre
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2005, Petteri Räty <betelgeuse@gentoo.org>
-# Copyright (c) 2004, Jochen Maes <sejo@gentoo.org>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# 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.png b/net-p2p/vuze/files/vuze.png
deleted file mode 100644
index 4fa36bf9185c..000000000000
--- a/net-p2p/vuze/files/vuze.png
+++ /dev/null
diff --git a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
index 59dec92958e0..703fc2cb452d 100644
--- a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.3 2009/03/04 18:26:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.4 2009/09/29 05:36:34 caster Exp $
 
 ###
 ### @Todo The new Azureus gui requires swt built with embedded mozilla support,
@@ -19,9 +19,12 @@ JAVA_PKG_IUSE="source"
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="3.0.3.4"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -52,7 +55,7 @@ src_unpack() {
 	unpack ${A}
 
 	### Patches Azureus to use bcprov,
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/patches-3.0.3.4"
+	EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Remove an unit test we never run
 	rm -v ./org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
@@ -92,7 +95,7 @@ src_install() {
 
 	java-pkg_dolauncher "${PN}" \
 		--main "org.gudy.azureus2.ui.common.Main" \
-		-pre "${FILESDIR}/${PN}-2.5.0.0-pre"      \
+		-pre "${FILESDIR}/${PN}-4.1.0.0-pre"      \
 		--java_args '-Dazureus.install.path=${HOME}/.azureus/ ${JAVA_OPTIONS}' \
 		--pkg_args '--ui=${UI}'
 	dosym vuze /usr/bin/azureus
@@ -100,7 +103,7 @@ src_install() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=204132
 	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
 
-	doicon "${FILESDIR}/vuze.png"
+	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
 	domenu "${FILESDIR}/vuze.desktop"
 
 	use source && java-pkg_dosrc "${S}"/{com,edu,org}
diff --git a/net-p2p/vuze/vuze-4.1.0.4.ebuild b/net-p2p/vuze/vuze-4.1.0.4.ebuild
index bd7c254c11cd..5fcd5ee9f224 100644
--- a/net-p2p/vuze/vuze-4.1.0.4.ebuild
+++ b/net-p2p/vuze/vuze-4.1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild,v 1.5 2009/04/27 00:10:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild,v 1.6 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
@@ -8,9 +8,12 @@ JAVA_PKG_IUSE="source"
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="4.1.0.0"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -44,9 +47,7 @@ src_unpack() {
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.1.0.0/use-jdk-cipher-only.diff"
-	epatch "${FILESDIR}/patches-4.1.0.0/remove-osx-platform.diff"
-	epatch "${FILESDIR}/patches-4.1.0.0/tableimpl-remove-win32-import.diff"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \
diff --git a/net-p2p/vuze/vuze-4.2.0.2-r1.ebuild b/net-p2p/vuze/vuze-4.2.0.2-r1.ebuild
deleted file mode 100644
index 9ccc6fdce61c..000000000000
--- a/net-p2p/vuze/vuze-4.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2-r1.ebuild,v 1.1 2009/06/24 12:55:49 caster Exp $
-
-EAPI=2
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
-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.35:0
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	>=dev-java/swt-3.4:3.4[cairo,xulrunner]
-	!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() {
-	mkdir "${S}" && cd "${S}" || die
-	default
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.1.0.0 although it was there in 4.0.0.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 "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0003-disable-core-updater.patch"
-
-	### 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/swt/test" \
-		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
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.4,bcprov,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="256"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar || die "dojar failed"
-	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() {
-	###
-	### @Todo We should probably deactivate auto-update it by default,
-	###       or even remove the option - bug #218959
-	###
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates via portage"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "Since version 4.1.0.0, plugins that are normally bundled by upstream"
-	elog "(and auto-installed in each user's ~/.azureus if not bundled)"
-	elog "are now installed into shared plugin directory by the vuze-coreplugins ebuild."
-	elog
-	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
-	elog "It may also attempt to update some these plugins and fail to write."
-	elog "In that case look for or fill a bump bug in bugs.gentoo.org"
-	elog
-	elog "We plan to disable updater for shared components and plugins."
-	elog "See progress in bug #218959, patches welcome."
-	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
-	elog "To switch from classic UI to Vuze use"
-	elog "1: Tools > Options > Interface > Start > Display Vuze UI Chooser"
-	elog "2: Toolbar (right-hand side)"
-	elog
-	elog "If you have problems starting Vuze, try starting it"
-	elog "from the command line to look at debugging output."
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-4.2.0.2.ebuild b/net-p2p/vuze/vuze-4.2.0.2.ebuild
index f5adba675be2..08176c8de778 100644
--- a/net-p2p/vuze/vuze-4.2.0.2.ebuild
+++ b/net-p2p/vuze/vuze-4.2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild,v 1.3 2009/07/04 14:33:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild,v 1.4 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
@@ -8,9 +8,12 @@ JAVA_PKG_IUSE="source"
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="4.2.0.0"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -44,8 +47,8 @@ src_unpack() {
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
+	epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/0001-remove-osx-platform.patch"
+	epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/0002-use-jdk-cipher-only.patch"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \
diff --git a/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild b/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild
index cefa2d1593b4..f7c41c931e15 100644
--- a/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild,v 1.1 2009/07/19 10:31:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild,v 1.2 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
 JAVA_PKG_IUSE="source"
 
+PATCHSET_VER="4.2.0.0"
+
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -46,9 +49,7 @@ java_prepare() {
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0003-disable-core-updater.patch"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \
diff --git a/net-p2p/vuze/vuze-4.2.0.4.ebuild b/net-p2p/vuze/vuze-4.2.0.8.ebuild
index 285da39bc988..1455ea239e5f 100644
--- a/net-p2p/vuze/vuze-4.2.0.4.ebuild
+++ b/net-p2p/vuze/vuze-4.2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4.ebuild,v 1.1 2009/07/13 22:45:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.8.ebuild,v 1.1 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
@@ -8,9 +8,12 @@ JAVA_PKG_IUSE="source"
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="4.2.0.8"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -24,7 +27,7 @@ RDEPEND="
 	>=dev-java/bcprov-1.35:0
 	>=dev-java/commons-cli-1.0:1
 	>=dev-java/log4j-1.2.8:0
-	>=dev-java/swt-3.4:3.4[cairo,xulrunner]
+	dev-java/swt:3.5[cairo,xulrunner]
 	!net-p2p/azureus-bin
 	>=virtual/jre-1.5"
 
@@ -41,14 +44,7 @@ src_unpack() {
 }
 
 java_prepare() {
-	# build.xml disappeared from 4.1.0.0 although it was there in 4.0.0.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 "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0003-disable-core-updater.patch"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \
@@ -71,7 +67,7 @@ java_prepare() {
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.4,bcprov,json-simple,log4j,commons-cli-1"
+EANT_GENTOO_CLASSPATH="swt-3.5,bcprov,json-simple,log4j,commons-cli-1"
 
 src_compile() {
 	local mem