Restore the stable version.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 248 insertions, 2 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 5ef57ca1cbc1..4b2a660c094b 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.1 2009/02/06 11:46:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.2 2009/02/06 11:56:14 caster Exp $
+
+*vuze-4.0.0.4 (06 Feb 2009)
+
+  06 Feb 2009; Vlastimil Babka <caster@gentoo.org>
+  +files/patches-4.0.0.4/remove-osx-platform.diff,
+  +files/patches-4.0.0.4/use-jdk-cipher-only.diff, +vuze-4.0.0.4.ebuild:
+  Restore the stable version.
 
 *vuze-4.1.0.0 (06 Feb 2009)
 *vuze-3.0.4.2-r1 (06 Feb 2009)
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index d7004f7c44f0..c90b6c32efbe 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -5,6 +5,8 @@ AUX patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch 1048 RMD160
 AUX patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.patch 1086 RMD160 59192da1d27a5aaa5fd76b5998f1ec4c0af34a9e SHA1 3338e359b7b85999171ffe09b5bca9742451c6b6 SHA256 bba8f9f9b6bb7ddf1b006514ca8e03ebd6fe6fe9dfd18e1c950d35ba22214dd4
 AUX patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.patch 1058 RMD160 60f5af39c2391f3d4c92887983a4a32adc40a5b5 SHA1 1f53db14df22eb864d7e50350d8bebb373089601 SHA256 f851491d02b0513870e5788bc0e8527f0f85d8f1d6983a035814c281d41bccc7
 AUX patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch 1074 RMD160 2c7a602e1b6aff432b4aea7e945da656e5b8e9bf SHA1 455d8ceb06601255916d8d9b9195efbb4c0c6e22 SHA256 95db5ea188c72efa7c19958ec85ec0afb1b7ce9f35a34e2d69d40f0fe2130dea
+AUX patches-4.0.0.4/remove-osx-platform.diff 923 RMD160 7cdd218a940978aa0412a6ade7807c0562450651 SHA1 73540e9f5b066de4282b61b2fdf863c8b14b936e SHA256 29854753291f0be020eb1169890bca4826cc4607e8c260408d0c3ad50fe73e63
+AUX patches-4.0.0.4/use-jdk-cipher-only.diff 1530 RMD160 744e2f1814ce3ddf85eb8f4fee92716c81497860 SHA1 95a8d09f510b127bb67ea5c2479de8ca5db2cb56 SHA256 0a87d75aaa7c3c0eaf0e71db9a9ed50aa82bcfccbcb95007ecbf16aab60fa7db
 AUX patches-4.1.0.0/remove-osx-platform.diff 923 RMD160 7cdd218a940978aa0412a6ade7807c0562450651 SHA1 73540e9f5b066de4282b61b2fdf863c8b14b936e SHA256 29854753291f0be020eb1169890bca4826cc4607e8c260408d0c3ad50fe73e63
 AUX patches-4.1.0.0/tableimpl-remove-win32-import.diff 450 RMD160 9a2a2f4f4a0dd618ae5ffcaa5dcd0adda584ad01 SHA1 725a262ca77642ad0a6a8aa5d79bcbc897e585e2 SHA256 6306f2824d3401e26e68fdc35682f14199485666dd269eea3eee54671c36f2d9
 AUX patches-4.1.0.0/use-jdk-cipher-only.diff 1530 RMD160 744e2f1814ce3ddf85eb8f4fee92716c81497860 SHA1 95a8d09f510b127bb67ea5c2479de8ca5db2cb56 SHA256 0a87d75aaa7c3c0eaf0e71db9a9ed50aa82bcfccbcb95007ecbf16aab60fa7db
