Add multilib fix and mark ~amd64.

Package-Manager: portage-2.0.53_rc7

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 68dc8257468be2b0b9bf3bf2ed27d614b1353e38..3b0ecfc29b7b6f345d746ed4e15ba35c1e87bf29 100644 (file)
--- 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 5f92327f9ea4c5ae0f54a57daeab88961f96e012..4c508272781195f4a16ba504ba5e695987b82043 100644 (file)
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fa06dfd414a4dc1289c8b92c014978c8 ChangeLog 1393
+MD5 c87917c646460c4f64658fbef2a40505 ChangeLog 1550
 MD5 ff3e702ff946e17b534a1a0971cab592 azureus-2.2.0.0-r1.ebuild 2345
-MD5 e0f53d42b0f9005919d82d10fa28a526 azureus-2.3.0.4.ebuild 2532
+MD5 0aee5632d7755d629ae59035e6e59f92 azureus-2.3.0.4.ebuild 2603
 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
@@ -17,7 +17,7 @@ MD5 a63336d02253ae5fe2ad69f813bdd7d8 metadata.xml 329
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDhkcMQiJ/wx066S4RAhi9AJ9CqgE2EZhr7wsufW6FQOdjsUFuEgCdEl4N
-BCLfEJ/wuo+2JSzDcUCPWFU=
-=msBk
+iD8DBQFDhliI2G5bA0cA/ScRAqW4AJ4+p33bi0aBoifPswbvGUoEoUPjGQCfec88
+WJ1OE8rIphIuq2/2wyUf9TI=
+=Dtoa
 -----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 d8745e995c14f4ba02f416f72784144a245aa4bc..04fc57a882ff1bebce9202fcb675d748f84f73d6 100644 (file)
--- 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 f42bc4430b0a3ca1c0d8d7fff8d2200f58ceed7a..2d19d272107fd4674467090c4e99bebe8e0235b4 100644 (file)
--- 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"