Version bump. Fixes bug #201607 and bug #203432.

Package-Manager: portage-2.1.4_rc9

4 files changed, 189 insertions, 5 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 2e3930856a6d..8cf11ec3a0a0 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.56 2007/11/23 22:25:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.57 2007/12/28 00:52:25 betelgeuse Exp $
+
+*azureus-3.0.4.2 (28 Dec 2007)
+
+  28 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +azureus-3.0.4.2.ebuild:
+  Version bump. Fixes bug #201607 and bug #203432.
 
   23 Nov 2007; Vlastimil Babka <caster@gentoo.org> azureus-3.0.3.4.ebuild:
   Pass file lists to ejavac and jar via tmp files to prevent too long argument
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index b916653d80a2..70c486e0a3db 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX azureus-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1955762d9131521583797c89527856158849d92f SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5
 MD5 feedf8845d1ceea0e57dd6db478b3a69 files/azureus-2.5.0.0-pre 1850
 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a files/azureus-2.5.0.0-pre 1850
@@ -79,6 +82,7 @@ MD5 50a8ec08aae883720954e46ff140114a files/patches-3.0.3.4/azureus_all_modify-fo
 RMD160 2c7a602e1b6aff432b4aea7e945da656e5b8e9bf files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch 1074
 SHA256 95db5ea188c72efa7c19958ec85ec0afb1b7ce9f35a34e2d69d40f0fe2130dea files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch 1074
 DIST Azureus_3.0.3.4_source.zip 6988737 RMD160 18ec3bbbaa1776f242e5b5e39f5c6abece59f29e SHA1 18d6adf4b1849162323055d4d4f38e425c6b90d7 SHA256 e413ce9908ba940345b26024e2daedb2dbf3274aeba3996b7ed7a9b287072f8d
+DIST Azureus_3.0.4.2_source.zip 7110233 RMD160 f6f53c99fcf74e0d90513a4a0edb25817e20c009 SHA1 abb12244a3798e23fd0cd560dd94e8d2144f2011 SHA256 71363f79d1be97103cf7187bfdb7779d36279c75e1abc47ad8fe98ea21e3c2b0
 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
 MD5 609ac327ad0e90bcdfec57db5e2ea6b6 azureus-2.5.0.4-r1.ebuild 4391
@@ -88,10 +92,14 @@ EBUILD azureus-3.0.3.4.ebuild 4746 RMD160 48f192400c3e48dd16fd64d65dfe91794c6bcd
 MD5 ea7c487de0a82c29b99f40c61f417e70 azureus-3.0.3.4.ebuild 4746
 RMD160 48f192400c3e48dd16fd64d65dfe91794c6bcd37 azureus-3.0.3.4.ebuild 4746
 SHA256 2ed0bf52cdbda61724b41a65fe5b7ea42fd4e3577f708763db84b47be1a5a407 azureus-3.0.3.4.ebuild 4746
-MISC ChangeLog 11589 RMD160 77a76d76e669ed8c5bfed997953f6dce088e3f85 SHA1 c68a123deca4a8957e243a8293022b081bba2102 SHA256 b54cf6a4275cb5b5675f1b495c5861032d2688384d248826869688d4a2d92264
-MD5 1740397cf174fec28dd01fefe3b42925 ChangeLog 11589
-RMD160 77a76d76e669ed8c5bfed997953f6dce088e3f85 ChangeLog 11589
-SHA256 b54cf6a4275cb5b5675f1b495c5861032d2688384d248826869688d4a2d92264 ChangeLog 11589
+EBUILD azureus-3.0.4.2.ebuild 4774 RMD160 2221108ca92365b471ae71f8e289f9311382be3b SHA1 5b11cccb02d3b977f33205dcb7310209edef5c83 SHA256 4912e056f3cdb79e0f6fb86d1042d1eafdea8624303a8439966873021d564179
+MD5 81c6f010748151b977bbb80390591188 azureus-3.0.4.2.ebuild 4774
+RMD160 2221108ca92365b471ae71f8e289f9311382be3b azureus-3.0.4.2.ebuild 4774
+SHA256 4912e056f3cdb79e0f6fb86d1042d1eafdea8624303a8439966873021d564179 azureus-3.0.4.2.ebuild 4774
+MISC ChangeLog 11757 RMD160 4443b99da82ece42e51729ebe34102c5f469a007 SHA1 f902a39f9e26ca650dafc096cd0fed68c9249613 SHA256 ba0fd13876bdfa1c6542512f7a5edeb9270a6ff1fdfac137807236b9177b369e
+MD5 343be02613c03932db1cd15631b39aac ChangeLog 11757
+RMD160 4443b99da82ece42e51729ebe34102c5f469a007 ChangeLog 11757
+SHA256 ba0fd13876bdfa1c6542512f7a5edeb9270a6ff1fdfac137807236b9177b369e ChangeLog 11757
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -102,3 +110,13 @@ SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/di
 MD5 9d4675cacd4bd399b34a0bbfdd181bce files/digest-azureus-3.0.3.4 262
 RMD160 27c6ae9ba659e3ff12b276979c39c34ebc76a413 files/digest-azureus-3.0.3.4 262
 SHA256 03e57a4141e2be43a5db50b622e89f2ee83129540de8b15157855c82720d40f5 files/digest-azureus-3.0.3.4 262
