The UI and JAVA_OPTIONS settings in the gentoo.config configuration file work again. Fixes bug #146788.

Package-Manager: portage-2.1.1

5 files changed, 214 insertions, 8 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 72f22eaa22fa..f769c7fe6a42 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2006/08/27 17:58:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.29 2006/09/09 16:50:10 betelgeuse Exp $
+
+*azureus-2.5.0.0-r1 (09 Sep 2006)
+
+  09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/azureus-2.5.0.0-pre, +azureus-2.5.0.0-r1.ebuild:
+  The UI and JAVA_OPTIONS settings in the gentoo.config configuration file
+  work again. Fixes bug #146788.
 
   27 Aug 2006; Petteri Räty <betelgeuse@gentoo.org> azureus-2.5.0.0.ebuild:
   Changed to depend on >=dev-java/swt-3.2-r1 to fix bug #140778.
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 3af031fca9dd..a8a176385f98 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -17,6 +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-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
@@ -84,14 +88,18 @@ EBUILD azureus-2.4.0.2-r2.ebuild 3922 RMD160 3895826187e09780a893b6b6f31989756c8
 MD5 206c6e9b3a06b3aef2c3d17a9f802200 azureus-2.4.0.2-r2.ebuild 3922
 RMD160 3895826187e09780a893b6b6f31989756c8e03a7 azureus-2.4.0.2-r2.ebuild 3922
 SHA256 65c13d3801ecc722078f0d61212b29d000ce1047846a0b983a2040ceb23b1233 azureus-2.4.0.2-r2.ebuild 3922
+EBUILD azureus-2.5.0.0-r1.ebuild 3553 RMD160 9c95ce00cf440c393338c5a9c20f524c61efd449 SHA1 76fde7f8005ca21a6f501e9f6f072287a82f3240 SHA256 170dd04b3fc956e187c31a9678282fa08006a05f8ee8fc7243eb5934bb581533
+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.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 5762 RMD160 5c13e93c03ef15897a8f09639225f72ca9d31fba SHA1 f12630b9ffef3826dd9ce6c7a08648f49b198190 SHA256 7d34291769bb42c984bf25f2ac00a835158075b2e3b9c04b941faad50dbd4753
-MD5 bb5cb250edfad56b7617f193c1367a21 ChangeLog 5762
-RMD160 5c13e93c03ef15897a8f09639225f72ca9d31fba ChangeLog 5762
-SHA256 7d34291769bb42c984bf25f2ac00a835158075b2e3b9c04b941faad50dbd4753 ChangeLog 5762
+MISC ChangeLog 6017 RMD160 d95adc6ec5c9c923086fdf78a24af27af9210f58 SHA1 320f83f15d08170a374d2c77a7881800774e900d SHA256 23377290081fcb76722806346ab01cd0511d2b4521ce91866bf61c506190e044
+MD5 ed4d53538834c8ec2ea0ce30011b37c7 ChangeLog 6017
+RMD160 d95adc6ec5c9c923086fdf78a24af27af9210f58 ChangeLog 6017
+SHA256 23377290081fcb76722806346ab01cd0511d2b4521ce91866bf61c506190e044 ChangeLog 6017
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -105,10 +113,13 @@ SHA256 5bec02bde87a6537da4ed830c90ffd5ab83ab5c35c0365f6dafb57ccd6275a63 files/di
 MD5 6c959658c740af3b04b1973ab07ed71b files/digest-azureus-2.5.0.0 262
 RMD160 422318f0056365b6239ec86ce6c616e86f3ac9cb files/digest-azureus-2.5.0.0 262
 SHA256 ad75c73e602eabb4101378fffa1ab0d105f2695046695eff6beb82ea70988253 files/digest-azureus-2.5.0.0 262
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE8d0zcxLzpIGCsLQRAopGAJ437CGE2V26TOD65ud7S83zR7GltACdHUDX
-C/KYdYEqpEZJSzxE9koT0gg=
-=wpVg
+iD8DBQFFAvDPcxLzpIGCsLQRAivoAJ9a8jYGnCoWM9Cz29MaUrRTZwrVVwCfUxTl
+Zf1k2+8a/BjLVRopNTCQ/JI=
+=6Uzc
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-2.5.0.0-r1.ebuild b/net-p2p/azureus/azureus-2.5.0.0-r1.ebuild
new file mode 100644
index 000000000000..cd8bb3bdbd77
--- /dev/null
+++ b/net-p2p/azureus/azureus-2.5.0.0-r1.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-r1.ebuild,v 1.1 2006/09/09 16:50:10 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
new file mode 100644
index 000000000000..5278c094f80c
--- /dev/null
+++ b/net-p2p/azureus/files/azureus-2.5.0.0-pre
@@ -0,0 +1,65 @@
+#
+# 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
+
+if [[ -f "${gentoocfg}" ]] ; then
+	. "${gentoocfg}"
+	echo "using ${gentoocfg}"
+elif [[ -f "${oldgentoocfg}" ]]; then
+	. "${oldgentoocfg}"
+	echo "using ${oldgentoocfg}"
+else
+	if [[ ! -e "${dotazudir}" ]] ; then
+		mkdir "${dotazudir}"
+		echo "Creating ${dotazudir}" 
+	fi
+
+	# Setup defaults
+	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
+
+fi
+
+if [[ -n "${UI_OPTIONS}" ]]; then
+	echo '${UI_OPTIONS} is no longer supported. ${UI} should be used instead instead' > /dev/stderr
+	echo 'Unsetting ${UI_OPTIONS}'
+	unset UI_OPTIONS
+fi
+
+if [[ -z "${UI}" ]]; then
+	echo '$UI not set adding UI="swt" to your ' ${gentoocfg}
+	echo 'UI="swt"' >> ${gentoocfg}
+fi
+
diff --git a/net-p2p/azureus/files/digest-azureus-2.5.0.0-r1 b/net-p2p/azureus/files/digest-azureus-2.5.0.0-r1
new file mode 100644
index 000000000000..9e923fb8c6d3
--- /dev/null
+++ b/net-p2p/azureus/files/digest-azureus-2.5.0.0-r1
@@ -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