Fixed typo and added check if /etc/{init,conf}.d/bttrack exists (bug #119816)

(Portage version: 2.1_pre3-r1)

8 files changed, 26 insertions, 19 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 04dae44624c4..fe1a4b217d5b 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,9 @@
 # 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.76 2006/01/21 17:25:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.77 2006/01/22 10:20:07 mkay Exp $
+
+  22 Jan 2006; Marcin Kryczek <mkay@gentoo.org> bittorrent-4.2.2.ebuild:
+  Fixed typo and added check if /etc/{init,conf}.d/bttrack exists (bug #119816)
 
   21 Jan 2006; Jeroen Roovers <jer@gentoo.org> bittorrent-4.2.2.ebuild:
   Stable on hppa (bug #119602).
@@ -166,7 +169,7 @@
   +bittorrent-4.0.1.ebuild:
   Version bump
 
-  24 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  24 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   bittorrent-4.0.0.ebuild:
   Add ~alpha keyword, bug 86127.
 
@@ -220,7 +223,7 @@
   +bittorrent-3.4.2-r1.ebuild, bittorrent-3.4.2.ebuild:
   new init script, stable x86 version bump, move to net-p2p herd (#55954)
 
-  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> bittorrent-3.3.0.ebuild,
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> bittorrent-3.3.0.ebuild,
   bittorrent-3.4.1.ebuild, bittorrent-3.4.1a.ebuild, bittorrent-3.4.2.ebuild:
   Change wxPython to wxpython.
 
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 562790122ad7..ed037a0f2fac 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -4,7 +4,7 @@ MD5 6ce87277893479d6fc697ff40f290ad7 bittorrent-4.0.2.ebuild 1975
 MD5 462e522f275310b5d305c18a6ef57829 bittorrent-4.0.4.ebuild 2045
 MD5 c6cf55ab721fc74136cacda70cf8c359 bittorrent-4.1.8.ebuild 2218
 MD5 24fb4a7804a2f0c974940c9b4a355320 bittorrent-4.2.0.ebuild 2218
-MD5 2835b6360a4a291db889aa089e2ac64e bittorrent-4.2.2.ebuild 2212
+MD5 04e5f9666b1db0ac681426318b1d13e4 bittorrent-4.2.2.ebuild 2305
 MD5 21ec89d06de83ddcc4cf6d6616355190 files/bittorrent-4.1.0-fix-all.patch 2483
 MD5 c200bdbccb6ccbf18bef6338363c1a4a files/bittorrent-tracker.confd 565
 MD5 48316c1ff208c04a7f2de73860fc48e6 files/bittorrent-tracker.initd 648
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
index b8707eb17d25..e4945d77e691 100644
--- a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-3.4.2-r2.ebuild,v 1.10 2005/09/25 22:30:09 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild,v 1.11 2006/01/22 10:20:07 mkay Exp $
 
 inherit distutils
 
diff --git a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
index 823171a9879c..30cbf900b4f7 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.11 2005/11/27 20:26:38 sekretarz Exp $
+# $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
 
diff --git a/net-p2p/bittorrent/bittorrent-4.0.4.ebuild b/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
index ed1e180e5dc2..6be28a8dfb16 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.4 2005/09/25 22:30:09 mkay Exp $
+# $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
 
diff --git a/net-p2p/bittorrent/bittorrent-4.1.8.ebuild b/net-p2p/bittorrent/bittorrent-4.1.8.ebuild
index b03d6d83f3f7..b71acdacabe7 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
+# 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.2 2005/12/18 20:08:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.8.ebuild,v 1.3 2006/01/22 10:20:07 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
diff --git a/net-p2p/bittorrent/bittorrent-4.2.0.ebuild b/net-p2p/bittorrent/bittorrent-4.2.0.ebuild
index 53dc1aac993b..1d1e6ca160e3 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
+# 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.2 2005/12/18 20:08:06 mkay Exp $
+# $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
 
diff --git a/net-p2p/bittorrent/bittorrent-4.2.2.ebuild b/net-p2p/bittorrent/bittorrent-4.2.2.ebuild
index 4df43cbf0cde..5619deb7d1f8 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-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.2.ebuild,v 1.7 2006/01/21 17:25:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.2.2.ebuild,v 1.8 2006/01/22 10:20:07 mkay Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -68,13 +68,17 @@ src_install() {
 }
 
 pkg_postinst() {
+	einfo
 	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"
+	if [ -f ${ROOT}/etc/init.d/bttrack -o -f ${ROOT}/etc/conf.d/bttrack ]; then
+		einfo "Please use /etc/init.d/bittorrent-tracker and "
+		einfo "/etc/conf.d/bittorrent-tracker instead of"
+		einfo "/etc/init.d/bttrack and /etc/conf.d/bttrack. "
+		einfo "You can safety remove the old files"
+		einfo
+	fi
 	distutils_pkg_postinst
 	fdo-mime_desktop_database_update
 }