Fixed init script and mime entry to match new naming scheme, bug #105143

Package-Manager: portage-2.0.52-r1

4 files changed, 55 insertions, 17 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index ffde54f2fff5..6d37e35d54b4 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # 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.59 2005/09/02 20:25:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.60 2005/09/10 16:09:11 sekretarz Exp $
+
+  10 Sep 2005; Karol Wojtaszek <sekretarz@gentoo.org> +files/bttrack.rc-4.1,
+  bittorrent-4.1.4.ebuild:
+  Fixed init script and mime entry to match new naming scheme, bug #105143
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   bittorrent-4.0.2.ebuild:
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index e7ceebc8c12b..fe333db22fb1 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,17 +1,28 @@
-MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 11351191dba82ceec454bb6f485c7a55 ChangeLog 9245
-MD5 af2d79a8d446aab76e12d9700f8e1934 bittorrent-4.1.3.ebuild 2163
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 72db3fa9699e580605cc32d2977bb7dc bittorrent-4.0.2.ebuild 1964
 MD5 34517f758ccc3330594d30649755508b bittorrent-4.0.4.ebuild 2039
 MD5 7ad8023d07bd4d1de7817aa65f37196e bittorrent-3.4.2-r2.ebuild 1926
-MD5 50029d9628d27e7126b7031604fad45e bittorrent-4.1.4.ebuild 2288
-MD5 72db3fa9699e580605cc32d2977bb7dc bittorrent-4.0.2.ebuild 1964
+MD5 4a081f423e6569dd3bb6d6f7e2d08d2c bittorrent-4.1.4.ebuild 2300
+MD5 af2d79a8d446aab76e12d9700f8e1934 bittorrent-4.1.3.ebuild 2163
+MD5 93eb7817dceeaf102afb6a2d3e01312c ChangeLog 9428
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
+MD5 be8d0eaa6a5cc7180f1f621fd685bd11 files/bttrack.rc-4.1 643
+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 4b713b7a06f5263bd26757a2ddddfe4b files/digest-bittorrent-4.0.2 68
-MD5 139c4a4367e37fcf7dc6bd18515456c2 files/btdownloadgui.desktop 166
 MD5 b493f99b647c326f2b2d24bdba684ad0 files/digest-bittorrent-4.0.4 68
-MD5 8254615ee527cd608123c83de2616ede files/bttrack.rc 631
 MD5 1d84ff717c038f607e2c54df5f946aef files/digest-bittorrent-4.1.3 68
 MD5 1f68732157a0742ec30e29327ad0baf1 files/digest-bittorrent-4.1.4 69
-MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bttrack.conf 728
-MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
-MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r2 65
+MD5 139c4a4367e37fcf7dc6bd18515456c2 files/btdownloadgui.desktop 166
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDIyGkZ/iYVBmujdURApaGAJ4uJ23wWNJ8Z7TU1k9PS3Bt1LbxVACeL/7m
+OkqVEJH6oVXwDjLvdn9qDqo=
+=Oi2l
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/bittorrent/bittorrent-4.1.4.ebuild b/net-p2p/bittorrent/bittorrent-4.1.4.ebuild
index 46430ff76a52..9b2c493484ec 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.4.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.4.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.1.4.ebuild,v 1.4 2005/08/27 20:04:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.4.ebuild,v 1.5 2005/09/10 16:09:11 sekretarz Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -36,7 +36,7 @@ PYTHON_MODNAME="BitTorrent"
 src_install() {
 	distutils_src_install
 	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
+		rm ${D}/usr/bin/bittorrent
 	fi
 	dohtml redirdonate.html
 	dodir etc
@@ -45,7 +45,7 @@ src_install() {
 	mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${P}/
 	rm -fr ${D}/usr/share/doc/${MY_P}
 
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
+	MAILCAP_STRING="application/x-bittorrent; /usr/bin/bittorrent '%s'; test=test -n \"\$DISPLAY\""
 
 	if use X; then
 		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
@@ -72,12 +72,12 @@ src_install() {
 	newins ${FILESDIR}/bttrack.conf bttrack
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
+	newexe ${FILESDIR}/bttrack.rc-4.1 bttrack
 }
 
 pkg_postinst() {
-	einfo "BitTorrent has changed to the BitTorrent Open Source License"
-	einfo ">> http://www.bittorrent.com/license/"
+	einfo "Remember that BitTorrent has changed file naming scheme"
+	einfo "To run BitTorrent just execute /usr/bin/bittorrent"
 	distutils_pkg_postinst
 	fdo-mime_desktop_database_update
 }
diff --git a/net-p2p/bittorrent/files/bttrack.rc-4.1 b/net-p2p/bittorrent/files/bttrack.rc-4.1
new file mode 100644
index 000000000000..6f17d701201b
--- /dev/null
+++ b/net-p2p/bittorrent/files/bttrack.rc-4.1
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.rc-4.1,v 1.1 2005/09/10 16:09:11 sekretarz Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting bttrack"
+	start-stop-daemon --start --quiet --background --make-pidfile \
+	--pidfile /var/run/bttrack.pid \
+	--exec /usr/bin/bittorrent-tracker -- --port ${PORT} \
+	--dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bttrack"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bttrack.pid
+	eend $?
+}