Version bump.

Package-Manager: portage-2.1.5_rc3

6 files changed, 314 insertions, 2 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 2b25e91f96ef..41bc1b65ccf4 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.65 2008/04/03 19:43:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.66 2008/04/20 14:39:07 betelgeuse Exp $
+
+*azureus-3.0.5.2 (20 Apr 2008)
+
+  20 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/azureus-3.0.5.2-pre,
+  +files/patches-3.0.5.2/remove-osx-platform.patch,
+  +files/patches-3.0.5.2/use-jdk-cipher-only.patch, +azureus-3.0.5.2.ebuild:
+  Version bump.
 
 *azureus-3.0.5.0-r1 (03 Apr 2008)
 
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 8397d1b88e89..f68c62b535c2 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX azureus-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1955762d9131521583797c89527856158849d92f SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5
+AUX azureus-3.0.5.2-pre 1915 RMD160 f3b145fa1b2c8cd7c2a4d2fc0373444e7a7d33e4 SHA1 5754f2deb9c9225cddd4a6e290048ade27415085 SHA256 058dd2f53284217576eb98de0174f1b70997ea6515ff8600f4070b3c1428fa87
 AUX azureus-bcprov-1.35.patch 1060 RMD160 6c81c8fe3e270d67027e135cb676bef38acd5c27 SHA1 87d04bb8c0481b5b04dcf697c9f2438dc0821f21 SHA256 3c94891dc070d543884d5e874c35e089ef5a59ef5b578b19e494a2d15b5186d2
 AUX azureus.desktop 176 RMD160 d612e130dfbf7cbef29e5cfaac45ea87d1a08756 SHA1 d7ab5bfe4a4a44d9c11733dec703aa03ed36e061 SHA256 a4b0c7b6d20c122177c81ef38af6b211dc98de1694925c1a77782029122a207b
 AUX azureus.png 16722 RMD160 6a4dbebd8cca49106795dadc8995fbc9422596a2 SHA1 4d3fdde1c2b1ca2ab24c73529f9ad16927d1ef70 SHA256 756778b266db46419f3921a6acc36ea0c3f9622a1e37a432573ab1f680a2b668
@@ -18,11 +22,22 @@ 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-3.0.5.2/remove-osx-platform.patch 764 RMD160 7092caaf228757c297b4e58f8ef6b666668e5708 SHA1 416696b47afffb6e80a8a715c12905a656499a7c SHA256 75ebd2cc361a420c7526a7e5344d0e6b2b3a3dfe76932cc667227000a2fa7439
+AUX patches-3.0.5.2/use-jdk-cipher-only.patch 1867 RMD160 942446299c97a56a88567fb30a843ddccb08e8f6 SHA1 29234827ccaf55ec41ec2574893aaaf71a9a84c5 SHA256 aa65f524fbf4ac7654d1f6d671914cf13749d8df5062b8bee4349bf9ab7da699
 DIST Azureus_3.0.4.2_source.zip 7110233 RMD160 f6f53c99fcf74e0d90513a4a0edb25817e20c009 SHA1 abb12244a3798e23fd0cd560dd94e8d2144f2011 SHA256 71363f79d1be97103cf7187bfdb7779d36279c75e1abc47ad8fe98ea21e3c2b0
 DIST Azureus_3.0.5.0_source.zip 7387408 RMD160 f8eb1fdde9ee4307b3252a2765b577a26bb147c5 SHA1 d4da15f27f45dcd1be8da63c35f2c155dcda3105 SHA256 2e8ae56adc4d8341bbec722b224e0885c9ca5c49c996f2bc3c0b1f01fe788ca1
