Applies a patch, yanked from debian, which addresses pop ups not going away. Fixes bug #132578

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 173 insertions, 5 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 2c54e8303e27..4f06afe64cfc 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.19 2006/07/31 03:34:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.20 2006/08/01 20:34:00 nichoj Exp $
+
+*azureus-2.4.0.2-r1 (01 Aug 2006)
+
+  01 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/azureus-2.4.0.2-popup-hide-debian.patch,
+  +azureus-2.4.0.2-r1.ebuild:
+  Applies a patch, yanked from debian, which addresses pop ups not going away.
+  Fixes bug #132578
 
   31 Jul 2006; Joshua Nichols <nichoj@gentoo.org> azureus-2.4.0.2.ebuild:
   Keyworded ~amd64. Now forces use of ecj for compilation on amd64 to get
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 12cf00c83501..c7f44718d160 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -6,6 +6,10 @@ AUX UpdaterPatcher.java 2523 RMD160 3fcd11eb78ff1b5871d1be1846546eee0f56d094 SHA
 MD5 e3cc00baa30d499993d4f65e56ad03bc files/UpdaterPatcher.java 2523
 RMD160 3fcd11eb78ff1b5871d1be1846546eee0f56d094 files/UpdaterPatcher.java 2523
 SHA256 0e2860bc8bc8e9672a0413ca0c49acf80c0e2f78c20360a2518422db3c2722c2 files/UpdaterPatcher.java 2523
+AUX azureus-2.4.0.2-popup-hide-debian.patch 1296 RMD160 35048992e50131f8405eb4e9e81877ca1fc485f5 SHA1 f328478a34f9eac6a8a976bb58d95b3da50c2240 SHA256 49305a7cf479aa6e13de33b542a7bd400e1b020d63e10dbd905af9bdfd7186bf
+MD5 06ad6c2b4f43aa0f8f621c36d3e1f03d files/azureus-2.4.0.2-popup-hide-debian.patch 1296
+RMD160 35048992e50131f8405eb4e9e81877ca1fc485f5 files/azureus-2.4.0.2-popup-hide-debian.patch 1296
+SHA256 49305a7cf479aa6e13de33b542a7bd400e1b020d63e10dbd905af9bdfd7186bf files/azureus-2.4.0.2-popup-hide-debian.patch 1296
 AUX azureus-2.4.0.2-pre 1435 RMD160 ae54adaf3c8eeca1cb13382b708f5d22ff681786 SHA1 fbabbedcc23fc308583eaf282163c2cbebe17972 SHA256 d8261f915247c2f1d669c27b41d36b8305e014730352ae40b0ad32e29c1a3ea1
 MD5 06e61ac201baaeed24f1f74713846e96 files/azureus-2.4.0.2-pre 1435
 RMD160 ae54adaf3c8eeca1cb13382b708f5d22ff681786 files/azureus-2.4.0.2-pre 1435
@@ -52,14 +56,18 @@ EBUILD azureus-2.3.0.6-r1.ebuild 3652 RMD160 a08653fa3a8ce890eea24908315e8ae6dfb
 MD5 3a1933465346340106eb0867e426a40d azureus-2.3.0.6-r1.ebuild 3652
 RMD160 a08653fa3a8ce890eea24908315e8ae6dfb5ed29 azureus-2.3.0.6-r1.ebuild 3652
 SHA256 8ba1f22c86534b15d13ba2ae3da6ee829e14403aea30bc6ae1775c7caa6ac9f9 azureus-2.3.0.6-r1.ebuild 3652
+EBUILD azureus-2.4.0.2-r1.ebuild 3694 RMD160 c492c71bdd7113d9c04c309ebd26252372c50c1a SHA1 a2c7f0257a02b42442e2714f1da41b560d0149f0 SHA256 e5fd2e25f229ac09438649571e586e457a2d0e944db76b63864d6bf373d5dac0
+MD5 a955752cb982c3dad5a1e4673ff44a81 azureus-2.4.0.2-r1.ebuild 3694
+RMD160 c492c71bdd7113d9c04c309ebd26252372c50c1a azureus-2.4.0.2-r1.ebuild 3694
+SHA256 e5fd2e25f229ac09438649571e586e457a2d0e944db76b63864d6bf373d5dac0 azureus-2.4.0.2-r1.ebuild 3694
 EBUILD azureus-2.4.0.2.ebuild 3490 RMD160 f3996a790b8a1b35f6add543d24db76ba1af8d46 SHA1 1535841e214965503354b821761fe13a16ad3d38 SHA256 f056b1a4ddd33113adb1798da6906e2754b47aea62b2b2b30dfd828560b4c4df
 MD5 63fd8fa2699deaff86671a6fa7be4c40 azureus-2.4.0.2.ebuild 3490
 RMD160 f3996a790b8a1b35f6add543d24db76ba1af8d46 azureus-2.4.0.2.ebuild 3490
 SHA256 f056b1a4ddd33113adb1798da6906e2754b47aea62b2b2b30dfd828560b4c4df azureus-2.4.0.2.ebuild 3490
