x86 stable

8 files changed, 11 insertions, 153 deletions

diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index 72649a48dbe9..2781dfa61aee 100644
--- a/net-p2p/bittornado/ChangeLog
+++ b/net-p2p/bittornado/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/bittornado
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.11 2004/05/21 18:12:04 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.12 2004/06/01 21:27:19 mholzer Exp $
+
+  02 Jun 2004; Martin Holzer <mholzer@gentoo.org> bittornado-0.3.0.ebuild:
+  x86 stable.
 
 *bittornado-0.3.1 (21 May 2004)
 
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 1b8682b66473..d4d0c45e634a 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,10 +1,6 @@
-MD5 b0772a7d4f2ed63301d16264ebb4eb80 bittornado-0.3.1.ebuild 1814
-MD5 83c2494af12cdb5b60839b64e7c03ac1 bittornado-0.2.0.ebuild 1784
-MD5 1b87e2b3a8e45fdfd147a2efde4751e2 bittornado-0.1.4.ebuild 1778
-MD5 0bbc53a6eb4ccc541820ced976e27d81 bittornado-0.3.0.ebuild 1859
-MD5 ca53d735b6d3e6aa78f16b794d1a9dc5 ChangeLog 1974
+MD5 a3395ad73d589fbebbed0c9ef138f977 bittornado-0.3.0.ebuild 1858
+MD5 7741fac1cdc61652a05e0bf891cf501a bittornado-0.3.1.ebuild 1741
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 16d6cc2e9327cc900ebc88f064ac428f files/digest-bittornado-0.1.4 68
-MD5 665ef382ea622c9b32b506053a3986bc files/digest-bittornado-0.2.0 68
-MD5 28f41e964823c678f90c061fa88bcbe5 files/digest-bittornado-0.3.0 68
+MD5 8fcd6badaddb9a5e7c450df55328db4e ChangeLog 2062
 MD5 1254611280cd18cac6f13a32910f6223 files/digest-bittornado-0.3.1 68
+MD5 28f41e964823c678f90c061fa88bcbe5 files/digest-bittornado-0.3.0 68
diff --git a/net-p2p/bittornado/bittornado-0.1.4.ebuild b/net-p2p/bittornado/bittornado-0.1.4.ebuild
deleted file mode 100644
index 89545db2fdc6..000000000000
--- a/net-p2p/bittornado/bittornado-0.1.4.ebuild
+++ /dev/null
@@ -1,68 +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.4.ebuild,v 1.4 2004/05/16 12:52:26 mholzer 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/bittornado"
-
-src_unpack() {
-	unpack ${A}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" ${S}/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\""
-
-	rm ${D}/usr/bin/*.ico
-	rm ${D}/usr/bin/*.gif
-
-	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.2.0.ebuild b/net-p2p/bittornado/bittornado-0.2.0.ebuild
deleted file mode 100644
index 7a4c3854379c..000000000000
--- a/net-p2p/bittornado/bittornado-0.2.0.ebuild
+++ /dev/null
@@ -1,68 +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.2.0.ebuild,v 1.3 2004/05/16 12:52:26 mholzer 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 ~ppc"
-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/bittornado"
-
-src_unpack() {
-	unpack ${A}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" ${S}/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\""
-
-	rm ${D}/usr/bin/*.ico
-	rm ${D}/usr/bin/*.gif
-
-	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.0.ebuild b/net-p2p/bittornado/bittornado-0.3.0.ebuild
index 44d39bcdc5da..630fff177bc9 100644
--- a/net-p2p/bittornado/bittornado-0.3.0.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.1 2004/05/16 14:20:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.0.ebuild,v 1.2 2004/06/01 21:27:19 mholzer Exp $
 
 inherit distutils
 inherit eutils
@@ -14,7 +14,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/bittornado-0.3.1.ebuild b/net-p2p/bittornado/bittornado-0.3.1.ebuild
index a8523a6e6834..4b34169dcc25 100644
--- a/net-p2p/bittornado/bittornado-0.3.1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.1 2004/05/21 18:12:04 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.1.ebuild,v 1.2 2004/06/01 21:27:19 mholzer Exp $
 
 inherit distutils
 inherit eutils
@@ -35,9 +35,6 @@ src_unpack() {
 
 	# fixes wrong icons path
 	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-
-	#Fix to get installed
-	sed -i 's:"btdownloadlibrary.py",::' setup.py
 }
 
 src_install() {
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.1.4 b/net-p2p/bittornado/files/digest-bittornado-0.1.4
deleted file mode 100644
index 1740174ea779..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5cb7099921b31a0f0f1ef4747d43ffc BitTornado-0.1.4.tar.gz 161367
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.2.0 b/net-p2p/bittornado/files/digest-bittornado-0.2.0
deleted file mode 100644
index 1d34cdb51da3..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14b40c51bd042bff1c89a71707eede3b BitTornado-0.2.0.tar.gz 160275