+DIST Azureus_3.0.5.2_source.zip 7537643 RMD160 847cee5c8f261cbefddc565833daff0b86d306a0 SHA1 18a90d5fe1345fcf54e86cebc9537ce7957dc89c SHA256 43bb6a69d53ac00a446ccb706ff60d53f65dfffb4c22ab6c69c1851cbdfc8477
 DIST azureus_2.5.0.4_source.zip 6482560 RMD160 c4f245abf19a963e077b354fccd6a04547c741b1 SHA1 46ec8c12d27374d935a4ee9b40be464d111cbda5 SHA256 9ae32cbf88baf04b0e17456e92bc2634dd54e890dbece7211a83318b96d1b081
 EBUILD azureus-2.5.0.4-r1.ebuild 4391 RMD160 c3f9203405fc038582c5e3b2f60b294f060e92c4 SHA1 1d1947f09b1a1b4bd62b0ce9674db100515fb8ce SHA256 feded94b51fab80be00ebe63c70e0bd6c8683499d81860543fa87d0e2d5f0b74
 EBUILD azureus-3.0.4.2-r1.ebuild 5130 RMD160 60d34207ee5c9512270a308c3446a4aabb3b8da7 SHA1 0a8e3bd569d01afa17a73abc732f887bb5fd0367 SHA256 b9bd056ad8c8b771f1ffee767b198a55c8f60683a9f94e6581d9df6167a65925
 EBUILD azureus-3.0.5.0-r1.ebuild 5179 RMD160 8d8132ff7ec1070e4c4eb4976c6f7e018b52a058 SHA1 c7a5fa620d4b3aa3a7976672e1891251f34a575a SHA256 ebcce2ca0921428b6be872963affe2ea79e09c6b8b39dc9cf519f0677190df87
