Version bump by Robert Lundmark, bug #114864. Ebuild clean up

(Portage version: 2.1_pre4-r1)

14 files changed, 27 insertions, 255 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 7ad8211edca9..4c3b37cd676c 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.79 2006/02/09 21:34:43 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.80 2006/02/16 17:34:14 sekretarz Exp $
+
+*bittorrent-4.4.0 (16 Feb 2006)
+
+  16 Feb 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+  files/btdownloadgui.desktop, files/bttrack.conf, files/bttrack.rc,
+  files/favicon.ico, -bittorrent-4.0.2.ebuild, -bittorrent-4.0.4.ebuild,
+  -bittorrent-4.1.8.ebuild, -bittorrent-4.2.0.ebuild,
+  +bittorrent-4.4.0.ebuild:
+  Version bump by Robert Lundmark, bug #114864. Ebuild clean up
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> bittorrent-4.2.2.ebuild:
   Mark 4.2.2 stable on alpha
diff --git a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
deleted file mode 100644
index 30cbf900b4f7..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.2.ebuild,v 1.12 2006/01/22 10:20:07 mkay Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc sparc x86"
-IUSE="gtk"
-
-RDEPEND="gtk? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_install() {
-	distutils_src_install
-	if ! use gtk; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -pPR /etc/mailcap ${D}/etc/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use gtk; 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
-
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
-}
-
-pkg_postinst() {
-	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/bittorrent-4.0.4.ebuild b/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
deleted file mode 100644
index 6be28a8dfb16..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.4.ebuild,v 1.5 2006/01/22 10:20:07 mkay Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_install() {
-	distutils_src_install
-	if ! use gtk; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -pPR /etc/mailcap ${D}/etc/
-
-	# bug #86707
-	dodoc LICENSE.txt
-	rm -rf ${D}/usr/share/doc/${MY_P}/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use gtk; 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
-
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
-}
-
-pkg_postinst() {
-	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/bittorrent-4.2.0.ebuild b/net-p2p/bittorrent/bittorrent-4.2.0.ebuild
deleted file mode 100644
index 1d1e6ca160e3..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.2.0.ebuild,v 1.3 2006/01/22 10:20:07 mkay Exp $
-
-inherit distutils fdo-mime eutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	>=dev-python/pycrypto-2.0
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="TRACKERLESS.txt LICENSE.txt public.key"
-PYTHON_MODNAME="BitTorrent"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# path for documentation is in lowercase (see bug #109743)
-	sed -i -r "s:(dp.*appdir):\1.lower():" BitTorrent/platform.py
-}
-
-src_install() {
-	distutils_src_install
-	if ! use gtk; then
-		rm ${D}/usr/bin/bittorrent
-	fi
-	dohtml redirdonate.html
-
-	mv ${S}/{credits-l10n.txt,credits.txt} \
-		${D}/usr/share/doc/${P}
-	mv ${D}/usr/share/doc/${PF} ${D}/usr/share/doc/${P}
-
-	if use gtk ; then
-		cp ${D}/usr/share/pixmaps/${MY_P}/bittorrent.ico ${D}/usr/share/pixmaps/
-		make_desktop_entry "bittorrent" "BitTorrent" \
-			/usr/share/pixmaps/bittorrent.ico "Network"
-		echo "MimeType=application/x-bittorrent" \
-			>> ${D}/usr/share/applications/bittorrent-${PN}.desktop
-	fi
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bittorrent-tracker.confd bittorrent-tracker
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bittorrent-tracker.initd bittorrent-tracker
-}
-
-pkg_postinst() {
-	einfo "Remember that BitTorrent has changed file naming scheme"
-	einfo "To run BitTorrent just execute /usr/bin/bittorrent"
-	einfo
-	einfo "Please use /etc/init.d/bittorrent-tracker and "
-	einfo "/etc/conf.d/bittorrent-tracker instead of"
-	einfo "/etc/init.d/bttrack and /etc/init.d/bttrack. "
-	einfo "You can safety remove the old script files"
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.1.8.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0.ebuild
index b71acdacabe7..a9c3443075d4 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.8.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.8.ebuild,v 1.3 2006/01/22 10:20:07 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0.ebuild,v 1.1 2006/02/16 17:34:14 sekretarz Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -18,8 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="gtk"
 
 RDEPEND="gtk? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
+		>=x11-libs/gtk+-2.6
+		>=dev-python/pygtk-2.6
 	)
 	>=dev-lang/python-2.3
 	>=dev-python/pycrypto-2.0
@@ -61,20 +61,15 @@ src_install() {
 	fi
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/bittorrent-tracker.confd bittorrent-tracker
+	newins ${FILESDIR}//bttrack.conf bttrack
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bittorrent-tracker.initd bittorrent-tracker
+	newexe ${FILESDIR}/bttrack.rc-4.1 bttrack
 }
 
 pkg_postinst() {
 	einfo "Remember that BitTorrent has changed file naming scheme"
 	einfo "To run BitTorrent just execute /usr/bin/bittorrent"
-	einfo
-	einfo "Please use /etc/init.d/bittorrent-tracker and "
-	einfo "/etc/conf.d/bittorrent-tracker instead of"
-	einfo "/etc/init.d/bttrack and /etc/init.d/bttrack. "
-	einfo "You can safety remove the old script files"
 	distutils_pkg_postinst
 	fdo-mime_desktop_database_update
 }
diff --git a/net-p2p/bittorrent/files/btdownloadgui.desktop b/net-p2p/bittorrent/files/btdownloadgui.desktop
index c060278b7fad..577d0c00cb17 100644
--- a/net-p2p/bittorrent/files/btdownloadgui.desktop
+++ b/net-p2p/bittorrent/files/btdownloadgui.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=BitTorrent
-Exec=/usr/bin/btdownloadgui.py
+Exec=/usr/bin/bittorrent
 Icon=/usr/share/pixmaps/bittorrent.ico
 Terminal=false
 Type=Application
diff --git a/net-p2p/bittorrent/files/bttrack.conf b/net-p2p/bittorrent/files/bttrack.conf
index 748eac215b0d..16408c491f44 100644
--- a/net-p2p/bittorrent/files/bttrack.conf
+++ b/net-p2p/bittorrent/files/bttrack.conf
@@ -1,4 +1,7 @@
-# /etc/conf.d/bttrack: config file for /etc/init.d/bttrack
+# /etc/conf.d/bttrack
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.conf,v 1.3 2006/02/16 17:34:14 sekretarz Exp $
 
 # Change this to this to the port you would like to connect to for the tracker.
 # It is accessible at http://localhost:PORT/ from any web browser.
@@ -8,7 +11,7 @@ PORT=8082
 DFILE=/usr/share/bittorrent/tracker.dfile
 
 # path to favicon.ico which many popular web browsers can use
-FAVICON=/usr/share/bittorrent/favicon.ico
+FAVICON=/usr/share/pixmaps/bittorrent.ico
 
 # Connection logs are sent to stdout by default, so they should be sent to a
 # file when using this script.
diff --git a/net-p2p/bittorrent/files/bttrack.rc b/net-p2p/bittorrent/files/bttrack.rc
index 37617f7af58b..fc445de8bbec 100644
--- a/net-p2p/bittorrent/files/bttrack.rc
+++ b/net-p2p/bittorrent/files/bttrack.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.rc,v 1.1 2004/07/17 15:04:15 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.rc,v 1.2 2006/02/16 17:34:14 sekretarz Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ start() {
 	ebegin "Starting bttrack"
 	start-stop-daemon --start --quiet --background --make-pidfile \
 	--pidfile /var/run/bttrack.pid \
-	--exec /usr/bin/bttrack.py -- --port ${PORT} \
+	--exec /usr/bin/bittorrent-tracker -- --port ${PORT} \
 	--dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
 	eend $?
 }
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.0.2 b/net-p2p/bittorrent/files/digest-bittorrent-4.0.2
deleted file mode 100644
index 4354325fa556..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz 155062
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.0.4 b/net-p2p/bittorrent/files/digest-bittorrent-4.0.4
deleted file mode 100644
index 819c1486adfe..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f03514dd4d684728a4e54c6ffce7d1f BitTorrent-4.0.4.tar.gz 153911
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.1.8 b/net-p2p/bittorrent/files/digest-bittorrent-4.1.8
deleted file mode 100644
index 3d94d5e1f93f..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6898c78c12ed2fa25d48602f465fcc93 BitTorrent-4.1.8.tar.gz 2164574
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.2.0 b/net-p2p/bittorrent/files/digest-bittorrent-4.2.0
deleted file mode 100644
index 0cf703a9f34c..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6a6d07a20e75da44c7dbe44ff7d5346 BitTorrent-4.2.0.tar.gz 2185448
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.4.0 b/net-p2p/bittorrent/files/digest-bittorrent-4.4.0
new file mode 100644
index 000000000000..2ce6607ff7cd
--- /dev/null
+++ b/net-p2p/bittorrent/files/digest-bittorrent-4.4.0
@@ -0,0 +1,3 @@
+MD5 74d4b48202c28f0b27e989b6d5f5b214 BitTorrent-4.4.0.tar.gz 1255281
+RMD160 9e743b3178142855d289743d4430598353fb4d3f BitTorrent-4.4.0.tar.gz 1255281
+SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0 BitTorrent-4.4.0.tar.gz 1255281
diff --git a/net-p2p/bittorrent/files/favicon.ico b/net-p2p/bittorrent/files/favicon.ico
index 0e6136254aa5..47e6e70da442 100644
--- a/net-p2p/bittorrent/files/favicon.ico
+++ b/net-p2p/bittorrent/files/favicon.ico