stable on x86

10 files changed, 14 insertions, 214 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 43126a3cfa99..ac117fd3fd78 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.29 2004/08/08 03:02:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.30 2004/08/14 00:44:00 squinky86 Exp $
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> amule-1.2.8.ebuild,
+  -amule-2.0.0_rc3.ebuild:
+  Stable on x86, cleanup old ebuilds.
 
   07 Aug 2004; Jon Hood <squinky86@gentoo.org> amule-2.0.0_rc5.ebuild:
   Inherit wxwindows; thanks Giacomo Perale <ghepeu@virgilio.it>, #59672.
diff --git a/net-p2p/amule/amule-1.2.8.ebuild b/net-p2p/amule/amule-1.2.8.ebuild
index 324b985f02b7..327b80db54b3 100644
--- a/net-p2p/amule/amule-1.2.8.ebuild
+++ b/net-p2p/amule/amule-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.1 2004/07/14 23:16:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.2 2004/08/14 00:44:00 squinky86 Exp $
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -11,7 +11,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="debug nls remote"
 
 DEPEND=">=x11-libs/wxGTK-2.4.2
diff --git a/net-p2p/amule/amule-2.0.0_rc3.ebuild b/net-p2p/amule/amule-2.0.0_rc3.ebuild
deleted file mode 100644
index c9008dcd2157..000000000000
--- a/net-p2p/amule/amule-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc3.ebuild,v 1.6 2004/07/02 20:26:25 squinky86 Exp $
-
-MY_P=${P/m/M}
-MY_P=${MY_P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="aNOTHER wxWindows based eMule P2P Client"
-HOMEPAGE="http://www.amule.org"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# this is a release candidate- do not put in the stable tree yet
-KEYWORDS="~x86 ~amd64"
-IUSE="debug nls stats remote"
-RESTRICT="nomirror"
-
-EXTRA_ECONF="--disable-optimise"
-
-# optimizations disabled for better stability
-# new USE "noamulestats" disables aMule GUI statistics (wxCas) (require gd)
-# new USE "noamuleremote" disables remote control utilities: webserver, 
-# web client, amulecmd text client
-
-
-DEPEND=">=x11-libs/wxGTK-2.4.2
-	>=net-misc/curl-7.11.0
-	>=dev-libs/crypto++-5.1
-	>=sys-libs/zlib-1.2.1
-	stats? ( >=media-libs/gd-2.0.22 )"
-
-pkg_setup() {
-
-	# GTK2 is unstable and not supported by aMule developers
-	if wx-config --cppflags | grep gtk2 >& /dev/null; then
-		einfo "Compiling ${PN} against wxGTK2 is not supported."
-		die "wxGTK must be re-emerged with USE=-gtk2."
-	fi
-
-	# aMule doesn't compile against unicoded wxGTK at all.
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "${PN} will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-
-}
-
-src_compile() {
-
-	use remote || EXTRA_ECONF="${EXTRA_ECONF} --disable-amulecmd \
-							--disable-amulecmdgui \
-							--disable-webserver \
-							--disable-webservergui" \
-			|| EXTRA_ECONF="${EXTRA_ECONF} --enable-amulecmd \
-							--enable-amulecmdgui \
-							--enable-webserver \
-							--enable-webservergui"
-
-	#workaround for broken configure (doesn't recognize --enable-wxcas)
-	use stats || EXTRA_ECONF="${EXTRA_ECONF} --disable-wxcas"
-
-	econf `use_enable nls` \
-	`use_enable debug` || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/net-p2p/amule/files/digest-amule-2.0.0_rc3 b/net-p2p/amule/files/digest-amule-2.0.0_rc3
deleted file mode 100644
index 0adc1a6d5b04..000000000000
--- a/net-p2p/amule/files/digest-amule-2.0.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c56b982e89bff7fc10af57bbb57b7db aMule-2.0.0rc3.tar.bz2 2283194
diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index 855178d38916..0c4ae2201084 100644
--- a/net-p2p/bittornado/ChangeLog
+++ b/net-p2p/bittornado/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bittornado
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.22 2004/07/17 15:12:51 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.23 2004/08/14 00:41:35 squinky86 Exp $
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> -bittornado-0.3.2.ebuild,
+  -bittornado-0.3.3.ebuild, bittornado-0.3.6.ebuild:
+  Stable on x86; clean up old ebuilds.
 
   17 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/bttrack.conf,
   +files/bttrack.rc, +files/favicon.ico, bittornado-0.3.7.ebuild:
diff --git a/net-p2p/bittornado/bittornado-0.3.2.ebuild b/net-p2p/bittornado/bittornado-0.3.2.ebuild
deleted file mode 100644
index bf86147f69d3..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.2.ebuild,v 1.5 2004/07/06 09:57:00 kang Exp $
-
-inherit distutils eutils
-
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://e.scarywater.net/bt/download/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittornado"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		dodir ${PIXMAPLOC}
-		insinto ${PIXMAPLOC}
-		doins *.ico *.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
-	else
-		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
-		rm ${D}/usr/bin/*gui.py
-	fi
-}
-
diff --git a/net-p2p/bittornado/bittornado-0.3.3.ebuild b/net-p2p/bittornado/bittornado-0.3.3.ebuild
deleted file mode 100644
index 790f16342ff3..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.3.ebuild,v 1.3 2004/07/06 09:57:00 kang Exp $
-
-inherit distutils eutils
-
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://e.scarywater.net/bt/download/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittornado"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		dodir ${PIXMAPLOC}
-		insinto ${PIXMAPLOC}
-		doins *.ico *.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
-	else
-		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
-		rm ${D}/usr/bin/*gui.py
-	fi
-}
-
diff --git a/net-p2p/bittornado/bittornado-0.3.6.ebuild b/net-p2p/bittornado/bittornado-0.3.6.ebuild
index 1859f223b8de..13d7a56a55b8 100644
--- a/net-p2p/bittornado/bittornado-0.3.6.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.6.ebuild,v 1.1 2004/07/13 15:03:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.6.ebuild,v 1.2 2004/08/14 00:41:35 squinky86 Exp $
 
 inherit distutils eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://e.scarywater.net/bt/download/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.3.2 b/net-p2p/bittornado/files/digest-bittornado-0.3.2
deleted file mode 100644
index 3fb37ebf5633..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 469a6e4283af4636c729b70ce89a425a BitTornado-0.3.2.tar.gz 175324
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.3.3 b/net-p2p/bittornado/files/digest-bittornado-0.3.3
deleted file mode 100644
index a1f28a2ac92f..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b5178d9c7fa1b6552f88c0218f37cf1 BitTornado-0.3.3.tar.gz 175845