With 2.5.0.0-r1 it could happen that UI was not set leading to Azureus not starting. Now the startup script sets that to swt if the variable is empty. Fixes bug #147059.

Package-Manager: portage-2.1.1

5 files changed, 151 insertions, 12 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index f769c7fe6a42..9c651a550941 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.29 2006/09/09 16:50:10 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.30 2006/09/10 14:36:04 betelgeuse Exp $
+
+*azureus-2.5.0.0-r2 (10 Sep 2006)
+
+  10 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+  files/azureus-2.5.0.0-pre, +azureus-2.5.0.0-r2.ebuild:
+  With 2.5.0.0-r1 it could happen that UI was not set leading to Azureus
+  not starting. Now the startup script sets that to swt if the variable
+  is empty. Fixes bug #147059.
 
 *azureus-2.5.0.0-r1 (09 Sep 2006)
 
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index a8a176385f98..8397aa62de6f 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -17,10 +17,10 @@ AUX azureus-2.4.0.2-pre 1435 RMD160 ae54adaf3c8eeca1cb13382b708f5d22ff681786 SHA
 MD5 06e61ac201baaeed24f1f74713846e96 files/azureus-2.4.0.2-pre 1435
 RMD160 ae54adaf3c8eeca1cb13382b708f5d22ff681786 files/azureus-2.4.0.2-pre 1435
 SHA256 d8261f915247c2f1d669c27b41d36b8305e014730352ae40b0ad32e29c1a3ea1 files/azureus-2.4.0.2-pre 1435
-AUX azureus-2.5.0.0-pre 1538 RMD160 fe01a0b970b4f09a5064ab90c0f3ed938b35ec36 SHA1 af1c55b445bda8953e97baaf28569da1329a35c6 SHA256 c31a5985b7dc45eb919d58e097634d37833d68b81b8f66b2895d79e0a353a037
-MD5 884870c512cd516dcf81775ebbdbdd0e files/azureus-2.5.0.0-pre 1538
-RMD160 fe01a0b970b4f09a5064ab90c0f3ed938b35ec36 files/azureus-2.5.0.0-pre 1538
-SHA256 c31a5985b7dc45eb919d58e097634d37833d68b81b8f66b2895d79e0a353a037 files/azureus-2.5.0.0-pre 1538
+AUX azureus-2.5.0.0-pre 1548 RMD160 429d4ef1efa04fcaff006d9cef2d30e260a025fd SHA1 50b08351366e2e487ab2380d2dbed46bc5d24c6a SHA256 2142ac7cc484687592b54f705c842f089624e9162e7f346df0f8564f866af5e5
+MD5 75eb3e8d918b563225c50ad77ce89a4b files/azureus-2.5.0.0-pre 1548
+RMD160 429d4ef1efa04fcaff006d9cef2d30e260a025fd files/azureus-2.5.0.0-pre 1548
+SHA256 2142ac7cc484687592b54f705c842f089624e9162e7f346df0f8564f866af5e5 files/azureus-2.5.0.0-pre 1548
 AUX azureus-gentoo-2.3.0.6.sh 1104 RMD160 bd128ed0735134405924606b1073943b12bcd1e8 SHA1 8e390bcc0288a3dcf10e0e5a27bc1e2936231d49 SHA256 68e0a4bb713827fba65109a0781b94433a8c34d83f9058aa73b00ca66592d519
 MD5 ae8ab7ed5a0f10a013f72fdc7342cb71 files/azureus-gentoo-2.3.0.6.sh 1104
 RMD160 bd128ed0735134405924606b1073943b12bcd1e8 files/azureus-gentoo-2.3.0.6.sh 1104
@@ -92,14 +92,18 @@ EBUILD azureus-2.5.0.0-r1.ebuild 3553 RMD160 9c95ce00cf440c393338c5a9c20f524c61e
 MD5 11b3ed908a3f1789a0d23b749163ca9a azureus-2.5.0.0-r1.ebuild 3553
 RMD160 9c95ce00cf440c393338c5a9c20f524c61efd449 azureus-2.5.0.0-r1.ebuild 3553
 SHA256 170dd04b3fc956e187c31a9678282fa08006a05f8ee8fc7243eb5934bb581533 azureus-2.5.0.0-r1.ebuild 3553
