x86 stable & cleanup

6 files changed, 2 insertions, 135 deletions

diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index f31083ff01bd..6f4be2ac799a 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,10 +1,6 @@
-MD5 65ad0fb7fac347fde1acade4338123fa bittornado-0.1.3.ebuild 1740
 MD5 5fd585874b85a62994779776e087893a bittornado-0.2.0.ebuild 1660
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 5fd585874b85a62994779776e087893a bittornado-0.1.4.ebuild 1660
+MD5 71d242a0982822bfae78a5bb24427ba7 bittornado-0.1.4.ebuild 1659
 MD5 fc85d6a956ea78580f10aaae25c46144 ChangeLog 1606
-MD5 d8821b1dec9be921ddb1de21dd81a394 bittornado-0.0.1-r1.ebuild 1918
-MD5 2d1d5d689f62fda3bb1a5add823c4381 files/digest-bittornado-0.1.3 68
-MD5 7e5f7bd9dad3e54d2c6a0a25947d28ca files/digest-bittornado-0.0.1-r1 68
 MD5 665ef382ea622c9b32b506053a3986bc files/digest-bittornado-0.2.0 68
 MD5 16d6cc2e9327cc900ebc88f064ac428f files/digest-bittornado-0.1.4 68
diff --git a/net-p2p/bittornado/bittornado-0.0.1-r1.ebuild b/net-p2p/bittornado/bittornado-0.0.1-r1.ebuild
deleted file mode 100644
index d5e4e9c10401..000000000000
--- a/net-p2p/bittornado/bittornado-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,64 +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/bittornado/bittornado-0.0.1-r1.ebuild,v 1.3 2004/03/20 18:13:14 eradicator Exp $
-
-inherit distutils
-inherit eutils
-
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://dl9.degreez.net/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxPython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
-
-PROVIDE="virtual/bittorrent"
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittorrent"
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:os.path.abspath(os.path.dirname(sys.argv\[0\])):\"${PIXMAPLOC}/\":" ${S}/btdownloadgui.py || die "sed failure 1"
-	sed -i "s:BitTorrent\.version:BitTornado.version:g" ${S}/setup.py || die "sed failure 2"
-	sed -i 's:packages = \["BitTornado"\],:packages = \["BitTornado","BitTornado.BT1"\],:g' ${S}/setup.py || die "sed failure 3"
-}
-
-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.1.3.ebuild b/net-p2p/bittornado/bittornado-0.1.3.ebuild
deleted file mode 100644
index 2382fea2d94e..000000000000
--- a/net-p2p/bittornado/bittornado-0.1.3.ebuild
+++ /dev/null
@@ -1,63 +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/bittornado/bittornado-0.1.3.ebuild,v 1.1 2004/04/05 07:38:47 eradicator Exp $
-
-inherit distutils
-inherit 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"
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxPython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
-
-PROVIDE="virtual/bittorrent"
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittorrent"
-
-# Why did we do this???
-#src_unpack() {
-#	unpack ${A}
-#	sed -i "s:os.path.abspath(os.path.dirname(sys.argv\[0\])):\"${PIXMAPLOC}/\":" ${S}/btdownloadgui.py || die "sed failure 1"
-#}
-
-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.1.4.ebuild b/net-p2p/bittornado/bittornado-0.1.4.ebuild
index f44c3cb3d8c2..271728aa8ae1 100644
--- a/net-p2p/bittornado/bittornado-0.1.4.ebuild
+++ b/net-p2p/bittornado/bittornado-0.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://e.scarywater.net/bt/download/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxPython-2.2 )
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.0.1-r1 b/net-p2p/bittornado/files/digest-bittornado-0.0.1-r1
deleted file mode 100644
index d6457163cd71..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e0637a199d8d7d338d6b5dcdabc695e BitTornado-0.0.1.tar.gz 153602
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.1.3 b/net-p2p/bittornado/files/digest-bittornado-0.1.3
deleted file mode 100644
index 939bacd7128c..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45ebf9584906e69375549ff408fc3a4c BitTornado-0.1.3.tar.gz 160225