Ebuild clean up, 4.0.1 stable on amd64. Version bump - bug #93976

Package-Manager: portage-2.0.51.22-r1

13 files changed, 44 insertions, 156 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 8c82bf0654a1..7cca8e42d2e3 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.47 2005/05/24 18:18:32 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.48 2005/05/29 22:02:58 sekretarz Exp $
+
+*bittorrent-4.1.1 (29 May 2005)
+*bittorrent-4.0.2 (29 May 2005)
+
+  29 May 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  -bittorrent-3.4.1a.ebuild, -bittorrent-3.4.2.ebuild,
+  -bittorrent-3.4.2-r1.ebuild, -bittorrent-4.0.0.ebuild,
+  bittorrent-4.0.1.ebuild, +bittorrent-4.0.2.ebuild,
+  +bittorrent-4.1.1.ebuild:
+  Ebuild clean up, 4.0.1 stable on amd64. Version bump -  bug #93976
 
 *bittorrent-4.1.0 (24 May 2005)
 
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index c2dfdcc7213d..8e9cb36e5328 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,30 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 f35ce0bb4b795f5858de27d7f8c97582 bittorrent-4.0.2.ebuild 1964
 MD5 af5ece777155d0349001e81c5817c47d bittorrent-4.1.0.ebuild 2044
-MD5 81883a0c7c9a093e28ed9cd7924cfb75 bittorrent-3.4.1a.ebuild 1719
 MD5 bde98fabb85c0924b5aa43fcf1e053bb bittorrent-3.4.2-r2.ebuild 1922
-MD5 490ca1d61ac06527477ef2275919dd7f bittorrent-4.0.1.ebuild 1963
-MD5 946ef3f106eb094bbf4ff6808eb3b5db bittorrent-3.4.2-r1.ebuild 1874
-MD5 5602721fd34f1815337baf7be96e9984 bittorrent-4.0.0.ebuild 1964
-MD5 310080e5b4047cbdbe2b6ed3275248a1 ChangeLog 7114
-MD5 304b3a3544c70f9d8544fdec1e4b6cd2 bittorrent-3.4.2.ebuild 1683
+MD5 4436b3af10fba3b118bf074455641f2a bittorrent-4.0.1.ebuild 1963
+MD5 080e3658ff1bbe80df290ad612c956c6 bittorrent-4.1.1.ebuild 1956
+MD5 9aa2933c978085b4c148ac053f0c70c4 ChangeLog 7496
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
-MD5 041cb026a6f1c38c3ceef68e3a3001de files/digest-bittorrent-3.4.1a 66
-MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r1 65
 MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r2 65
 MD5 8254615ee527cd608123c83de2616ede files/bttrack.rc 631
 MD5 21ec89d06de83ddcc4cf6d6616355190 files/bittorrent-4.1.0-fix-all.patch 2483
 MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bttrack.conf 728
-MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2 65
-MD5 b0a4d9f4ad2e4c256b262e11f10b03a4 files/digest-bittorrent-4.0.0 68
 MD5 6f633b4e59571e537f1888c9237573ad files/digest-bittorrent-4.0.1 68
+MD5 4b713b7a06f5263bd26757a2ddddfe4b files/digest-bittorrent-4.0.2 68
 MD5 d1d7e07d2e93a5ccb96f1018b93511fa files/digest-bittorrent-4.1.0 68
