Version bump, stable setting, and removal of old ebuilds

8 files changed, 21 insertions, 75 deletions

diff --git a/net-p2p/bittorrent-theshadow/ChangeLog b/net-p2p/bittorrent-theshadow/ChangeLog
index 88be67980e4d..de1bc7e2c701 100644
--- a/net-p2p/bittorrent-theshadow/ChangeLog
+++ b/net-p2p/bittorrent-theshadow/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for net-p2p/bittorrent-theshadow
 # Copyright 2000-2003 Gentoo Technologies, Inc. and Luke-Jr
 # Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/ChangeLog,v 1.6 2003/08/22 13:56:26 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/ChangeLog,v 1.7 2003/09/11 22:50:52 luke-jr Exp $
+
+*bittorrent-theshadow-5.7.6 (11 Sep 2003)
+
+  11 Sep 2003; Luke-Jr <luke-jr@gentoo.org> bittorrent-theshadow-5.5.ebuild,
+  bittorrent-theshadow-5.6.1.ebuild, bittorrent-theshadow-5.7.6.ebuild,
+  bittorrent-theshadow-5.7.ebuild:
+  Version bump, stable setting, and removal of old ebuilds
 
 *bittorrent-theshadow-5.7 (22 Aug 2003)
 
diff --git a/net-p2p/bittorrent-theshadow/Manifest b/net-p2p/bittorrent-theshadow/Manifest
index a8bfb8d9a79a..ea96f7d9e15e 100644
--- a/net-p2p/bittorrent-theshadow/Manifest
+++ b/net-p2p/bittorrent-theshadow/Manifest
@@ -1,5 +1,5 @@
-MD5 e093f535f8b8bd6c43915763bda7d88d ChangeLog 1086
-MD5 ee73bdf7cd9986ce84a31117b8c7cfe7 bittorrent-theshadow-5.7.ebuild 1718
-MD5 ea34441602276f139bc495fe14fff1cd bittorrent-theshadow-5.7.6.ebuild 1724
+MD5 8c3598dd567b3a47a686e3446f732b0a ChangeLog 1086
+MD5 904bed341f701bb04706bc167dfed521 bittorrent-theshadow-5.7.ebuild 1717
+MD5 db35ce269e6cf311e1417dae29154cb4 bittorrent-theshadow-5.7.6.ebuild 1850
 MD5 4da0f64e13bc339ef3818a4df2c84fef files/digest-bittorrent-theshadow-5.7.6 80
 MD5 8b336bc047ea1eb5dbc389a286410deb files/digest-bittorrent-theshadow-5.7 78
diff --git a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.6.1.ebuild b/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.6.1.ebuild
deleted file mode 100644
index 4d185e83935c..000000000000
--- a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc., Okrain Genady (^Mafteah), and Luke-Jr
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.6.1.ebuild,v 1.5 2003/09/08 07:05:03 msterret Exp $
-
-inherit distutils
-
-S=${WORKDIR}/BitTorrent-CVS-shadowsclient
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://home.elp.rr.com/tur/BitTorrent-experimental-S-${PV}.zip"
-HOMEPAGE="http://bt.degreez.net/"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
-
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxPython-2.2 )
-	>=dev-lang/python-2.1
-	!net-p2p/bittorrent
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5"
-
-PROVIDE="virtual/bittorrent"
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	for f in *.txt *.py; do
-		tr -d '\r' < "$f"  > "$f".new
-		mv "$f".new "$f"
-	done
-}
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	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
-		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
-	fi
-}
-
diff --git a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.5.ebuild b/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.6.ebuild
index b4da0a484a07..d70da61f116c 100644
--- a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.5.ebuild
+++ b/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc., Okrain Genady (^Mafteah), and Luke-Jr
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.5.ebuild,v 1.5 2003/09/08 07:05:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.6.ebuild,v 1.1 2003/09/11 22:50:52 luke-jr Exp $
 
 inherit distutils
 
@@ -12,12 +12,13 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
-IUSE="X"
+IUSE="X psyco nopsyco"
 
 RDEPEND="X? ( >=dev-python/wxPython-2.2 )
 	>=dev-lang/python-2.1
 	!net-p2p/bittorrent
-	!virtual/bittorrent"
+	!virtual/bittorrent
+	psyco? ( dev-python/psyco )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0.5"
 
@@ -30,7 +31,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	for f in *.txt *.py; do
-		tr -d '\r' < "$f"  > "$f".new
+		tr -d '\r' < "$f" |
+			sed "s/PSYCO.psyco/$((`use nopsyco&&echo -1`+1))/g" |
+			grep -v 'import PSYCO' > "$f".new
 		mv "$f".new "$f"
 	done
 }
diff --git a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild b/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild
index 0e4bc06f2056..b2e8536de981 100644
--- a/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild
+++ b/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc., Okrain Genady (^Mafteah), and Luke-Jr
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild,v 1.3 2003/09/08 07:05:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent-theshadow/bittorrent-theshadow-5.7.ebuild,v 1.4 2003/09/11 22:50:52 luke-jr Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://home.elp.rr.com/tur/BitTorrent-experimental-S-${PV}.zip"
 HOMEPAGE="http://bt.degreez.net/"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ppc alpha sparc"
 
 IUSE="X"
 
diff --git a/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.5 b/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.5
deleted file mode 100644
index 89a54048026d..000000000000
--- a/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1c24270a2a0cf82908b45a9c019d4dc BitTorrent-experimental-S-5.5.zip 132955
diff --git a/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.6.1 b/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.6.1
deleted file mode 100644
index 7bcd01999a46..000000000000
--- a/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f40fe2c7a48de51b96f1c573699c26d BitTorrent-experimental-S-5.6.1.zip 135114
diff --git a/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.7.6 b/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.7.6
new file mode 100644
index 000000000000..32d1253a776b
--- /dev/null
+++ b/net-p2p/bittorrent-theshadow/files/digest-bittorrent-theshadow-5.7.6
@@ -0,0 +1 @@
+MD5 38903dc0e957fb6900b20ccd2e52fb78 BitTorrent-experimental-S-5.7.6.zip 142817