+MD5 4bb1cbfccf413d87452f0b5060d933fb files/digest-azureus-3.0.4.2 262
+RMD160 122027032a0398af33e38bb330826d930399b6a7 files/digest-azureus-3.0.4.2 262
+SHA256 6f9bef11fa144a2cd2be62728de971c1a7a5a5e810a55b71bf032dda0cd0ad0d files/digest-azureus-3.0.4.2 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHdEjOcxLzpIGCsLQRAppLAJ9p9h0rIpgbWxUjjStezYD9PBNVTACgj9Qu
+IbLcfywmuVfTj74g258wH2w=
+=Zb4+
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-3.0.4.2.ebuild b/net-p2p/azureus/azureus-3.0.4.2.ebuild
new file mode 100644
index 000000000000..b0479c4ec16f
--- /dev/null
+++ b/net-p2p/azureus/azureus-3.0.4.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-3.0.4.2.ebuild,v 1.1 2007/12/28 00:52:25 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...
+###
+
+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 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=dev-java/bcprov-1.35
+	>=dev-java/commons-cli-1.0
+	>=dev-java/log4j-1.2.8
+	>=dev-java/swt-3.3_pre3
+	!net-p2p/azureus-bin
+	>=virtual/jre-1.4"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/desktop-file-utils
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if ! built_with_use --missing false -o dev-java/swt firefox seamonkey xulrunner; then
+		eerror
+		eerror "dev-java/swt 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 with embedded browser"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack "${A}"
+
+	### Patches Azureus to use bcprov,
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/patches-3.0.3.4"
+
+	### 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 -rv "com/aelitis/azureus/util/win32"   \
+	       "org/gudy/azureus2/platform/win32" \
+	       "org/gudy/azureus2/ui/swt/win32"   || 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
+}
+
+src_compile() {
+	local mem
+	use amd64 && mem="256"
+	use x86   && mem="128"
+	use ppc   && mem="192"
+	find . -name "*.java" > "${T}/az-src"
+	ejavac -J-Xmx${mem}m -encoding latin1 \
+		-classpath $(java-pkg_getjars swt-3,commons-cli-1,log4j,bcprov) \
+		@"${T}/az-src"
+	find . -type f -a ! -name "*.java" > "${T}/az-jarlist"
+	jar cf azureus.jar @"${T}/az-jarlist"
+}
+
+src_install() {
+
+	java-pkg_dojar "azureus.jar" || die "dojar failed"
+
+	java-pkg_dolauncher "${PN}" \
+		--main "org.gudy.azureus2.ui.common.Main" \
+		-pre "${FILESDIR}/${PN}-2.5.0.0-pre"      \
+		--java_args '-Dazureus.install.path=${HOME}/.azureus/ ${JAVA_OPTIONS}' \
+		--pkg_args '--ui=${UI}'
+
+	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
+	ewarn "If you are upgrading, and the menu in Azureus has entries"
+	ewarn "like \"!MainWindow.menu.transfers!\" then you have a stray"
+	ewarn "\"MessageBundle.properties\" file, and you may safely"
+	ewarn "delete \"~/.azureus/MessagesBundle.properties\"."
+	ewarn
+
+	ewarn
+	ewarn "Before azureus-2.5.0.0-r3, the Azureus plugin directory was"
+	ewarn "set to \"~/plugins\", instead of \"~/.azureus/plugins\"."
+	ewarn "If needed, you should move the plugins, to the new location."
+	ewarn
+
+	elog
+	elog "If you have problems starting Azureus, try starting it"
+	elog "from the command line to look at debugging output."
+	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/digest-azureus-3.0.4.2 b/net-p2p/azureus/files/digest-azureus-3.0.4.2
new file mode 100644
index 000000000000..7808f2da3833
--- /dev/null
+++ b/net-p2p/azureus/files/digest-azureus-3.0.4.2
@@ -0,0 +1,3 @@
+MD5 fff98b2e2c2006cd71acf10116fc81c6 Azureus_3.0.4.2_source.zip 7110233
+RMD160 f6f53c99fcf74e0d90513a4a0edb25817e20c009 Azureus_3.0.4.2_source.zip 7110233
+SHA256 71363f79d1be97103cf7187bfdb7779d36279c75e1abc47ad8fe98ea21e3c2b0 Azureus_3.0.4.2_source.zip 7110233