fix 66456 and cleanup

(Portage version: 2.0.51.19)

12 files changed, 62 insertions, 534 deletions

diff --git a/net-p2p/azureus-bin/ChangeLog b/net-p2p/azureus-bin/ChangeLog
index 9287a33e9d4a..b935aece4bd3 100644
--- a/net-p2p/azureus-bin/ChangeLog
+++ b/net-p2p/azureus-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/azureus-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/ChangeLog,v 1.28 2005/02/22 07:15:52 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/ChangeLog,v 1.29 2005/04/03 12:03:55 axxo Exp $
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org>
+  +files/azureus-bin-gentoo.sh, -azureus-bin-2.1.0.0-r1.ebuild,
+  -azureus-bin-2.1.0.2.ebuild, -azureus-bin-2.2.0.0.ebuild,
+  -azureus-bin-2.2.0.0-r1.ebuild, azureus-bin-2.2.0.2.ebuild:
+  fix 66456 and cleanup
 
   22 Feb 2005; Daniel Goller <morfic@gentoo.org> azureus-bin-2.2.0.2.ebuild:
   fix SRC_URI for ppc
diff --git a/net-p2p/azureus-bin/Manifest b/net-p2p/azureus-bin/Manifest
index c04bc4d15d07..8fc860d18bc8 100644
--- a/net-p2p/azureus-bin/Manifest
+++ b/net-p2p/azureus-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5e41ec83ee64c65fbd9d60892c46dd8d azureus-bin-2.1.0.0-r1.ebuild 3616
 MD5 a2b436bdc543534f5f98da94e6d4701d azureus-bin-2.2.0.0.ebuild 3049
 MD5 85dc1d7360f8b602dc82edefc573dbc7 azureus-bin-2.1.0.2.ebuild 3612
@@ -14,15 +11,8 @@ MD5 6ee24e85255f98df2eab6ecc0f37394a files/digest-azureus-bin-2.1.0.2 222
 MD5 dd1bae8b7878a07bd8103cc94c779940 files/digest-azureus-bin-2.1.0.4 295
 MD5 a7dca58499ebe639c0555cd90c135329 files/digest-azureus-bin-2.2.0.0 222
 MD5 9974cf8846a961ae819866fdd0ec590b files/digest-azureus-bin-2.2.0.2 382