@@ -12,8 +14,14 @@ AUX vuze-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1
 AUX vuze-4.1.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1955762d9131521583797c89527856158849d92f SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5
 AUX vuze.desktop 164 RMD160 7b3a6f15d18b55eac068ec8daae2182920a5cebb SHA1 04b5af936439f67aa5bde047bd1280a07214304d SHA256 4fbc293d66810bcd4eec210d00d5ea97f5e49acdd10197a52e361ed11b8718ed
 DIST Azureus_3.0.4.2_source.zip 7110233 RMD160 f6f53c99fcf74e0d90513a4a0edb25817e20c009 SHA1 abb12244a3798e23fd0cd560dd94e8d2144f2011 SHA256 71363f79d1be97103cf7187bfdb7779d36279c75e1abc47ad8fe98ea21e3c2b0
+DIST Vuze_4.0.0.4_source.zip 8255486 RMD160 1c4548485d7be9f9ab80ba004aa83b97cef3869f SHA1 2543258555e21c8179b5ee92130a781576a7b326 SHA256 a7fc791e3839c04967b7ba940399e1c5a02f045e47a0a93c97a758c76f09a8de
 DIST Vuze_4.1.0.0_source.zip 8474515 RMD160 af1616d865d3f024015ebdcca6825379762c580a SHA1 d37b371e1c1ca7724e614f1dbb939d4e54390a42 SHA256 919e120238e1b15bb8fa7f9b857e736284320c1000e64538a327c5d49ff121ff
+DIST azplugins_2.1.6.jar 309944 RMD160 ccbd85902ade3500e996be9353698374a77c4aea SHA1 a25e8ee55e22e53de5984f7272f1d5c698563183 SHA256 81ed58fba9d70916360bc7e13341dbb7afaef25878fa493c4fed5a2ba18d170a
+DIST azrating_1.3.1.jar 38172 RMD160 6d7bad5a11e51156862f8779178a25e81ee2a0c6 SHA1 898e29ec254f42302c13643e30d91dc7c34754cc SHA256 8eedb5c7d731fc1f4bc86b2c7b5df386ed16b9d17a6705eaa2da2ead67546863
+DIST azupdater_1.8.8.zip 24846 RMD160 eb78263f904ee62813f2fcde61cb61df7646045e SHA1 e065224a57eee9de677a178d8bf24d6340f3b45f SHA256 9d28aafac3dd66d4bb71a0d980c38e5f8aaa743e0a778e1903149f2eb5fc9f1f
+DIST azupnpav_0.2.2.zip 121678 RMD160 e3bd20c0b3ba941a78c4a673db490412137f0728 SHA1 e352160ad948426120ddf03c38ba28b443194ce6 SHA256 5db7f1e41af0344b7ccb580d07e40b48bea1e0424d1bb1d7f196e92d31ff4886
 EBUILD vuze-3.0.4.2-r1.ebuild 5238 RMD160 7068c8484f84f6e37bb87f5cb78bd2dbbfeb3ef8 SHA1 d0ad20b4ad3da0afed9d9a505d773d8de243bdbf SHA256 8a9cd9c2cd0b05da7bde092942d85d1d3f251d49eddbbec878cc52cf4e0e0efa
+EBUILD vuze-4.0.0.4.ebuild 5184 RMD160 e3049b1cef1b974e5bc19ec2297158b70beb5eb8 SHA1 8b547762c443ab85e1920ae52a46abb5b1d86be2 SHA256 54ca034b63fafd80d45323daa2bb78cec47e2bb6f0994a8dd91e0e0061ec55cb
 EBUILD vuze-4.1.0.0.ebuild 4735 RMD160 3f9faa9f200f62f921b078acb7c37b47be12b7cc SHA1 1765c9a1579d3cbabf113056040ed737a730978c SHA256 7e2547da085b38c9ebc5fa72368e4bda9b633a5c6dd197055f05ee35d046addd
