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

Package-Manager: portage-2.1_pre4-r1

15 files changed, 51 insertions, 297 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/Manifest b/net-p2p/bittorrent/Manifest
index 4701b41c35b2..5842af30d544 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5637a194bba2992a2511b766eb6d075e ChangeLog 12246
-RMD160 6d2a2485153f9987b25a4664871f1f364e64c5e0 ChangeLog 12246
-SHA256 fba3fe9a0f67d1f31276395872d617a5828dbc2daed8ba81211abb464b51d7ef ChangeLog 12246
+MD5 60c32146b9d70aacbc41b8a47178ff2f ChangeLog 12627
+RMD160 63214a3f9336c6273a7a781455e36575f0d55bc6 ChangeLog 12627
+SHA256 b519c567fd8a5cdda4fdf744c9e075b82b78771765cec4586fab40d1318e581a ChangeLog 12627
 MD5 55de4abd16a9d1691977235bb18b8e7d bittorrent-3.4.2-r2.ebuild 1930
 RMD160 f3e450a46dd03440a29bbcf21a5b762574631cdf bittorrent-3.4.2-r2.ebuild 1930
 SHA256 399f5974f0845c50960262725eada69fec9b95e55043cea299af73b74e5941bf bittorrent-3.4.2-r2.ebuild 1930
-MD5 f3256fa4363f786d8a4c42e09f6567d3 bittorrent-4.0.2.ebuild 1970
-RMD160 74ee24789e4369ba872d773ecbb642dbb6e2fd2e bittorrent-4.0.2.ebuild 1970
-SHA256 b1eb4035e968aca38b3f0ad070f2803f868f26dbbcee1b0ac730c2340a23c0db bittorrent-4.0.2.ebuild 1970
-MD5 5ab3e9f41eb94e533a6819741bab218b bittorrent-4.0.4.ebuild 2045
-RMD160 7f1f10439d18e2d2bb0a7a56bf318f90f29104fb bittorrent-4.0.4.ebuild 2045
-SHA256 82dec2b53dca7f3c51c5a50bb512307996fb75be9eb9986e0f5bdd1dfefb1706 bittorrent-4.0.4.ebuild 2045
-MD5 517fe07a317e96c0fb8e56c9d2ad0426 bittorrent-4.1.8.ebuild 2218
-RMD160 188e762950400264e0c8b13559704a85e42733fc bittorrent-4.1.8.ebuild 2218
-SHA256 e3c58806bac391df68c50a19fd01f9eceeac899282975e2d0cd886f9ad97fdd1 bittorrent-4.1.8.ebuild 2218
-MD5 648622c245a3e1c9443ef5d327d70d3c bittorrent-4.2.0.ebuild 2218
-RMD160 6ee89f6834048c11de9506e1b51b01cabedfea72 bittorrent-4.2.0.ebuild 2218
-SHA256 fe59e80661c7376954fc6bc65f92820a513d96fe138eff190aa166e9bd844eb6 bittorrent-4.2.0.ebuild 2218
 MD5 37fd10a87cd1f7d00e675c861af2abc8 bittorrent-4.2.2.ebuild 2309
 RMD160 cafd7033ccb832788bfe5a1b155207d04bfacd4a bittorrent-4.2.2.ebuild 2309
 SHA256 86d72aad2253b976d98a4bdefc5e317a1339e2a82718b492c7383c44ccf075e1 bittorrent-4.2.2.ebuild 2309
+MD5 863e5e7637b562b77f53b92bd49ce360 bittorrent-4.4.0.ebuild 1959
+RMD160 8f53aa52b518dbbffcd8d47185bc53f6584191dc bittorrent-4.4.0.ebuild 1959
+SHA256 a12e1e48a3ea34186db17952dc6bd3d75b567f113324f303158771ce9c91a570 bittorrent-4.4.0.ebuild 1959
 MD5 21ec89d06de83ddcc4cf6d6616355190 files/bittorrent-4.1.0-fix-all.patch 2483
 RMD160 721f3f6aec7549f215914612a6479d9e55072b92 files/bittorrent-4.1.0-fix-all.patch 2483
 SHA256 ceb35643595848c56f678d9d0c346b83b536775c784007410cad80ba1cd5eff2 files/bittorrent-4.1.0-fix-all.patch 2483
@@ -31,43 +22,34 @@ SHA256 b6094703dfc486b6e8d10885284479ee4f03308d7bed25d1411c28a8428d227d files/bi
 MD5 48316c1ff208c04a7f2de73860fc48e6 files/bittorrent-tracker.initd 648
 RMD160 a809d2fd95eb7815f4d92a9810d418076fd78913 files/bittorrent-tracker.initd 648
 SHA256 d76bf22a11a998cd8daa8bcb9bedc4dc84d57a3a1cf2d60f4cc7a3ed3eab95c0 files/bittorrent-tracker.initd 648
