stable on x86

11 files changed, 14 insertions, 197 deletions

diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index ca93c50b708a..28618e90940a 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.24 2004/08/14 13:52:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.25 2004/08/16 03:22:56 squinky86 Exp $
+
+  15 Aug 2004; Jon Hood <squinky86@gentoo.org> -bittornado-0.3.4.ebuild,
+  bittornado-0.3.7.ebuild:
+  Stable on x86, cleanup old versions.
 
   14 Aug 2004; Jason Wever <weeve@gentoo.org> bittornado-0.3.7.ebuild:
   Added ~sparc keyword.
diff --git a/net-p2p/bittornado/bittornado-0.3.4.ebuild b/net-p2p/bittornado/bittornado-0.3.4.ebuild
deleted file mode 100644
index 6bf887cebf09..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.4.ebuild
+++ /dev/null
@@ -1,66 +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.4.ebuild,v 1.3 2004/07/13 15:05:05 mholzer 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
-	# fixes a bug with < wxpython-2.5 which is not yet available in portage
-	epatch ${FILESDIR}/${PN}-wxpython-pre2.5-fix.patch
-}
-
-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.7.ebuild b/net-p2p/bittornado/bittornado-0.3.7.ebuild
index 2e6ff604e5c4..1a86d059de3a 100644
--- a/net-p2p/bittornado/bittornado-0.3.7.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.7.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.7.ebuild,v 1.4 2004/08/14 13:52:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.7.ebuild,v 1.5 2004/08/16 03:22:56 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 ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.3.4 b/net-p2p/bittornado/files/digest-bittornado-0.3.4
deleted file mode 100644
index 95b1aa402aa7..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8663c2d0daa1fabcf7df94671dc36a25 BitTornado-0.3.4.tar.gz 175418
diff --git a/net-p2p/xmule/ChangeLog b/net-p2p/xmule/ChangeLog
index bab37646edbf..d1207749d732 100644
--- a/net-p2p/xmule/ChangeLog
+++ b/net-p2p/xmule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/xmule
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.43 2004/07/23 20:31:07 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/ChangeLog,v 1.44 2004/08/16 03:27:52 squinky86 Exp $
+
+  15 Aug 2004; Jon Hood <squinky86@gentoo.org> -files/rehash.patch,
+  -xmule-1.6.0a-r1.ebuild, -xmule-1.8.1.ebuild, xmule-1.8.4.ebuild:
+  Stable on x86, cleanup old versions.
 
   23 Jul 2004; Jon Hood <squinky86@gentoo.org> xmule-1.8.2-r3.ebuild:
   Fixed removal of temp files irt #58083; thanks Antonio <netbix@tiscali.it>.
diff --git a/net-p2p/xmule/files/digest-xmule-1.6.0a-r1 b/net-p2p/xmule/files/digest-xmule-1.6.0a-r1
deleted file mode 100644
index 938b04b0f6f9..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.6.0a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 513aee4826007d2e9c5bade5ca48b144 xmule-1.6.0.tar.bz2 1250341
diff --git a/net-p2p/xmule/files/digest-xmule-1.8.1 b/net-p2p/xmule/files/digest-xmule-1.8.1
deleted file mode 100644
index 3ff00c4482c8..000000000000
--- a/net-p2p/xmule/files/digest-xmule-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b385558338e4823cbc971456cd075fe xmule-1.8.1.tar.bz2 1166348
diff --git a/net-p2p/xmule/files/rehash.patch b/net-p2p/xmule/files/rehash.patch
deleted file mode 100644
index b4350ab645c5..000000000000
--- a/net-p2p/xmule/files/rehash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/PartFile.cpp	2003-08-26 19:33:22.000000000 +0200
-+++ src/PartFile.cpp	2003-09-14 23:26:48.000000000 +0200
-@@ -464,7 +464,7 @@
- 			// rehash
- 			SetPartFileStatus(PS_WAITINGFORHASH);
- 
--			CAddFileThread::AddFile(directory, searchpath, this);
-+			CAddFileThread::AddFile(directory, basename(searchpath), this);
- 		}
- 	delete[] searchpath;
- 
diff --git a/net-p2p/xmule/xmule-1.6.0a-r1.ebuild b/net-p2p/xmule/xmule-1.6.0a-r1.ebuild
deleted file mode 100644
index 80533ede0cba..000000000000
--- a/net-p2p/xmule/xmule-1.6.0a-r1.ebuild
+++ /dev/null
@@ -1,50 +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/xmule/xmule-1.6.0a-r1.ebuild,v 1.11 2004/07/17 03:06:26 squinky86 Exp $
-
-inherit eutils
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4
-	>=sys-libs/zlib-1.1.4"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_unpack() {
-# Small patch to fix rehashing of unfinished files
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/rehash.patch
-}
-
-src_compile () {
-	econf || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall || die
-}
diff --git a/net-p2p/xmule/xmule-1.8.1.ebuild b/net-p2p/xmule/xmule-1.8.1.ebuild
deleted file mode 100644
index e7c10adf4296..000000000000
--- a/net-p2p/xmule/xmule-1.8.1.ebuild
+++ /dev/null
@@ -1,61 +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/xmule/xmule-1.8.1.ebuild,v 1.5 2004/07/17 03:06:26 squinky86 Exp $
-
-MY_P=${P//a}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
-HOMEPAGE="http://xmule.ws/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-IUSE="nls"
-
-DEPEND=">=x11-libs/wxGTK-2.4.1
-	nls? ( sys-devel/gettext )
-	>=sys-libs/zlib-1.2.1"
-
-pkg_setup() {
-	# FIXME: Is this really how we want to do this ?
-	GREP=`grep ' unicode' /var/db/pkg/x11-libs/wxGTK*/USE`
-	if [ "${GREP}" != "" ]; then
-		eerror "This package doesn't work with wxGTK"
-		eerror "compiled with gtk2 and unicode in USE"
-		eerror "Please re-compile wxGTK with -unicode"
-		die "aborting..."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's/@datadir@/${DESTDIR}@datadir@/' Makefile.in
-}
-
-src_compile () {
-	export WANT_AUTOCONF=2.5
-	WANT_AUTOMAKE=1.7
-	aclocal
-	autoconf
-	autoheader
-	automake
-
-	local myconf=
-
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	myconf="${myconf} --with-zlib=/tmp/zlib/"
-
-	econf ${myconf} || die
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-}
-
-src_install () {
-	einstall mkinstalldirs=${S}/mkinstalldirs DESTDIR=${D} || die
-}
diff --git a/net-p2p/xmule/xmule-1.8.4.ebuild b/net-p2p/xmule/xmule-1.8.4.ebuild
index 8f9df1ab318d..c1a50c61873d 100644
--- a/net-p2p/xmule/xmule-1.8.4.ebuild
+++ b/net-p2p/xmule/xmule-1.8.4.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/xmule/xmule-1.8.4.ebuild,v 1.1 2004/07/17 03:06:26 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/xmule/xmule-1.8.4.ebuild,v 1.2 2004/08/16 03:27:53 squinky86 Exp $
 
 DESCRIPTION="wxWindows based client for the eDonkey/eMule/lMule network"
 HOMEPAGE="http://xmule.ws/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 
 IUSE="nls"