+EBUILD azureus-2.5.0.0-r2.ebuild 3553 RMD160 936c1077b5d8683c466abdcac5a4416e9231ac9b SHA1 331dc7dfc48dc62bfcdc13517e822a33ba94537e SHA256 936e7e0853ae1ff281cecb14a5513038babd8b790f1d5044949b7cd31fea4ea8
+MD5 1a4d770ed94a1e6bb32a392b970cf3c8 azureus-2.5.0.0-r2.ebuild 3553
+RMD160 936c1077b5d8683c466abdcac5a4416e9231ac9b azureus-2.5.0.0-r2.ebuild 3553
+SHA256 936e7e0853ae1ff281cecb14a5513038babd8b790f1d5044949b7cd31fea4ea8 azureus-2.5.0.0-r2.ebuild 3553
 EBUILD azureus-2.5.0.0.ebuild 3366 RMD160 a8e1df2e8124788953bbbeff0528fca5b8ed0f54 SHA1 ff0c22402686d9fe74e012ed96b2f51df3eb6645 SHA256 49fd67506bc6141b220949ecbdac58828a9eaa9bb376faac3f9b2579bdccbc1c
 MD5 1d74e8096bf0d00d5317f080ec3ed0bb azureus-2.5.0.0.ebuild 3366
 RMD160 a8e1df2e8124788953bbbeff0528fca5b8ed0f54 azureus-2.5.0.0.ebuild 3366
 SHA256 49fd67506bc6141b220949ecbdac58828a9eaa9bb376faac3f9b2579bdccbc1c azureus-2.5.0.0.ebuild 3366
-MISC ChangeLog 6017 RMD160 d95adc6ec5c9c923086fdf78a24af27af9210f58 SHA1 320f83f15d08170a374d2c77a7881800774e900d SHA256 23377290081fcb76722806346ab01cd0511d2b4521ce91866bf61c506190e044
-MD5 ed4d53538834c8ec2ea0ce30011b37c7 ChangeLog 6017
-RMD160 d95adc6ec5c9c923086fdf78a24af27af9210f58 ChangeLog 6017
-SHA256 23377290081fcb76722806346ab01cd0511d2b4521ce91866bf61c506190e044 ChangeLog 6017
+MISC ChangeLog 6339 RMD160 3196187ae55fa2ab62e1ad244097857d618dc161 SHA1 7a4f926d12e5bcc20a0cce8a4dd4520e4c347d26 SHA256 81c0f47d516b88b652be75c823c151c1f4ac817e4f378c10ed3161c7321f6727
+MD5 70b87fec0d5826ec474e078aaacd2a32 ChangeLog 6339
+RMD160 3196187ae55fa2ab62e1ad244097857d618dc161 ChangeLog 6339
+SHA256 81c0f47d516b88b652be75c823c151c1f4ac817e4f378c10ed3161c7321f6727 ChangeLog 6339
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -116,10 +120,13 @@ SHA256 ad75c73e602eabb4101378fffa1ab0d105f2695046695eff6beb82ea70988253 files/di
 MD5 6c959658c740af3b04b1973ab07ed71b files/digest-azureus-2.5.0.0-r1 262
 RMD160 422318f0056365b6239ec86ce6c616e86f3ac9cb files/digest-azureus-2.5.0.0-r1 262
 SHA256 ad75c73e602eabb4101378fffa1ab0d105f2695046695eff6beb82ea70988253 files/digest-azureus-2.5.0.0-r1 262