-MISC ChangeLog 16819 RMD160 2fb6a75b5c40e88bf7f3638d47f85193c9ecb28e SHA1 54aff781d63798d95149138058bfa8450e41b752 SHA256 47cf77faa35cca72df4457263931c0ecdcc6cb8ed663d4ab8c5b88a8aa9a16fa
+MISC ChangeLog 17054 RMD160 18dd2f1c4d9d18fb796f7e2f089a03a5fe0c31ea SHA1 af53781f9f0e18cd1b5277271bb0f8360c5f322b SHA256 293493f4c281efc377368217bc6bc63acae44be08686c7005e718e167b640e85
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/net-p2p/vuze/files/patches-4.0.0.4/remove-osx-platform.diff b/net-p2p/vuze/files/patches-4.0.0.4/remove-osx-platform.diff
new file mode 100644
index 000000000000..9821573e4e55
--- /dev/null
+++ b/net-p2p/vuze/files/patches-4.0.0.4/remove-osx-platform.diff
@@ -0,0 +1,24 @@
+--- 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.0.0.4/use-jdk-cipher-only.diff b/net-p2p/vuze/files/patches-4.0.0.4/use-jdk-cipher-only.diff
new file mode 100644
index 000000000000..cc5055cbd770
--- /dev/null
+++ b/net-p2p/vuze/files/patches-4.0.0.4/use-jdk-cipher-only.diff
@@ -0,0 +1,41 @@
+--- 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/vuze-4.0.0.4.ebuild b/net-p2p/vuze/vuze-4.0.0.4.ebuild
new file mode 100644
index 000000000000..00ba727d8822
--- /dev/null
+++ b/net-p2p/vuze/vuze-4.0.0.4.ebuild
@@ -0,0 +1,166 @@
+# 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.0.0.4.ebuild,v 1.1 2009/02/06 11:56:14 caster Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2
+
+MAIN_DIST=Vuze_${PV}_source.zip
+PLUGINS_N=azplugins
+RATING_N=azrating
+UPDATER_N=azupdater
+UPNPAV_N=azupnpav
+PLUGINS_V=2.1.6
+RATING_V=1.3.1
+UPDATER_V=1.8.8
+UPNPAV_V=0.2.2
+PLUGINS_DIST=${PLUGINS_N}_${PLUGINS_V}.jar
+RATING_DIST=${RATING_N}_${RATING_V}.jar
+UPDATER_DIST=${UPDATER_N}_${UPDATER_V}.zip
+UPNPAV_DIST=${UPNPAV_N}_${UPNPAV_V}.zip
+
+ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
+
+DESCRIPTION="BitTorrent client in Java, now called Vuze"
+HOMEPAGE="http://www.vuze.com/"
+SRC_URI="mirror://sourceforge/azureus/${MAIN_DIST}
+	${ALLPLUGINS_URL}/${PLUGINS_DIST}
+	${ALLPLUGINS_URL}/${RATING_DIST}
+	${ALLPLUGINS_URL}/${UPDATER_DIST}
+	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
+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"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_unpack() {
+	mkdir "${S}" && cd "${S}" || die
+	unpack ${MAIN_DIST}
+
+	cd "${WORKDIR}"
+	mkdir -p plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}} || die
+	cp "${DISTDIR}/${PLUGINS_DIST}" plugins/${PLUGINS_N} || die
+	cp "${DISTDIR}/${RATING_DIST}" plugins/${RATING_N} || die
+	cd "${WORKDIR}/plugins/${UPDATER_N}" && unpack ${UPDATER_DIST} || die
+	cd "${WORKDIR}/plugins/${UPNPAV_N}" && unpack ${UPNPAV_DIST} || die
+
+	cd "${S}"
+	epatch "${FILESDIR}/patches-4.0.0.4/use-jdk-cipher-only.diff"
+	epatch "${FILESDIR}/patches-4.0.0.4/remove-osx-platform.diff"
+
+	### 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}'
+
+	insinto /usr/share/${PN}/
+	doins -r "${WORKDIR}/plugins"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=204132
+	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
+
+	doicon "${FILESDIR}/${PN}.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 Azureus as root is not supported and may result in untracked"
+	ewarn "updates to shared components and then collisions on updates via portage"
+
+	elog "Since version 4.0.0.2, 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 ebuild."
+	elog "Users are recommended to delete the following plugin copies:"
+	elog "~/.azureus/plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}}"
+	elog
+	elog "Azureus 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 azureus 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 Azureus, 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
+}