-MISC ChangeLog 3929 RMD160 f4067cd687df587fde3ffcc8de5f5d61786c7c08 SHA1 1d12366f2bead6c936886502096768d196aca7a3 SHA256 8826cf2304be2308f419093d2c628ba96bc10afadd42c7e3c3ccf2c6258e3770
-MD5 215cf8c0be7e8a5bfd0e08922905814e ChangeLog 3929
-RMD160 f4067cd687df587fde3ffcc8de5f5d61786c7c08 ChangeLog 3929
-SHA256 8826cf2304be2308f419093d2c628ba96bc10afadd42c7e3c3ccf2c6258e3770 ChangeLog 3929
+MISC ChangeLog 4194 RMD160 ffa5e6444179ac3b6c7cbf6e99dad90120a21586 SHA1 e3678776e6be81ef207ef795c10e4525bd5ce727 SHA256 2adef0ed9f6894e778a4749be43be3332ba08dc93f169a9618ca946c136c3663
+MD5 3f2e52fca97f1c7a1c23d7a1605c0f11 ChangeLog 4194
+RMD160 ffa5e6444179ac3b6c7cbf6e99dad90120a21586 ChangeLog 4194
+SHA256 2adef0ed9f6894e778a4749be43be3332ba08dc93f169a9618ca946c136c3663 ChangeLog 4194
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -70,3 +78,6 @@ SHA256 0b8c9b6cde8975ae52a9d2a12953b98003446eb65c91a666e7da6a0bd8c5731f files/di
 MD5 0865591e643067b5b233f5b8380a83fc files/digest-azureus-2.4.0.2 262
 RMD160 40649bc96d9c7d34abf348ec21c0511749e1a64f files/digest-azureus-2.4.0.2 262
 SHA256 5bec02bde87a6537da4ed830c90ffd5ab83ab5c35c0365f6dafb57ccd6275a63 files/digest-azureus-2.4.0.2 262
