Changing name of startup script and configuration file to fit upstream changes

(Portage version: 2.1_pre1)

7 files changed, 54 insertions, 15 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 9f6da97cb183..3003fb94a90e 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2005/12/18 19:25:47 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.71 2005/12/18 20:08:06 mkay Exp $
+
+  18 Dec 2005; Marcin Kryczek <mkay@gentoo.org> -files/bttrack.rc-4.1,
+  +files/bittorrent-tracker.confd, +files/bittorrent-tracker.initd,
+  bittorrent-4.1.8.ebuild, bittorrent-4.2.0.ebuild, bittorrent-4.2.2.ebuild:
+  Changing name of startup script and configuration file to fit upstream changes
 
 *bittorrent-4.2.2 (18 Dec 2005)
 
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 003ed049ce0e..5500656a2e2d 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -2,14 +2,15 @@ MD5 0a2038ba8fb8a04e7a27b688e46a328b ChangeLog 11157
 MD5 4cd212682be24bfbff707f07b8549f83 bittorrent-3.4.2-r2.ebuild 1930
 MD5 6ce87277893479d6fc697ff40f290ad7 bittorrent-4.0.2.ebuild 1975
 MD5 462e522f275310b5d305c18a6ef57829 bittorrent-4.0.4.ebuild 2045
-MD5 ed6d2d7a4fd46c246f47abac86005f94 bittorrent-4.1.8.ebuild 1956
-MD5 d6432cfcbdd35cc84260eaa6438d811b bittorrent-4.2.0.ebuild 1958
-MD5 2cc4dbdb0d16db6b343383a2b8a62356 bittorrent-4.2.2.ebuild 1953
+MD5 f0183261cc9d9aaae81c6a2465029245 bittorrent-4.1.8.ebuild 2221
+MD5 faa736fe733d413df948f835ac2916ed bittorrent-4.2.0.ebuild 2223
+MD5 5aeb83194806d8c0a0f488b5b99fe255 bittorrent-4.2.2.ebuild 2218
 MD5 21ec89d06de83ddcc4cf6d6616355190 files/bittorrent-4.1.0-fix-all.patch 2483
+MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bittorrent-tracker.confd 728
+MD5 be8d0eaa6a5cc7180f1f621fd685bd11 files/bittorrent-tracker.initd 643
 MD5 139c4a4367e37fcf7dc6bd18515456c2 files/btdownloadgui.desktop 166
 MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bttrack.conf 728
 MD5 8254615ee527cd608123c83de2616ede files/bttrack.rc 631
-MD5 be8d0eaa6a5cc7180f1f621fd685bd11 files/bttrack.rc-4.1 643
 MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r2 65
 MD5 4b713b7a06f5263bd26757a2ddddfe4b files/digest-bittorrent-4.0.2 68
 MD5 b493f99b647c326f2b2d24bdba684ad0 files/digest-bittorrent-4.0.4 68
diff --git a/net-p2p/bittorrent/bittorrent-4.1.8.ebuild b/net-p2p/bittorrent/bittorrent-4.1.8.ebuild
index 5c0cb7ceb262..b03d6d83f3f7 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.8.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.8.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.8.ebuild,v 1.1 2005/11/20 13:26:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.8.ebuild,v 1.2 2005/12/18 20:08:06 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -61,15 +61,20 @@ src_install() {
 	fi
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
+	newins ${FILESDIR}/bittorrent-tracker.confd bittorrent-tracker
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc-4.1 bttrack
+	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.2.0.ebuild b/net-p2p/bittorrent/bittorrent-4.2.0.ebuild
index ecac2783c7b6..53dc1aac993b 100644
--- a/net-p2p/bittorrent/bittorrent-4.2.0.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.2.0.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.2.0.ebuild,v 1.1 2005/11/27 20:26:38 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.2.0.ebuild,v 1.2 2005/12/18 20:08:06 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -61,15 +61,20 @@ src_install() {
 	fi
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
+	newins ${FILESDIR}/bittorrent-tracker.confd bittorrent-tracker
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc-4.1 bttrack
+	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.2.2.ebuild b/net-p2p/bittorrent/bittorrent-4.2.2.ebuild
index 4676a6e04f7b..7559bf65b8e3 100644
--- a/net-p2p/bittorrent/bittorrent-4.2.2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.2.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.2.2.ebuild,v 1.1 2005/12/18 19:25:47 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.2.2.ebuild,v 1.2 2005/12/18 20:08:06 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -61,15 +61,20 @@ src_install() {
 	fi
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
+	newins ${FILESDIR}/bittorrent-tracker.confd bittorrent-tracker
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc-4.1 bttrack
+	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/files/bittorrent-tracker.confd b/net-p2p/bittorrent/files/bittorrent-tracker.confd
new file mode 100644
index 000000000000..46e25b2524f1
--- /dev/null
+++ b/net-p2p/bittorrent/files/bittorrent-tracker.confd
@@ -0,0 +1,18 @@
+# /etc/conf.d/bttrack
+# 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/bittorrent-tracker.confd,v 1.1 2005/12/18 20:08:06 mkay 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.
+PORT=8082
+
+# where to store recent downloader info
+DFILE=/usr/share/bittorrent/tracker.dfile
+
+# path to favicon.ico which many popular web browsers can use
+FAVICON=/usr/share/bittorrent/favicon.ico
+
+# Connection logs are sent to stdout by default, so they should be sent to a
+# file when using this script.
+LOGFILE=/var/log/bttrack.log
diff --git a/net-p2p/bittorrent/files/bttrack.rc-4.1 b/net-p2p/bittorrent/files/bittorrent-tracker.initd
index 6f17d701201b..5f19dce83586 100644
--- a/net-p2p/bittorrent/files/bttrack.rc-4.1
+++ b/net-p2p/bittorrent/files/bittorrent-tracker.initd
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bittorrent-tracker.initd,v 1.1 2005/12/18 20:08:06 mkay Exp $
 
 depend() {
 	need net