version bump, closes #52546

7 files changed, 139 insertions, 240 deletions

diff --git a/net-p2p/azureus-bin/ChangeLog b/net-p2p/azureus-bin/ChangeLog
index 999a820a4d0a..20fb7bcd3554 100644
--- a/net-p2p/azureus-bin/ChangeLog
+++ b/net-p2p/azureus-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/azureus-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/ChangeLog,v 1.11 2004/05/14 17:09:37 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/ChangeLog,v 1.12 2004/05/31 17:17:09 squinky86 Exp $
+
+*azureus-bin-2.1.0.0 (31 May 2004)
+
+  31 May 2004; Jon Hood <squinky86@gentoo.org>
+  -files/azureus-bin-2.0.7.1_pre20040224-gentoo.sh,
+  -azureus-bin-2.0.7.1_pre20040224.ebuild, +azureus-bin-2.1.0.0.ebuild:
+  version bump, closes #52546; cleanups
 
   14 May 2004; Jon Hood <squinky86@gentoo.org> azureus-bin-2.0.8.4.ebuild:
   add linc to RDEPEND to fix #51030
diff --git a/net-p2p/azureus-bin/Manifest b/net-p2p/azureus-bin/Manifest
index 0480227637d9..37e3d1fc1de4 100644
--- a/net-p2p/azureus-bin/Manifest
+++ b/net-p2p/azureus-bin/Manifest
@@ -1,13 +1,12 @@
-MD5 7ead0eb58d9bfc7b2bda9ec569607308 azureus-bin-2.0.7.1_pre20040224.ebuild 3519
 MD5 5296327ced39564a652dc658b865e575 azureus-bin-2.0.8.4.ebuild 3587
 MD5 e73d13e2501662932e1fb6e97709449b azureus-bin-2.0.8.0a.ebuild 3426
-MD5 6008e45fe7e82b7addfcd1a5ee58bbb3 ChangeLog 1877
+MD5 67a8abcaf105d6a20e56c40f45c22fd4 ChangeLog 2125
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 492b5db31f8be8a352cc1eb3adb23ba1 files/digest-azureus-bin-2.0.7.1_pre20040224 299
+MD5 50bc7aaac6d97417d6ac96b25cc1dbbb azureus-bin-2.1.0.0.ebuild 3501
 MD5 8b9348c5c2380df483035981f29d3126 files/digest-azureus-bin-2.0.8.4 222
+MD5 520976b4596a7467299ff872cb678f06 files/digest-azureus-bin-2.1.0.0 224
 MD5 0b7b4678fdb7cc0211a089ce94dfc87f files/azureus-bin-2.0.8.0a-gentoo.sh 1768
 MD5 05e40b9feac40ba41ddb08f80eb60654 files/digest-azureus-bin-2.0.8.0a 224
 MD5 70c17db47c9a596929112714f82ac010 files/azureus.desktop 153
-MD5 a5ae00888f1b5e4910a2005c77002994 files/azureus-bin-2.0.7.1_pre20040224-gentoo.sh 2505
 MD5 ee749afb43f4267d15bb2db82ed6a98f files/azureus.png 12835
 MD5 17762081fd25f6928b7bd085fa61d9ee files/azureus-bin-Makefile.patch 402