-MD5 139c4a4367e37fcf7dc6bd18515456c2 files/btdownloadgui.desktop 166
-RMD160 df56326a5b44820b2fc4986b46415e88db000b64 files/btdownloadgui.desktop 166
-SHA256 ba57d2793546b9267273e8b033e09287f57ef0f85330a7b251598c11b6588fe4 files/btdownloadgui.desktop 166
-MD5 bf253e8a82c868ed1db24387b70dbde0 files/bttrack.conf 543
-RMD160 112499878fcb6ff592bd3777a06ce65044a059ce files/bttrack.conf 543
-SHA256 d6325686901a258359bc7813b81db3cf19095b7784124b9e9119ea24f4b49f4f files/bttrack.conf 543
-MD5 8254615ee527cd608123c83de2616ede files/bttrack.rc 631
-RMD160 deca2bbcd4985589f7723ee2d6deed7fefd597f4 files/bttrack.rc 631
-SHA256 04920d471892322a7fda1b456e4e0ea30c49ef0bf24e56e33eaf2ff9d46a8a32 files/bttrack.rc 631
+MD5 f458db18e2f8971ca1adc105b7936b36 files/btdownloadgui.desktop 160
+RMD160 9485509f5f1f2536b2e789abe4eca53d3cfa702c files/btdownloadgui.desktop 160
+SHA256 330391fa1d05e87b0b88a3a9264f8f6fcbe9a7add24be2e2be6eea9d67f83aca files/btdownloadgui.desktop 160
+MD5 e7f2cc6381bf680bafc76c30bcb6eedf files/bttrack.conf 728
+RMD160 52401b075386108c820a2637481b7a5f5b328360 files/bttrack.conf 728
+SHA256 96de75052da899421daae857c98b71e4510d6be80b030a1d6ec905d64826aafb files/bttrack.conf 728
+MD5 17951ba211d03e5f0a86581cfe21fe71 files/bttrack.rc 638
+RMD160 11f3dda3b74ec720fc63885afad04000e01962c9 files/bttrack.rc 638
+SHA256 d789150c984eb9bc0704e598f96e7768800c56334ae5ace6673dcc6dd09e1d64 files/bttrack.rc 638
 MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r2 65
 RMD160 0da5bee69407943584514a489b7f495697e452a5 files/digest-bittorrent-3.4.2-r2 65
 SHA256 8d9a74796aed93b783d91f891a9bb14ada576b908c5a305a050ba26e734889d0 files/digest-bittorrent-3.4.2-r2 65
-MD5 4b713b7a06f5263bd26757a2ddddfe4b files/digest-bittorrent-4.0.2 68
-RMD160 e4867ef693321c1b181382a2f2b57611c3155c23 files/digest-bittorrent-4.0.2 68
-SHA256 d0227b577550ecd469c7eb9af6e25cfdeba67ca55502e922cfde8a06585ae590 files/digest-bittorrent-4.0.2 68
-MD5 b493f99b647c326f2b2d24bdba684ad0 files/digest-bittorrent-4.0.4 68
-RMD160 b4bd4831d5f76a67f18afa79850d758b13a3b44b files/digest-bittorrent-4.0.4 68
-SHA256 c0fc63c882f7881b7fb433fd5c61cb781d7e9a62fb611bee84f763f6dc5cf72f files/digest-bittorrent-4.0.4 68
-MD5 cd9d10574cb2f269474aea9024212554 files/digest-bittorrent-4.1.8 69
-RMD160 5140efea8d77cfeb7740b63fa579b755d387f518 files/digest-bittorrent-4.1.8 69
-SHA256 c9b87940715846b742ee6bdf23afa4d0edb55e4063e8de0406d386e4104fe337 files/digest-bittorrent-4.1.8 69
-MD5 690238ce5ac8b5e708f9e6f9e6285721 files/digest-bittorrent-4.2.0 69
-RMD160 9f0a72bd32f4335b9025cffaee9928c9d6605b05 files/digest-bittorrent-4.2.0 69
-SHA256 4c64a512de564001d94aa66314e1317cb205fd87c1d9534b34b56534f9715974 files/digest-bittorrent-4.2.0 69
 MD5 8c7a2e819a64a6d8cf71d388e3663226 files/digest-bittorrent-4.2.2 69
 RMD160 d98b5f174d6f3615aeb7432d012aed14458af10e files/digest-bittorrent-4.2.2 69
 SHA256 204878bbe155aa35e55661b3cb51ca7bf2191acaf882d9e12793cc5af3751a2d files/digest-bittorrent-4.2.2 69
-MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
-RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 files/favicon.ico 1406
-SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22 files/favicon.ico 1406
+MD5 a83d419e4505d00169381a9eaf023d59 files/digest-bittorrent-4.4.0 253
+RMD160 363ff7e44a1e324a4d2b30e0b455276fdb297357 files/digest-bittorrent-4.4.0 253
+SHA256 472a02e8501bc049b86ad1ec025bc15c08d19555ac6f0edd0bbddc62e29b7735 files/digest-bittorrent-4.4.0 253
+MD5 b47216eb50334e4298d6ed60e44af84b files/favicon.ico 13902
+RMD160 9b8e4e83e7643f659473ae34d7d5bf48431298f8 files/favicon.ico 13902
+SHA256 5647d176012b90ab0808b044469648a3ebdd5f85b6fa3891ac321d78e578fe7d files/favicon.ico 13902
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD67V/V3J2n04EauwRAtGqAJ40M0QEqVsXT3AOcLSFXuABJhR+PQCeJOwa
-AdWnKlmFGFqZsyqWsF4EicU=
-=rehf
+iD8DBQFD9MZXub4+zaPCR/oRAqAgAJ9tj5mOv8u0O1TSQTrkGtTJnIT0wgCgnM6A
+aocplyn55TrIn1/uzE3SU9g=
+=5ent
 -----END PGP SIGNATURE-----
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