+MD5 fae18d3e2e709fd4344848e6425882e9 files/digest-bittorrent-4.1.1 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCk4rJZ/iYVBmujdURApQAAJ9ARU0qmKmLUCrydF6+t42J2vQmUACfeeWi
-OrfovAxyL1g0i1KhqIOViDI=
-=Ie+J
+iD8DBQFCmlb3Z/iYVBmujdURAojJAKD0JI5kfSzgT7/akkdbGXeWfppH0wCgtZMr
+qXdofEDCeKnw5HpSya9PfuE=
+=kP3e
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild b/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild
deleted file mode 100644
index 2f455bf4e2c2..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild,v 1.7 2005/05/05 23:27:49 swegener Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-MY_P="${MY_P/\.0/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-
-IUSE="X"
-
-RDEPEND="X? ( <dev-python/wxpython-2.5 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-
-DOCS="credits.txt"
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	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
-}
-
-pkg_postinst() {
-	einfo "unofficial feature additions. If you would like statistics, please"
-	einfo "install net-p2p/bittorrent-stats."
-}
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2.ebuild
deleted file mode 100644
index c20411152244..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2.ebuild,v 1.9 2005/05/05 23:27:49 swegener Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-MY_P="${MY_P/\.0/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha arm ~amd64"
-IUSE="X"
-
-RDEPEND="X? ( <dev-python/wxpython-2.5 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	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
-}
-
-pkg_postinst() {
-	einfo "unofficial feature additions. If you would like statistics, please"
-	einfo "install net-p2p/bittorrent-stats."
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.0.1.ebuild b/net-p2p/bittorrent/bittorrent-4.0.1.ebuild
index 55cf7cfce21c..9d097d4fff4c 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.1.ebuild,v 1.2 2005/05/05 23:27:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.1.ebuild,v 1.3 2005/05/29 22:02:58 sekretarz Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
 
 LICENSE="BitTorrent"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
+KEYWORDS="amd64 ~ppc ~x86 ~sparc ~alpha"
 IUSE="X"
 
 RDEPEND="X? (
diff --git a/net-p2p/bittorrent/bittorrent-4.0.0.ebuild b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
index cb8709cf045c..1957f8c1b9a9 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.0.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.0.ebuild,v 1.4 2005/05/05 23:27:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.2.ebuild,v 1.1 2005/05/29 22:02:58 sekretarz Exp $
 
 inherit distutils
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
 IUSE="X"
 
 RDEPEND="X? (
-		>=x11-libs/gtk+-2.4*
+		>=x11-libs/gtk+-2.4
 		>=dev-python/pygtk-2.4
 	)
 	>=dev-lang/python-2.3
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild b/net-p2p/bittorrent/bittorrent-4.1.1.ebuild
index 0629be1891b4..1f27b856a566 100644
--- a/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.1.ebuild
@@ -1,31 +1,36 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild,v 1.6 2005/05/05 23:27:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.1.ebuild,v 1.1 2005/05/29 22:02:58 sekretarz Exp $
 
 inherit distutils
 
 MY_P="${P/bittorrent/BitTorrent}"
-MY_P="${MY_P/\.0/}"
+#MY_P="${MY_P/}"
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.bittorrent.com/"
+SRC_URI="mirror://sourceforge/${MY_P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="BitTorrent"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~arm ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
 IUSE="X"
 
-RDEPEND="X? ( <dev-python/wxpython-2.5 )
-	>=dev-lang/python-2.1
+RDEPEND="X? (
+		>=x11-libs/gtk+-2.4
+		>=dev-python/pygtk-2.4
+	)
+	>=dev-lang/python-2.3
 	!virtual/bittorrent"
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
+	app-arch/gzip
+	>=sys-apps/sed-4.0.5
+	dev-python/dnspython"
 PROVIDE="virtual/bittorrent"
 
 DOCS="credits.txt"
+PYTHON_MODULE="BitTorrent"
 
 src_install() {
 	distutils_src_install
@@ -64,6 +69,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "unofficial feature additions. If you would like statistics, please"
-	einfo "install net-p2p/bittorrent-stats."
+	einfo "BitTorrent has changed to the BitTorrent Open Source License"
+	einfo ">> http://www.bittorrent.com/license/"
+	distutils_pkg_postinst
 }
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.4.1a b/net-p2p/bittorrent/files/digest-bittorrent-3.4.1a
deleted file mode 100644
index 6a749af4132b..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.4.1a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84d8cfedeba539db8b497d63e6ecceed BitTorrent-3.4.1a.zip 244963
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.4.2 b/net-p2p/bittorrent/files/digest-bittorrent-3.4.2
deleted file mode 100644
index 3ea4d81b56f2..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ad4e128ddc82f8ebef6fbef59872f0d BitTorrent-3.4.2.zip 244989
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1 b/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1
deleted file mode 100644
index 3ea4d81b56f2..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ad4e128ddc82f8ebef6fbef59872f0d BitTorrent-3.4.2.zip 244989
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.0.0 b/net-p2p/bittorrent/files/digest-bittorrent-4.0.0
deleted file mode 100644
index 0fd60d5ff203..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67f449df351b66f408b72b6bd196952f BitTorrent-4.0.0.tar.gz 148649
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.0.2 b/net-p2p/bittorrent/files/digest-bittorrent-4.0.2
new file mode 100644
index 000000000000..4354325fa556
--- /dev/null
+++ b/net-p2p/bittorrent/files/digest-bittorrent-4.0.2
@@ -0,0 +1 @@
+MD5 4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz 155062
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.1.1 b/net-p2p/bittorrent/files/digest-bittorrent-4.1.1
new file mode 100644
index 000000000000..5d9ebcdb9ca0
--- /dev/null
+++ b/net-p2p/bittorrent/files/digest-bittorrent-4.1.1
@@ -0,0 +1 @@
+MD5 57381176882184ad8f539c473ad9bce5 BitTorrent-4.1.1.tar.gz 237743