diff --git a/net-p2p/azureus-bin/azureus-bin-2.0.7.1_pre20040224.ebuild b/net-p2p/azureus-bin/azureus-bin-2.0.7.1_pre20040224.ebuild
deleted file mode 100644
index c5fe3fee1123..000000000000
--- a/net-p2p/azureus-bin/azureus-bin-2.0.7.1_pre20040224.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus-bin/azureus-bin-2.0.7.1_pre20040224.ebuild,v 1.3 2004/03/24 04:21:30 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Azureus - Java BitTorrent Client"
-HOMEPAGE="http://azureus.sourceforge.net/"
-
-MY_PN=${PN/-bin/}
-MY_PV=`echo ${PV} | sed 's/_pre.*$//'`
-MY_DT=`echo ${PV} | sed 's/^.*_pre//'`
-MY_JV="${MY_PV}-${MY_DT}"
-
-# The release version we're starting from
-BASE_V="2.0.7.0a"
-
-S=${WORKDIR}/${MY_PN}
-
-SRC_URI="mirror://sourceforge/${MY_PN}/Azureus_${BASE_V}_linux.GTK.tar.bz2
-	 mirror://sourceforge/${MY_PN}/Azureus_${BASE_V}_linux.Motif.tar.bz2
-	 mirror://gentoo/seda-${MY_DT}.zip
-	 mirror://gentoo/Azureus2-${MY_JV}.jar"
-
-RESTRICT="nomirror"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE="gtk kde"
-
-DEPEND="kde? ( >=x11-libs/qt-3*
-		>=kde-base/kdelibs-3* )"
-
-RDEPEND="${DEPEND}
-	dev-java/commons-cli
-	gtk? ( =x11-libs/gtk+-2* )
-	>=virtual/jre-1.4"
-
-# Where to install the package
-PROGRAM_DIR="/usr/lib/${MY_PN}"
-
-src_unpack() {
-	if [ `use gtk` ] ; then
-		unpack Azureus_${BASE_V}_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_${BASE_V}_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
-
-		# Delete these links so they don't mess us up in install
-		# Links are remade later in the installation
-		rm ${S}/libXm.so
-		rm ${S}/libXm.so.2
-	fi
-
-	cp ${DISTDIR}/Azureus2-${MY_JV}.jar ${S}/Azureus2.jar
-
-	# Patch cleans up Makefile
-	epatch ${FILESDIR}/${PN}-Makefile.patch
-
-	cp ${FILESDIR}/${P}-gentoo.sh ${S}/azureus
-
-	if [ ! `use kde` ] ; then
-		sed -i "s:ON=TRUE:ON=FALSE:" ${MY_PN}/azureus
-	fi
-
-	# 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() {
-	if [ `use kde` ] ; then
-		cd ${S}/systray4jdaemon
-		emake || die
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	insinto ${PROGRAM_DIR}
-	exeinto ${PROGRAM_DIR}
-
-	doins *.jar id.azureus.dir.file
-	doexe *.so
-
-	# This only needs to be run when using the Motif package
-	if [ ! `use gtk` ] ; then
-		doexe libXm.so.2.1
-		dosym libXm.so.2.1 ${PROGRAM_DIR}/libXm.so
-		dosym libXm.so.2.1 ${PROGRAM_DIR}/libXm.so.2
-	fi
-
-	if [ `use kde` ] ; then
-		doexe systray4jdaemon/systray4jd
-	fi
-
-	dobin azureus
-
-	dodoc README.linux seda-README.txt
-}
-
-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."
-	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
-
-	if [ `use kde` ] ; then
-		einfo "The KDE system tray daemon has been built with your"
-		einfo "installation.  To disable this feature you must modify"
-		einfo "~/.azureus/gentoo.config after running azureus for the"
-		einfo "first time."
-		echo
-	fi
-
-	einfo "Currently, only the swt interface is usable.  Please comment"
-	einfo "at http://bugs.gentoo.org/show_bug.cgi?id=35556 if you have a"
-	einfo "fix for the other interfaces."
-}
diff --git a/net-p2p/azureus-bin/azureus-bin-2.1.0.0.ebuild b/net-p2p/azureus-bin/azureus-bin-2.1.0.0.ebuild
new file mode 100644
index 000000000000..108753ef4b89
--- /dev/null
+++ b/net-p2p/azureus-bin/azureus-bin-2.1.0.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.1 2004/05/31 17:17:09 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/glibc"
+
+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
+
+	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/files/azureus-bin-2.0.7.1_pre20040224-gentoo.sh b/net-p2p/azureus-bin/files/azureus-bin-2.0.7.1_pre20040224-gentoo.sh
deleted file mode 100644
index fc35067c86da..000000000000
--- a/net-p2p/azureus-bin/files/azureus-bin-2.0.7.1_pre20040224-gentoo.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-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
-	KDE_SYSTRAY4J_DAEMON=TRUE
-	UI_OPTIONS="--ui=swt"
-
-	# Create the config file
-	cat > ${AZ_CONFIG} <<END
-# KDE_SYSTRAY4J_DAEMON: TRUE or FALSE to enable/disable the KDE systray icon.
-KDE_SYSTRAY4J_DAEMON=${KDE_SYSTRAY4J_DAEMON}
-
-# 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 systray4j KDE daemon..."
-MSG2="Systray4j daemon started"
-MSG3="Starting for first time: attempting to compile and link..."
-MSG4="Compile and link successful"
-MSG5="Compile and link FAILED: to fix, please read "
-MSG6="Unable to locate systray4jd source files"
-MSG7="Systray4j daemon detected already running"
-MSG8="Attempting to start Azureus..."
-
-AZDIR=./
-if [ ! -e id.azureus.dir.file ]; then
-  AZDIR=$PROGRAM_DIR
-  if [ ! -d $AZDIR ]; then
-    echo $MSG0
-	 exit -1
-  fi
-fi
-
-cd ${AZDIR}
-
-#should we attempt to load systray4j daemon ?
-if [ "$KDE_SYSTRAY4J_DAEMON" == "TRUE" ]; then
-  echo $MSG1
-  #check to make sure it is not already running
-  runcount=`ps -ef | grep -v grep | grep -c systray4jd`
-  if `test $runcount = 0` ; then
-    ./systray4jd&
-  else
-    echo $MSG7	      
-  fi	
-fi
-
-echo $MSG8
-
-# DOESN'T WORK	
-#JARS=`ls *.jar | grep -v Azureus2`
-#for FILE in $JARS; do CLASSPATH="${FILE}:${CLASSPATH}"; done
-#java -cp $CLASSPATH -Djava.library.path="${AZDIR}" -jar Azureus2.jar ${UI_OPTIONS} "$1"
-
-# WORKS, BUT ONLY SWT
-for FILE in *.jar; do CLASSPATH="${FILE}:${CLASSPATH}"; done
-java -cp $CLASSPATH -Djava.library.path="${AZDIR}" org.gudy.azureus2.ui.swt.Main "$1"
-
-if [ $? -ne 0 ]; then
-	echo "If you recieved an error about missing log4j or cli, you "
-	echo "need to setup your classpath correctly."
-	echo "This should do the trick (as root):"
-	echo "java-config --add-system-classpath=junit,log4j,commons-cli"
-	echo "env-update && source /etc/profile"
-fi
-
-proc_id=`ps -ef | grep -v grep | grep systray4jd | awk '{print $2}'`
-if [ ! "$proc_id" == "" ] ; then
-  kill -9 $proc_id
-fi
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.0.7.1_pre20040224 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.0.7.1_pre20040224
deleted file mode 100644
index fd17a922f10d..000000000000
--- a/net-p2p/azureus-bin/files/digest-azureus-bin-2.0.7.1_pre20040224
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 0799cc2c7a8dc1e32bcc7524984de5aa Azureus_2.0.7.0a_linux.GTK.tar.bz2 2718698
-MD5 3aa84aa0f4970402612e4f21c380abf1 Azureus_2.0.7.0a_linux.Motif.tar.bz2 3629906
-MD5 5f79ac344851884646166d733b5cde8d seda-20040224.zip 755126
-MD5 af980920af1e20da243fbb42875dcf09 Azureus2-2.0.7.1-20040224.jar 2035933
diff --git a/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0 b/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0
new file mode 100644
index 000000000000..47a892042c01
--- /dev/null
+++ b/net-p2p/azureus-bin/files/digest-azureus-bin-2.1.0.0
@@ -0,0 +1,3 @@
+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