+MD5 6c959658c740af3b04b1973ab07ed71b files/digest-azureus-2.5.0.0-r2 262
+RMD160 422318f0056365b6239ec86ce6c616e86f3ac9cb files/digest-azureus-2.5.0.0-r2 262
+SHA256 ad75c73e602eabb4101378fffa1ab0d105f2695046695eff6beb82ea70988253 files/digest-azureus-2.5.0.0-r2 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAvDPcxLzpIGCsLQRAivoAJ9a8jYGnCoWM9Cz29MaUrRTZwrVVwCfUxTl
-Zf1k2+8a/BjLVRopNTCQ/JI=
-=6Uzc
+iD8DBQFFBCLecxLzpIGCsLQRAmhcAJ9oTmHCXq44Z7UhYdh1AJw7UI5A6ACZAcGO
+JhqUR+6sNAwkTWnwbQz4Bjw=
+=mLvO
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-2.5.0.0-r2.ebuild b/net-p2p/azureus/azureus-2.5.0.0-r2.ebuild
new file mode 100644
index 000000000000..65b2ac5926b2
--- /dev/null
+++ b/net-p2p/azureus/azureus-2.5.0.0-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.5.0.0-r2.ebuild,v 1.1 2006/09/10 14:36:04 betelgeuse Exp $
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2
+
+DESCRIPTION="Azureus - Java BitTorrent Client"
+HOMEPAGE="http://azureus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="source"
+
+# >=swt-3.2 for bug 
+# https://bugs.gentoo.org/show_bug.cgi?id=135835
+
+RDEPEND="
+	>=virtual/jre-1.4
+	>=dev-java/swt-3.2-r1
+	>=dev-java/log4j-1.2.8
+	>=dev-java/commons-cli-1.0
+	>=dev-java/bcprov-1.31
+	!net-p2p/azureus-bin"
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	dev-util/desktop-file-utils
+	>=dev-java/ant-core-1.6.2
+	|| ( =dev-java/eclipse-ecj-3.2* =dev-java/eclipse-ecj-3.1* )
+	source? ( app-arch/zip )
+	>=app-arch/unzip-5.0"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch ${FILESDIR}/fedora-${PV}/
+
+	#removing osx files and entries
+	rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/platform/macosx
+	#removing windows files
+	rm -fr org/gudy/azureus2/platform/win32
+	#removing test files
+	rm -fr org/gudy/azureus2/ui/swt/test
+	rm -f org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
+	#removing bouncycastle
+	rm -fr org/bouncycastle
+
+	mkdir -p build/libs
+	cd build/libs
+	java-pkg_jar-from log4j
+	java-pkg_jar-from commons-cli-1
+	java-pkg_jar-from swt-3
+	java-pkg_jar-from bcprov
+}
+
+src_compile() {
+	# javac likes to run out of memory during build... use ecj instead
+	java-pkg_force-compiler ecj-3.2 ecj-3.1
+
+	eant ${ant_extra_opts} jar
+}
+
+src_install() {
+	java-pkg_dojar dist/Azureus2.jar || die "dojar failed"
+
+
+	java-pkg_dolauncher ${PN} \
+		--main org.gudy.azureus2.ui.common.Main \
+		-pre ${FILESDIR}/${P}-pre \
+		--pkg_args '--ui=${UI}' \
+		--java_args '${JAVA_OPTIONS}'
+
+	doicon "${FILESDIR}/azureus.png"
+	domenu "${FILESDIR}/azureus.desktop"
+	use source && java-pkg_dosrc ${S}/{com,org}
+}
+
+pkg_postinst() {
+	echo
+	elog "Due to the nature of the portage system, we recommend"
+	elog "that users check portage for new versions of Azureus"
+	elog "instead of attempting to use the auto-update feature."
+	elog "You can disable auto-update in"
+	elog "Tools->Options...->Interface->Start"
+	echo
+	elog "After running azureus for the first time, configuration"
+	elog "options will be placed in ~/.azureus/gentoo.config"
+	elog "It is recommended that you modify this file rather than"
+	elog "the azureus startup script directly."
+	echo
+	elog "As of this version, the new ui type 'console' is supported,"
+	elog "and this may be set in ~/.azureus/gentoo.config."
+	echo
+	elog "If you have problems starting azureus, try starting it"
+	elog "from the command line to look at debugging output."
+	echo
+	ewarn "If you are upgrading, and the menu in azureus has entries like"
+	ewarn "\"!MainWindow.menu.transfers!\" then you have a stray"
+	ewarn "MessageBundle.properties file,"
+	ewarn "and you may safely delete ~/.azureus/MessagesBundle.properties"
+	echo
+	elog "It's recommended to use Sun's Java version 1.5 or later."
+	elog "If you're experiencing problems running azureus and you've"
+	elog "using an older version of Java, try to upgrading to a new version. "
+	echo
+	ewarn "Please, do not run azureus as root!"
+	ewarn "Azureus has not been developed for multi-user environments!"
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_prerm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/net-p2p/azureus/files/azureus-2.5.0.0-pre b/net-p2p/azureus/files/azureus-2.5.0.0-pre
index 5278c094f80c..40a21949643f 100644
--- a/net-p2p/azureus/files/azureus-2.5.0.0-pre
+++ b/net-p2p/azureus/files/azureus-2.5.0.0-pre
@@ -61,5 +61,6 @@ fi
 if [[ -z "${UI}" ]]; then
 	echo '$UI not set adding UI="swt" to your ' ${gentoocfg}
 	echo 'UI="swt"' >> ${gentoocfg}
+	UI="swt"
 fi
 
diff --git a/net-p2p/azureus/files/digest-azureus-2.5.0.0-r2 b/net-p2p/azureus/files/digest-azureus-2.5.0.0-r2
new file mode 100644
index 000000000000..9e923fb8c6d3
--- /dev/null
+++ b/net-p2p/azureus/files/digest-azureus-2.5.0.0-r2
@@ -0,0 +1,3 @@
+MD5 f487f75f37674820bd3b2cc6af97ce57 Azureus_2.5.0.0_source.zip 5856328
+RMD160 7ec7e6ccb570651a655f6077d4b323a4d3b8fcb0 Azureus_2.5.0.0_source.zip 5856328
+SHA256 64aa4150bb8036f11e5207a602253431d46578ce9cd3b62732b0ae0f555a08c4 Azureus_2.5.0.0_source.zip 5856328