+MD5 0865591e643067b5b233f5b8380a83fc files/digest-azureus-2.4.0.2-r1 262
+RMD160 40649bc96d9c7d34abf348ec21c0511749e1a64f files/digest-azureus-2.4.0.2-r1 262
+SHA256 5bec02bde87a6537da4ed830c90ffd5ab83ab5c35c0365f6dafb57ccd6275a63 files/digest-azureus-2.4.0.2-r1 262
diff --git a/net-p2p/azureus/azureus-2.4.0.2-r1.ebuild b/net-p2p/azureus/azureus-2.4.0.2-r1.ebuild
new file mode 100644
index 000000000000..b1b68c659d62
--- /dev/null
+++ b/net-p2p/azureus/azureus-2.4.0.2-r1.ebuild
@@ -0,0 +1,116 @@
+# 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.4.0.2-r1.ebuild,v 1.1 2006/08/01 20:34:00 nichoj Exp $
+
+inherit eutils 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 ~x86"
+
+IUSE="source"
+
+RDEPEND=">=virtual/jre-1.4
+	>dev-java/swt-3.2_pre1
+	>=dev-java/log4j-1.2.8
+	>=dev-java/commons-cli-1.0
+	>=dev-java/bcprov-1.31
+	!net-p2p/azureus-bin"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-core-1.6.2
+	amd64? ( =dev-java/eclipse-ecj-3.1* )
+	>=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/
+
+	# patch to make hide popup buttons work again with >=gtk+-2.8.17
+	# see bug #132578
+	# courtesy of debian, taken from their azureus_2.4.0.2-3.diff.gz
+	epatch ${FILESDIR}/${P}-popup-hide-debian.patch
+
+	#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() {
+	# TODO test if this is still needed, and if so, use java-config --runtime
+	# instead
+	# Figure out correct boot classpath for IBM jdk.
+	if [ ! -z "$(java-config --java-version | grep IBM)" ] ; then
+		# IBM JRE
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
+	fi
+
+	# amd64 runs out of memory with javac... use ecj instead
+	use amd64  && java-pkg_force-compiler 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.swt.Main \
+		-pre ${FILESDIR}/${P}-pre
+
+	doicon "${FILESDIR}/azureus.png"
+	domenu "${FILESDIR}/azureus.desktop"
+	use source && java-pkg_dosrc ${S}/{com,org}
+}
+
+pkg_postinst() {
+	echo
+	einfo "Due to the nature of the portage system, we recommend"
+	einfo "that users check portage for new versions of Azureus"
+	einfo "instead of attempting to use the auto-update feature."
+	einfo "You can disable auto-update in"
+	einfo "Tools->Options...->Interface->Start"
+	echo
+	einfo "After running azureus for the first time, configuration"
+	einfo "options will be placed in ~/.azureus/gentoo.config"
+	einfo "It is recommended that you modify this file rather than"
+	einfo "the azureus startup script directly."
+	echo
+	einfo "As of this version, the new ui type 'console' is supported,"
+	einfo "and this may be set in ~/.azureus/gentoo.config."
+	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
+	einfo "It's recommended to use Sun's Java version 1.5 or later."
+	einfo "If you're experiencing problems running azureus and you've"
+	einfo "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!"
+}
diff --git a/net-p2p/azureus/files/azureus-2.4.0.2-popup-hide-debian.patch b/net-p2p/azureus/files/azureus-2.4.0.2-popup-hide-debian.patch
new file mode 100644
index 000000000000..438a73b09d8c
--- /dev/null
+++ b/net-p2p/azureus/files/azureus-2.4.0.2-popup-hide-debian.patch
@@ -0,0 +1,30 @@
+--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java
++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java
+@@ -324,7 +324,8 @@
+ 		btnHideAll = new Button(cButtons, SWT.PUSH);

+ 		Messages.setLanguageText(btnHideAll, "popup.error.hideall");

+ 		btnHideAll.setVisible(false);

+-		btnHideAll.addListener(SWT.Selection, new Listener() {

++		// XXX SWT.Selection doesn't work on latest GTK (2.8.17) & SWT3.2 for ON_TOP

++		btnHideAll.addListener(SWT.MouseUp, new Listener() {

+ 			public void handleEvent(Event arg0) {

+ 				cButtons.setEnabled(false);

+ 				try {

+@@ -348,7 +349,7 @@
+ 

+ 		final Button btnDetails = new Button(cButtons, SWT.TOGGLE);

+ 		Messages.setLanguageText(btnDetails, "popup.error.details");

+-		btnDetails.addListener(SWT.Selection, new Listener() {

++		btnDetails.addListener(SWT.MouseUp, new Listener() {

+ 			public void handleEvent(Event arg0) {

+ 				try {

+ 					boolean bShow = btnDetails.getSelection();

+@@ -394,7 +395,7 @@
+ 

+ 		final Button btnHide = new Button(cButtons, SWT.PUSH);

+ 		Messages.setLanguageText(btnHide, "popup.error.hide");

+-		btnHide.addListener(SWT.Selection, new Listener() {

++		btnHide.addListener(SWT.MouseUp, new Listener() {

+ 			public void handleEvent(Event arg0) {

+ 				cButtons.setEnabled(false);

+ 				shell.dispose();

diff --git a/net-p2p/azureus/files/digest-azureus-2.4.0.2-r1 b/net-p2p/azureus/files/digest-azureus-2.4.0.2-r1
new file mode 100644
index 000000000000..432788e32da0
--- /dev/null
+++ b/net-p2p/azureus/files/digest-azureus-2.4.0.2-r1
@@ -0,0 +1,3 @@
+MD5 f79a2c3664fe26a21d208551bfac4b6f Azureus_2.4.0.2_source.zip 5188679
+RMD160 60b260bc34ce06ace1ae16dad330548b2db3cea7 Azureus_2.4.0.2_source.zip 5188679
+SHA256 3c25d6560110b64acf7b395950f1b9b2553a365215a0e3fb6bce3d2414147099 Azureus_2.4.0.2_source.zip 5188679