-MISC ChangeLog 12934 RMD160 b544d9fbffe645aa8b1fcddd5d87fd879dae66e5 SHA1 7986e91a8a84e6d91ec588e704c351cc33e9c0fc SHA256 888fe5cd7d8d60ff089d6bd015ebdb921f7edba71a5a0047cb711ac8aeb1be4e
+EBUILD azureus-3.0.5.2.ebuild 4800 RMD160 f076eec6b8f1411e2c1a830bb7e7e02d76e91bec SHA1 154a8cd7c2217d407b8fb1eccae96d2ee6c1d648 SHA256 51d67f2da44bcd4dd581883256b72b227c5307939aa7dcb7e9ff864d102ce9cb
+MISC ChangeLog 13199 RMD160 5807c633dbbff8e33fd59b460ec3587be1a43617 SHA1 1975a2bb2f5a3fa07decf5c43aff6b150160e5aa SHA256 a6b1da7fdb36d938a66f5761949cd0bf8abac5cfdc86ad4987a8270f91c452ae
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgLVW4ACgkQcxLzpIGCsLSGnwCgmJMbmwTtcfp54Y6OSy4HRerA
+JewAniRjjldOXm5zjyzOJBRkQVDOfL7E
+=D8OD
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-3.0.5.2.ebuild b/net-p2p/azureus/azureus-3.0.5.2.ebuild
new file mode 100644
index 000000000000..1c3f2e7b8ad8
--- /dev/null
+++ b/net-p2p/azureus/azureus-3.0.5.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-3.0.5.2.ebuild,v 1.1 2008/04/20 14:39:07 betelgeuse Exp $
+
+###
+### @Todo The new Azureus gui requires swt built with embedded mozilla support,
+###       or azureus will hang at startup. However, you can still start
+###       the old GUI which doesn't require it, by using file/restart (which
+###       is kind of bug, and maybe I should put that patch, that removes
+###       restart from menu, back). It probably could be invoked also by using
+###       a different Main class (look for them there are plenty :) so we could
+###       have some old-gui flag which would run that one and remove
+###       the mozilla dep. Best would be some per-user setting and startup
+###       script check for swt mozilla support and die...
+###
+
+EAPI=1
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2
+
+DESCRIPTION="BitTorrent client in Java"
+HOMEPAGE="http://azureus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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_pre6-r1:3.4
+	!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"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if ! built_with_use --missing false -o dev-java/swt firefox seamonkey xulrunner; then
+		eerror
+		eerror "dev-java/swt:3.4 must be compiled with the firefox, seamonkey or xulrunner USE flag"
+		eerror "(support may vary per swt version) or azureus will hang at startup!"
+		eerror
+		die "recompile dev-java/swt:3.4 with embedded browser"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/patches-3.0.5.2/use-jdk-cipher-only.patch"
+	epatch "${FILESDIR}/patches-3.0.5.2/remove-osx-platform.patch"
+
+	### Remove an unit test we never run
+	#rm -v ./org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
+
+	### 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" || 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,commons-cli-1,log4j,bcprov,json-simple"
+
+src_install() {
+	java-pkg_dojar dist/*.jar || die "dojar failed"
+	dodoc ChangeLog.txt || die
+
+	java-pkg_dolauncher "${PN}" \
+		--main 'org.gudy.azureus2.${UI}.Main' \
+		-pre "${FILESDIR}/${PN}-3.0.5.2-pre"      \
+		--java_args '-Dazureus.install.path=${HOME}/.azureus/ ${JAVA_OPTIONS}'
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=204132
+	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
+
+	doicon "${FILESDIR}/azureus.png"
+	domenu "${FILESDIR}/azureus.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.
+	###
+	elog
+	elog "It is not recommended to use the Azureus auto-update feature,"
+	elog "and it might not even work. You should disable auto-update,"
+	elog "in \"Tools\" -> \"Options...\" -> \"Interface\" -> \"Start\"."
+	elog
+
+	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
+	elog "Using this config file you can start the console UI."
+	elog
+	ewarn "The org.gudy.azureus2.ui.common.Main wrapper is gone in 3.0.5.2"
+	ewarn "so if you use something other than console or swt as the UI"
+	ewarn "option, you will need to adjust the setting. See /usr/bin/azureus"
+	ewarn "on how console and swt are mapped to starter classes. This should"
+	ewarn "a problem with just this release."
+
+	elog
+	elog "If you have problems starting Azureus, try starting it"
+	elog "from the command line to look at debugging output."
+	elog
+
+	elog
+	elog "To switch from classic UI to Vuze use:"
+	elog "Tools -> Options -> Interface -> Start"
+	elog "\t-> Display Azureus UI Chooser"
+	elog "Restart not working properly is a known issue."
+	elog
+
+	ewarn
+	ewarn "Running Azureus as root is not supported."
+	ewarn
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/net-p2p/azureus/files/azureus-3.0.5.2-pre b/net-p2p/azureus/files/azureus-3.0.5.2-pre
new file mode 100644
index 000000000000..3a8973016355
--- /dev/null
+++ b/net-p2p/azureus/files/azureus-3.0.5.2-pre
@@ -0,0 +1,78 @@
+#
+# 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
+
+[[ ${UI} == swt ]] && UI=ui.swt
+[[ ${UI} == console ]] && UI=cl
+
+[[ ! -e "${dotazudir}" ]] && create_initial_config
diff --git a/net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch b/net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch
new file mode 100644
index 000000000000..35817573280f
--- /dev/null
+++ b/net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch
@@ -0,0 +1,12 @@
+diff -ur work.old/org/gudy/azureus2/platform/PlatformManagerFactory.java work/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- work.old/org/gudy/azureus2/platform/PlatformManagerFactory.java	2008-04-20 15:53:14.000000000 +0300
++++ work/org/gudy/azureus2/platform/PlatformManagerFactory.java	2008-04-20 15:53:31.000000000 +0300
+@@ -52,7 +52,7 @@
+ 						

+ 					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){

+ 						

+-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();

++	                    //platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();

+ 	                    

+ 					}else if( getPlatformType() == PlatformManager.PT_UNIX ){

+ 						

diff --git a/net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch b/net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch
new file mode 100644
index 000000000000..cfae1d4e973d
--- /dev/null
+++ b/net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch
@@ -0,0 +1,43 @@
+diff -ur work.old/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java
+--- work.old/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2008-04-20 15:29:59.000000000 +0300
++++ work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2008-04-20 15:35:56.000000000 +0300
+@@ -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.RSAUtil;

+ import org.gudy.azureus2.core3.util.Debug;

+ import org.gudy.azureus2.plugins.utils.StaticUtilities;

+ 

+@@ -82,13 +82,15 @@
+ 				

+ 			byte[] secret_bytes = session_key.getEncoded();

+ 			

+-			try{

++			//try{

+ 				Cipher	rsa_cipher = Cipher.getInstance( "RSA" );

+ 		    

+ 				rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key );

+ 		    

+ 				encryped_session_key = rsa_cipher.doFinal( secret_bytes );

+-				

++			

++			/* Gentoo: Depend on JDK >=1.5 so we don't need this code. This does not work

++			 * with our packaged bcprov

+ 			}catch( Throwable e ){

+ 				

+ 					// fallback to the BC implementation for jdk1.4.2 as JCE RSA not available

+@@ -105,6 +107,7 @@
+ 				

+ 				encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length);

+ 			}

++			*/

+ 

+ 		}catch( Throwable e ){

+ 			

+Only in work.old/org: bouncycastle
+Only in work.old/org/gudy/azureus2/platform: macosx
+Only in work.old/org/gudy/azureus2/ui/swt: osx
+Only in work.old/org/gudy/azureus2/ui/swt: test
+Only in work.old/org/gudy/azureus2/ui/swt/win32: Win32UIEnhancer.java