-MD5 b950a875ce243bf3d6debd6ddfa89be6 files/azureus-bin-2.0.8.0a-gentoo.sh 1768
+MD5 7b8fb878031d4f5a0e9ae33084394689 files/azureus-bin-2.0.8.0a-gentoo.sh 1165
 MD5 70c17db47c9a596929112714f82ac010 files/azureus.desktop 153
 MD5 b77c306407d22961d757267d4b5c8d98 files/digest-azureus-bin-2.2.0.0-r1 303
 MD5 2d3136c60488dd51bef012cbcb59201b files/azureus.png 743
 MD5 17762081fd25f6928b7bd085fa61d9ee files/azureus-bin-Makefile.patch 402
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCGtquUpKYMelfdYERApaPAJ4x4P9tbIke4+dT4cjOhNsHlfBcLwCcCcQ3
-/Co47OH2rBwia/6rdVw3hFY=
-=ZF88
------END PGP SIGNATURE-----
diff --git a/net-p2p/azureus-bin/azureus-bin-2.1.0.0-r1.ebuild b/net-p2p/azureus-bin/azureus-bin-2.1.0.0-r1.ebuild
deleted file mode 100644
index b447a5c0acc4..000000000000
--- a/net-p2p/azureus-bin/azureus-bin-2.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.1.0.0-r1.ebuild,v 1.5 2005/02/02 03:09:53 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="Azureus - Java BitTorrent Client"
-HOMEPAGE="http://azureus.sourceforge.net/"
-
-MY_PN=${PN/-bin/}
-MY_PV="${PV}a"
-MY_DT=20040224
-
-S=${WORKDIR}/${MY_PN}
-SRC_URI="mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.GTK.tar.bz2
-	 mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.Motif.tar.bz2
-	 mirror://gentoo/seda-${MY_DT}.zip"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-# Still in progress... trying to get most external classes in through DEPENDs rather than 
-KEYWORDS="~x86"
-IUSE="gtk kde"
-
-DEPEND="virtual/libc"
-
-RDEPEND="${DEPEND}
-	dev-java/commons-cli
-	dev-java/log4j
-	kde? ( dev-java/systray4j )
-	dev-java/junit
-	gtk? ( =x11-libs/gtk+-2* )
-	!gtk? ( =x11-libs/openmotif-2.1* )
-	>=virtual/jre-1.4
-	>=net-libs/linc-1.0.3"
-
-# Where to install the package
-PROGRAM_DIR="/usr/lib/${MY_PN}"
-
-src_unpack() {
-	if ! use kde; then
-		einfo "The kde use flag is off, so the systray support will be disabled."
-		einfo "kde is required to build dev-java/systray4j."
-	fi
-
-	if use gtk; then
-		unpack Azureus_${MY_PV}_linux.GTK.tar.bz2
-		echo
-		einfo "Using the GTK Azureus package, to use the Motif package"
-		einfo "  set USE=\"-gtk\" in /etc/make.conf."
-		echo
-	else
-		unpack Azureus_${MY_PV}_linux.Motif.tar.bz2
-		echo
-		einfo "Using the Motif Azureus package, to use the GTK package"
-		einfo "  set USE=\"gtk\" in /etc/make.conf."
-		echo
-
-		# These are provided by =x11-libs/openmotif-2.1.*
-		rm ${S}/libXm.so ${S}/libXm.so.2 ${S}/libXm.so.2.1
-	fi
-
-	cp ${FILESDIR}/${PN}-2.0.8.0a-gentoo.sh ${S}/azureus
-
-	# Set runtime settings in the startup script
-	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${MY_PN}/azureus
-
-	# Unpack seda
-	cd ${S}
-	unpack seda-${MY_DT}.zip
-	tar xjf seda-jnilibs-linux.tar.bz2
-	rm seda*bz2
-}
-
-src_compile() {
-	einfo "Binary only installation.  No compilation required."
-}
-
-src_install() {
-	cd ${S}
-
-	insinto ${PROGRAM_DIR}
-	exeinto ${PROGRAM_DIR}
-
-	doins *.jar
-	doexe *.so
-
-	# keep the plugins dir bug reports from flowing in
-	insinto ${PROGRAM_DIR}/plugins/azupdater
-	doins plugins/azupdater/*
-
-	dobin azureus
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/azureus.png
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/azureus.desktop
-
-	dodoc README.linux seda-README.txt
-	dohtml swt-about.html
-}
-
-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 the upgrade warning in"
-	einfo "View->Configuration->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 "Currently, only the swt interface is available (ie, the setting"
-	einfo "in ~/.Azureus/gentoo.config is ignored).  If you want to use"
-	einfo "any of the other interfaces, you will need to get a CVS version"
-	einfo "of the Azureus2.jar from http://azureus.sourceforge.net/index_CVS.php"
-	einfo "and replace ${PROGRAM_DIR}/Azureus2.jar with it.  If you do this,"
-	einfo "the setting in ~/.Azureus/gentoo.config will be properly used, but"
-	einfo "you should report all bugs pertaining to the CVS release to the"
-	einfo "azureus developers and not Gentoo."
-	echo
-}
diff --git a/net-p2p/azureus-bin/azureus-bin-2.1.0.2.ebuild b/net-p2p/azureus-bin/azureus-bin-2.1.0.2.ebuild
deleted file mode 100644
index 7378c60b1cc4..000000000000
--- a/net-p2p/azureus-bin/azureus-bin-2.1.0.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.1.0.2.ebuild,v 1.5 2005/02/02 03:09:53 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="Azureus - Java BitTorrent Client"
-HOMEPAGE="http://azureus.sourceforge.net/"
-
-MY_PN=${PN/-bin/}
-MY_PV="${PV}"
-MY_DT=20040224
-
-S=${WORKDIR}/${MY_PN}
-SRC_URI="mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.GTK.tar.bz2
-	 mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.Motif.tar.bz2
-	 mirror://gentoo/seda-${MY_DT}.zip"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-# Still in progress... trying to get most external classes in through DEPENDs rather than 
-KEYWORDS="~x86"
-IUSE="gtk kde"
-
-DEPEND="virtual/libc"
-
-RDEPEND="${DEPEND}
-	dev-java/commons-cli
-	dev-java/log4j
-	kde? ( dev-java/systray4j )
-	dev-java/junit
-	gtk? ( =x11-libs/gtk+-2* )
-	!gtk? ( =x11-libs/openmotif-2.1* )
-	>=virtual/jre-1.4
-	>=net-libs/linc-1.0.3"
-
-# Where to install the package
-PROGRAM_DIR="/usr/lib/${MY_PN}"
-
-src_unpack() {
-	if ! use kde; then
-		einfo "The kde use flag is off, so the systray support will be disabled."
-		einfo "kde is required to build dev-java/systray4j."
-	fi
-
-	if use gtk; then
-		unpack Azureus_${MY_PV}_linux.GTK.tar.bz2
-		echo
-		einfo "Using the GTK Azureus package, to use the Motif package"
-		einfo "  set USE=\"-gtk\" in /etc/make.conf."
-		echo
-	else
-		unpack Azureus_${MY_PV}_linux.Motif.tar.bz2
-		echo
-		einfo "Using the Motif Azureus package, to use the GTK package"
-		einfo "  set USE=\"gtk\" in /etc/make.conf."
-		echo
-
-		# These are provided by =x11-libs/openmotif-2.1.*
-		rm ${S}/libXm.so ${S}/libXm.so.2 ${S}/libXm.so.2.1
-	fi
-
-	cp ${FILESDIR}/${PN}-2.0.8.0a-gentoo.sh ${S}/azureus
-
-	# Set runtime settings in the startup script
-	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${MY_PN}/azureus
-
-	# Unpack seda
-	cd ${S}
-	unpack seda-${MY_DT}.zip
-	tar xjf seda-jnilibs-linux.tar.bz2
-	rm seda*bz2
-}
-
-src_compile() {
-	einfo "Binary only installation.  No compilation required."
-}
-
-src_install() {
-	cd ${S}
-
-	insinto ${PROGRAM_DIR}
-	exeinto ${PROGRAM_DIR}
-
-	doins *.jar
-	doexe *.so
-
-	# keep the plugins dir bug reports from flowing in
-	insinto ${PROGRAM_DIR}/plugins/azupdater
-	doins plugins/azupdater/*
-
-	dobin azureus
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/azureus.png
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/azureus.desktop
-
-	dodoc README.linux seda-README.txt
-	dohtml swt-about.html
-}
-
-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 the upgrade warning in"
-	einfo "View->Configuration->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 "Currently, only the swt interface is available (ie, the setting"
-	einfo "in ~/.Azureus/gentoo.config is ignored).  If you want to use"
-	einfo "any of the other interfaces, you will need to get a CVS version"
-	einfo "of the Azureus2.jar from http://azureus.sourceforge.net/index_CVS.php"
-	einfo "and replace ${PROGRAM_DIR}/Azureus2.jar with it.  If you do this,"
-	einfo "the setting in ~/.Azureus/gentoo.config will be properly used, but"
-	einfo "you should report all bugs pertaining to the CVS release to the"
-	einfo "azureus developers and not Gentoo."
-	echo
-}
diff --git a/net-p2p/azureus-bin/azureus-bin-2.2.0.0-r1.ebuild b/net-p2p/azureus-bin/azureus-bin-2.2.0.0-r1.ebuild
deleted file mode 100644
index 4ef001a4a769..000000000000
--- a/net-p2p/azureus-bin/azureus-bin-2.2.0.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.2.0.0-r1.ebuild,v 1.2 2005/02/02 03:09:53 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="Azureus - Java BitTorrent Client"
-HOMEPAGE="http://azureus.sourceforge.net/"
-
-MY_PN=${PN/-bin/}
-MY_PV="${PV}"
-MY_DT=20040224
-
-S=${WORKDIR}/${MY_PN}
-SRC_URI="mirror://gentoo/seda-${MY_DT}.zip
-	x86? ( gtk? ( mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.GTK.tar.bz2 ) )
-	x86? ( !gtk? ( mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.Motif.tar.bz2 ) )
-	amd64? ( mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.AMD64.tar.bz2 )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-# Still in progress... trying to get most external classes in through DEPENDs rather than 
-KEYWORDS="~x86 ~amd64"
-IUSE="kde gtk"
-
-DEPEND="virtual/libc
-	app-arch/unzip"
-
-RDEPEND="${DEPEND}
-	kde? ( dev-java/systray4j )
-	=x11-libs/gtk+-2*
-	>=virtual/jre-1.4"
-
-# Where to install the package
-PROGRAM_DIR="/usr/lib/${MY_PN}"
-
-src_unpack() {
-	if ! use kde; then
-		einfo "The kde use flag is off, so the systray support will be disabled."
-		einfo "kde is required to build dev-java/systray4j."
-	fi
-
-	if use amd64 ; then
-		unpack Azureus_${MY_PV}_linux.AMD64.tar.bz2
-	else
-		if use gtk ; then
-			unpack Azureus_${MY_PV}_linux.GTK.tar.bz2
-			echo
-			einfo "Using the GTK Azureus package, to use the Motif package"
-			einfo "  set USE=\"-gtk\" in /etc/make.conf."
-			echo
-		else
-			unpack Azureus_${MY_PV}_linux.Motif.tar.bz2
-			echo
-			einfo "Using the Motif Azureus package, to use the GTK package"
-			einfo "  set USE=\"gtk\" in /etc/make.conf."
-			echo
-		fi
-	fi
-
-	if use amd64 ; then
-		cd ${S}
-		unpack swt-3.0-linux-gtk-amd64.zip
-		cd ${WORKDIR}
-	fi
-
-	cp ${FILESDIR}/${PN}-2.0.8.0a-gentoo.sh ${MY_PN}/azureus
-
-	# Set runtime settings in the startup script
-	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${MY_PN}/azureus
-
-	# Unpack seda
-	cd ${S}
-	unpack seda-${MY_DT}.zip
-	tar xjf seda-jnilibs-linux.tar.bz2
-	rm seda*bz2
-}
-
-src_compile() {
-	einfo "Binary only installation.  No compilation required."
-}
-
-src_install() {
-	cd ${S}
-
-	insinto ${PROGRAM_DIR}
-	exeinto ${PROGRAM_DIR}
-
-	doins *.jar
-	doexe *.so
-
-	# keep the plugins dir bug reports from flowing in
-	insinto ${PROGRAM_DIR}/plugins/azupdater
-	doins plugins/azupdater/*
-
-	dobin azureus
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/azureus.png
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/azureus.desktop
-
-	dodoc README.linux seda-README.txt
-	dohtml swt-about.html
-}
-
-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 the upgrade warning in"
-	einfo "View->Configuration->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 azurues has entries like"
-	ewarn "\"!MainWindow.menu.transfers!\" then you have a stray MessageBundle.properties file,"
-	ewarn "and you may safely delete ~/.Azureus/MessagesBundle.properties"
-	echo
-}
diff --git a/net-p2p/azureus-bin/azureus-bin-2.2.0.0.ebuild b/net-p2p/azureus-bin/azureus-bin-2.2.0.0.ebuild
deleted file mode 100644
index 82d447e24d8d..000000000000
--- a/net-p2p/azureus-bin/azureus-bin-2.2.0.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.2.0.0.ebuild,v 1.4 2005/02/02 03:09:53 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="Azureus - Java BitTorrent Client"
-HOMEPAGE="http://azureus.sourceforge.net/"
-
-MY_PN=${PN/-bin/}
-MY_PV="${PV}"
-MY_DT=20040224
-
-S=${WORKDIR}/${MY_PN}
-SRC_URI="mirror://gentoo/seda-${MY_DT}.zip
-	x86? ( mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.GTK.tar.bz2 )
-	amd64? ( mirror://sourceforge/${MY_PN}/Azureus_${MY_PV}_linux.AMD64.tar.bz2 )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-# Still in progress... trying to get most external classes in through DEPENDs rather than 
-KEYWORDS="~x86 ~amd64"
-IUSE="kde"
-
-DEPEND="virtual/libc
-	app-arch/unzip"
-
-RDEPEND="${DEPEND}
-	kde? ( dev-java/systray4j )
-	=x11-libs/gtk+-2*
-	>=virtual/jre-1.4"
-
-# Where to install the package
-PROGRAM_DIR="/usr/lib/${MY_PN}"
-
-src_unpack() {
-	if ! use kde; then
-		einfo "The kde use flag is off, so the systray support will be disabled."
-		einfo "kde is required to build dev-java/systray4j."
-	fi
-
-	if use amd64 ; then
-		unpack Azureus_${MY_PV}_linux.AMD64.tar.bz2
-	else
-		unpack Azureus_${MY_PV}_linux.GTK.tar.bz2
-	fi
-
-	if use amd64 ; then
-		cd ${S}
-		unpack swt-3.0-linux-gtk-amd64.zip
-		cd ${WORKDIR}
-	fi
-
-	cp ${FILESDIR}/${PN}-2.0.8.0a-gentoo.sh ${MY_PN}/azureus
-
-	# Set runtime settings in the startup script
-	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${MY_PN}/azureus
-
-	# Unpack seda
-	cd ${S}
-	unpack seda-${MY_DT}.zip
-	tar xjf seda-jnilibs-linux.tar.bz2
-	rm seda*bz2
-}
-
-src_compile() {
-	einfo "Binary only installation.  No compilation required."
-}
-
-src_install() {
-	cd ${S}
-
-	insinto ${PROGRAM_DIR}
-	exeinto ${PROGRAM_DIR}
-
-	doins *.jar
-	doexe *.so
-
-	# keep the plugins dir bug reports from flowing in
-	insinto ${PROGRAM_DIR}/plugins/azupdater
-	doins plugins/azupdater/*
-
-	dobin azureus
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/azureus.png
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/azureus.desktop
-
-	dodoc README.linux seda-README.txt
-	dohtml swt-about.html
-}
-
-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 the upgrade warning in"
-	einfo "View->Configuration->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 azurues has entries like"
-	ewarn "\"!MainWindow.menu.transfers!\" then you have a stray MessageBundle.properties file,"
-	ewarn "and you may safely delete ~/.Azureus/MessagesBundle.properties"
-	echo
-}
diff --git a/net-p2p/azureus-bin/azureus-bin-2.2.0.2.ebuild b/net-p2p/azureus-bin/azureus-bin-2.2.0.2.ebuild
index 1011204f00e2..3463cc9b7d1e 100644
--- a/net-p2p/azureus-bin/azureus-bin-2.2.0.2.ebuild
+++ b/net-p2p/azureus-bin/azureus-bin-2.2.0.2.ebuild
@@ -1,8 +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-bin/azureus-bin-2.2.0.2.ebuild,v 1.4 2005/02/22 07:15:52 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.2.0.2.ebuild,v 1.5 2005/04/03 12:03:55 axxo Exp $
 
-inherit eutils
+inherit eutils java-pkg
 
 DESCRIPTION="Azureus - Java BitTorrent Client"
 HOMEPAGE="http://azureus.sourceforge.net/"
@@ -26,7 +26,8 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="kde gtk"
 
 DEPEND="virtual/libc
-	app-arch/unzip"
+	app-arch/unzip
+	!net-p2p/azureus"
 
 RDEPEND="${DEPEND}
 	kde? ( dev-java/systray4j )
@@ -70,7 +71,7 @@ src_unpack() {
 		cd ${WORKDIR}
 	fi
 
-	cp ${FILESDIR}/${PN}-2.0.8.0a-gentoo.sh ${MY_PN}/azureus
+	cp ${FILESDIR}/${PN}-gentoo.sh ${MY_PN}/azureus || die "failed to copy wrapper"
 
 	# Set runtime settings in the startup script
 	sed -i "s:##PROGRAM_DIR##:${PROGRAM_DIR}:" ${MY_PN}/azureus
@@ -92,7 +93,7 @@ src_install() {
 	insinto ${PROGRAM_DIR}
 	exeinto ${PROGRAM_DIR}
 
-	doins *.jar
+	java-pkg_dojar *.jar
 	doexe *.so
 
 	# keep the plugins dir bug reports from flowing in
@@ -107,7 +108,7 @@ src_install() {
 	insinto /usr/share/applications
 	doins ${FILESDIR}/azureus.desktop
 
-	dodoc README.linux seda-README.txt
+	dodoc seda-README.txt
 	dohtml swt-about.html
 }
 
diff --git a/net-p2p/azureus-bin/files/azureus-bin-gentoo.sh b/net-p2p/azureus-bin/files/azureus-bin-gentoo.sh
new file mode 100644
index 000000000000..ae8f7a7d519e
--- /dev/null
+++ b/net-p2p/azureus-bin/files/azureus-bin-gentoo.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+PROGRAM_DIR=##PROGRAM_DIR##		# directory where all the files were extracted
+
+AZ_CONFIG="${HOME}/.Azureus/gentoo.config"
+if [ -f ~/.Azureus/gentoo.config ]; then
+	. ~/.Azureus/gentoo.config
+else
+	if [ ! -e ~/.Azureus ]; then
+		mkdir ~/.Azureus
+		echo "Creating ~/.Azureus..."
+	fi
+
+	# Setup defaults
+	UI_OPTIONS="--ui=swt"
+
+	# Create the config file
+	cat > ${AZ_CONFIG} <<END
+# User Interface options:
+# web     - web based
+# web2    - web based
+# console - console based
+# swt     - swt (GUI) based
+#
+# When selecting just 1, use '--ui=<ui>'
+# When selecting multiple, use '--uis=<ui>,<ui>'
+UI_OPTIONS="--ui=swt"
+END
+
+fi
+
+MSG0="ERROR:\nYou must edit this script and change PROGRAM_DIR to point to where you installed Azureus"
+MSG1="Attempting to start Azureus..."
+
+AZDIR=./
+if [ ! -e id.azureus.dir.file ]; then
+	AZDIR=$PROGRAM_DIR
+	if [ ! -d $AZDIR ]; then
+		echo $MSG0 >&2
+		exit -1
+	fi
+fi
+
+cd ${AZDIR}
+echo $MSG1
+
+java -cp $(java-config -p systray4j,azureus-bin 2>/dev/null) -Djava.library.path="${AZDIR}" org.gudy.azureus2.ui.swt.Main "$1"
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0-r1 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0-r1
deleted file mode 100644
index 47a892042c01..000000000000
--- a/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 040e89051ddf2a6e07a2303c361b7212 Azureus_2.1.0.0a_linux.GTK.tar.bz2 3712034
-MD5 b9188a6880665bdb85ecc819817921af Azureus_2.1.0.0a_linux.Motif.tar.bz2 4599281
-MD5 5f79ac344851884646166d733b5cde8d seda-20040224.zip 755126
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.2 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.2
deleted file mode 100644
index 260606f33616..000000000000
--- a/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f0006b34369810ce79b2a0072d32cb0b Azureus_2.1.0.2_linux.GTK.tar.bz2 4341772
-MD5 e9e530e7530c4af8f732ae31e9396fec Azureus_2.1.0.2_linux.Motif.tar.bz2 5229609
-MD5 5f79ac344851884646166d733b5cde8d seda-20040224.zip 755126
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0
deleted file mode 100644
index bd0551a14368..000000000000
--- a/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f79ac344851884646166d733b5cde8d seda-20040224.zip 755126
-MD5 cce6c876ad3ce06fe0ba65e7bc746e13 Azureus_2.2.0.0_linux.GTK.tar.bz2 4947567
-MD5 376d5b8f0136f739f31b573a95e51b84 Azureus_2.2.0.0_linux.AMD64.tar.bz2 4954866
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0-r1 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0-r1
deleted file mode 100644
index bd2aab43d73f..000000000000
--- a/net-p2p/azureus-bin/files/digest-azureus-bin-2.2.0.0-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5f79ac344851884646166d733b5cde8d seda-20040224.zip 755126
-MD5 cce6c876ad3ce06fe0ba65e7bc746e13 Azureus_2.2.0.0_linux.GTK.tar.bz2 4947567
-MD5 215bad905b0b697cbcab971c203094ee Azureus_2.2.0.0_linux.Motif.tar.bz2 5777045
-MD5 376d5b8f0136f739f31b573a95e51b84 Azureus_2.2.0.0_linux.AMD64.tar.bz2 4954866