Add multilib fix and mark ~amd64.

(Portage version: 2.0.53_rc7)

4 files changed, 16 insertions, 19 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 68dc8257468b..3b0ecfc29b7b 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.8 2005/11/24 23:04:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.9 2005/11/25 00:19:02 herbs Exp $
+
+  25 Nov 2005; Herbie Hopkins <herbs@gentoo.org>
+  files/azureus-gentoo-2.3.0.4.sh, azureus-2.3.0.4.ebuild:
+  Add a multilib fix and mark ~amd64 wrt bug 113389.
 
   24 Nov 2005; Petteri Räty <betelgeuse@gentoo.org> azureus-2.3.0.4.ebuild:
   Increased allowed memory size while compiling to allow building on amd64.
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index 5f92327f9ea4..0270068629e8 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa06dfd414a4dc1289c8b92c014978c8 ChangeLog 1393
+MD5 bbde64a594272bd0d07029d32b3ea4f5 ChangeLog 1555
 MD5 ff3e702ff946e17b534a1a0971cab592 azureus-2.2.0.0-r1.ebuild 2345
-MD5 e0f53d42b0f9005919d82d10fa28a526 azureus-2.3.0.4.ebuild 2532
+MD5 2e208b68615b4cabf850fee664dd2f28 azureus-2.3.0.4.ebuild 2608
 MD5 21218e1a7c134f02c8e42bcb63375e74 files/SWTThread.java 2549
 MD5 e3cc00baa30d499993d4f65e56ad03bc files/UpdaterPatcher.java 2523
-MD5 7aeb8af08a00d9bec6d2b7aaddc55fa8 files/azureus-gentoo-2.3.0.4.sh 1000
+MD5 6d60bd5e1461cf5f8bc467794e6a1827 files/azureus-gentoo-2.3.0.4.sh 1008
 MD5 77d299aef0633c501b998f3ec0c1f0c9 files/azureus-gentoo.sh 1010
 MD5 70c17db47c9a596929112714f82ac010 files/azureus.desktop 153
 MD5 2d3136c60488dd51bef012cbcb59201b files/azureus.png 743
@@ -14,10 +11,3 @@ MD5 3ae1e81c8450fa93040e4e97a1311d88 files/build.xml 661
 MD5 67821fe5d66efda508803dfa3a87b967 files/digest-azureus-2.2.0.0-r1 134
 MD5 29bddb8c1c68b6c8cb4fd46b070b7a2d files/digest-azureus-2.3.0.4 134
 MD5 a63336d02253ae5fe2ad69f813bdd7d8 metadata.xml 329
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDhkcMQiJ/wx066S4RAhi9AJ9CqgE2EZhr7wsufW6FQOdjsUFuEgCdEl4N
-BCLfEJ/wuo+2JSzDcUCPWFU=
-=msBk
------END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-2.3.0.4.ebuild b/net-p2p/azureus/azureus-2.3.0.4.ebuild
index d8745e995c14..04fc57a882ff 100644
--- a/net-p2p/azureus/azureus-2.3.0.4.ebuild
+++ b/net-p2p/azureus/azureus-2.3.0.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.3.0.4.ebuild,v 1.4 2005/11/24 23:04:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.3.0.4.ebuild,v 1.5 2005/11/25 00:19:02 herbs Exp $
+
+inherit multilib
 
 DESCRIPTION="Azureus - Java BitTorrent Client"
 HOMEPAGE="http://azureus.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip
 		mirror://gentoo/seda-20040224.zip"
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/swt-3.0-r2
 	>=dev-java/log4j-1.2.8
@@ -39,8 +41,9 @@ src_unpack() {
 
 
 	# Set runtime settings in the startup script
-	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${S}/azureus \
-		|| die "sed azureus program dir failed !"
+	sed -i -e "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" \
+		-e "s:##LIBRARY_PATH##:/usr/$(get_libdir):" \
+		${S}/azureus || die "sed azureus program dir failed !"
 	rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/ui/swt/test org/gudy/azureus2/platform/macosx/access
 
 	cp ${FILESDIR}/UpdaterPatcher.java ${S}/org/gudy/azureus2/update/ \
diff --git a/net-p2p/azureus/files/azureus-gentoo-2.3.0.4.sh b/net-p2p/azureus/files/azureus-gentoo-2.3.0.4.sh
index f42bc4430b0a..2d19d272107f 100644
--- a/net-p2p/azureus/files/azureus-gentoo-2.3.0.4.sh
+++ b/net-p2p/azureus/files/azureus-gentoo-2.3.0.4.sh
@@ -39,4 +39,4 @@ fi
 cd ${dotazudir}
 
 CLASSPATH=$(java-config -p junit,log4j,commons-cli-1,swt-3):${azudir}/azureus.jar:${azudir}/seda.jar
-java -cp $CLASSPATH -Djava.library.path=/usr/lib org.gudy.azureus2.ui.swt.Main "$1"
+java -cp $CLASSPATH -Djava.library.path=##LIBRARY_PATH## org.gudy.azureus2.ui.swt.Main "$1"