Fixed up init script for daemon mode (problems when using baselayout-2)

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 42 insertions, 10 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 8301816196df..18a0d829c8e0 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.160 2011/04/18 20:03:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.161 2011/05/09 21:34:21 sochotnicky Exp $
+
+*rtorrent-0.8.7-r3 (09 May 2011)
+*rtorrent-0.8.6-r4 (09 May 2011)
+
+  09 May 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -rtorrent-0.8.6-r3.ebuild, +rtorrent-0.8.6-r4.ebuild,
+  -rtorrent-0.8.7-r2.ebuild, +rtorrent-0.8.7-r3.ebuild, files/rtorrentd.init:
+  Fixed up init script for daemon mode (problems when using baselayout-2)
 
 *rtorrent-0.8.7-r2 (18 Apr 2011)
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 7e548269946e..261d342c8366 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,13 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 AUX rtorrent-0.8.6-canvas-fix.patch 11607 RMD160 01f3be5ecf0769a44e31f9852eb3da5454e85c75 SHA1 4d60d95845df05c9864ca50d3f84726d2b93ab14 SHA256 a843dcd8c3b7fe0179c24d53cb485d2f11156a189e58911bbd14e5e30db71925
 AUX rtorrent-0.8.6-ncurses.patch 572 RMD160 c0e390c444e50d69d8dbe4727c76b5962651a570 SHA1 2267dce2ddfb1ea865ba50c95e4a5beaf24da533 SHA256 4bcc6f33fad67d14f44cfdc63409fc94ef917dc120c46e60ce175d36af3fcb02
 AUX rtorrent-0.8.7-canvas-fix.patch 10095 RMD160 67315e412a1d071c32366ff0920ae2fe69ac4c6f SHA1 ead1c7099cd42fc48b3194c3e53a9b2d4e2d4311 SHA256 a40a88d17e3090d3a7244ae701b049687b3646f8cbecfe40a1456306b6b56fd7
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
-AUX rtorrentd.init 738 RMD160 ad8f44fedbc50436916cdf4d8f4dd0c7a455c8d3 SHA1 406561f68aa5c488e025aa174a82aa19534ef0cd SHA256 68d6db59c00226ffd7c155b4613ab67b71c41f02164e69d5a55fa3bdbf43ced3
+AUX rtorrentd.init 837 RMD160 d20e886080480cb4f87dc7272b36db22ca4d76da SHA1 35e261746de7ca1396240047e1b2bd426a8b1857 SHA256 d8b29a500439a6be30b94b29af3f6b7fa7c61c067af59cf46b9d197268858242
 DIST rtorrent-0.8.6.tar.gz 521045 RMD160 3d5109d4ee26c663b376e0b9f610ab6055c57ba9 SHA1 ffce3959ba91738bb444d689db3db1e2375b14ce SHA256 8c96c68e1524162abd1fc4b612d0c3d924fccc25159c0b3f208e69281f0b32db
 DIST rtorrent-0.8.7.tar.gz 547435 RMD160 52564096341088087c7a316c8e7637df77b672b6 SHA1 691c95e948d02927edc05321e52cd1c63513fabc SHA256 1fd0c9b2b3fe81b035209417c4dd4514473411f16b15ffe7fefe87eaff1a58d2
 EBUILD rtorrent-0.8.6-r1.ebuild 1596 RMD160 c4558712e434a91bd49bb99049badd7e8c1e975f SHA1 e2c47673cea00308d5dc63dcce21dfa4229ff8f3 SHA256 1c177f4f112c0e21611f404f1c15d98ec1be13f92fdc0e54bb587bd3c9677ce5
-EBUILD rtorrent-0.8.6-r3.ebuild 1666 RMD160 15d70858c72a7660aef38e5d04bab2b72a6d0f6c SHA1 59a4fbf99f0a2f44f39dd64393c34fd9a968be12 SHA256 1a893a7fe86b45ad6c59732cdb753d97e4c35ca19d9f2d21c2175ce99709cd72
-EBUILD rtorrent-0.8.7-r2.ebuild 1771 RMD160 675935b6ea1c337cdf12189e3b526d6619098d8f SHA1 9b44dd1f15c6699c82372d4b929f4410f19fb1b1 SHA256 571b3c293937e264d5ed6ac8c33048e34a2823c02fff3da10891541969b925ac
-MISC ChangeLog 23586 RMD160 c425d99673441e1410c5ab2db9dfd231702398f4 SHA1 ee16325ad101f6bb8c336e72940e71ebc6f45e4c SHA256 d5f93cb31a52ba76889918e52fb42f37ca9d3cbc7fd69d2b8dff798b915956ea
+EBUILD rtorrent-0.8.6-r4.ebuild 1666 RMD160 15b8466b39eb46d3fedd8978cf8e5641219ba32c SHA1 b56cb4f72c7e1a3f790340dc62e8cd3d3d09acd8 SHA256 eb8746d33eeb701043483be7d6d0105870a416ee93172454bebb2a11b8a83b83
+EBUILD rtorrent-0.8.7-r3.ebuild 1773 RMD160 88c5032330063db0c27289eddca56517784abcad SHA1 5f957019bbf2cdc48e14537260f386ab92e79703 SHA256 0ad9e63d9c8060e65872beab0be233032ac3a5b85b3bd6a55c06db585c6bb950
+MISC ChangeLog 23923 RMD160 8b217a7de4259452c2268647bbc2f5306f55249b SHA1 e6d620dc3efcbeb9ae318705291e67ebddbcdf21 SHA256 cdc2205c7b90877f13438aa08ab88b2a746e608415a92620a8cd1f2abbcb6b56
 MISC metadata.xml 461 RMD160 20828b74a80b51c1df06f6dba3aa63fbe7eec437 SHA1 7d50936803d36c9e88d2030bcf6647d4cede9d09 SHA256 db7942b39f614d72ff07b2ca64acbddd975cc016761d0037eb9edf786a4b295d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNyF31AAoJELy9dS57CHJBPiwP/AuxuPEdWpE4tCY1Qi6n2nFC
+mgPjBeH4pEQH/cy33T7bbx29jIMzA7cmJEm1Mpw2IvC7BQC5hFp8ggPGww3JQ6rl
+KnncoqNpdE2kQ015HOeeUzBlTanW4pCvmko0uoI1qktNk72vjTU57L/d5v3ohjmX
+Ma2Gn+x+k5xw646sscqbMWPa8RZltdxOuGdBS4n59Qg0VYkNniq/12GldDOjoMn/
+6c2tKnU8+KFN6C1I8UquoHlRNSpEjpH4zhTR+/qLS2ePXSRuyuaER05HEJME8REg
+4J9PXZZe1S2UAmmSb9mmtbAEe3kTLSDAHTrK0xVSpx531O3a4GdLeouKq64kj5+u
+p3eSCGY26/TF3PA4ZzINkUTQnqKGaXAqszM/05411QOz1Xt0kNOqukq574BDX1If
+hJj1INqBvviU1yvTRL0o0wh6wz7rcUzKOBN83JCgAMRCzLRph6ksjYeZmB3KIHrL
+drQWKYOh2stA8iCRtUYB11rI3FGhnEQ6uU0/MVKtkU+5J6+W4yGw+gyvhpOZ1BWt
+JglKwLS+yGodV/4h6oc2SJxZpVFfp16CHVCmRnkBicxNLe7N8jgNmN8dy2Cv4N4f
+yekGhIKXWpGeidpBCeLJSTymmKJUrUoLw85yzZHag3O5JtbrewQdJ2I93lm1T9ZC
+6Mo48fsdLNbegLFmCJxZ
+=7AJ9
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index 9d64a9a81159..e160b99f9c01 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.6 2011/04/11 21:24:18 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.7 2011/05/09 21:34:21 sochotnicky Exp $
 
 depend() {
 	use net ypbind nis
@@ -15,16 +15,20 @@ start() {
 	env TERM="xterm" \
 		start-stop-daemon \
 			--start \
+			--make-pidfile \
+			--pidfile /var/run/rtorrentd.pid \
+			--background \
 			--user $USER \
 			--chuid $USER \
 			--env HOME="${PWHOME:-/home/$USER}" \
 			--name rtorrent \
-			--exec /usr/bin/screen -- -d -m -S rtorrentd /usr/bin/rtorrent
+			--exec /usr/bin/screen -- -D -m -S rtorrentd /usr/bin/rtorrent
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping rtorrent"
-	start-stop-daemon --stop --signal 2 --name rtorrent
+	start-stop-daemon --stop --signal 15 \
+			--pidfile /var/run/rtorrentd.pid
 	eend $?
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
index 3ac83a9a21ee..84bc602816b7 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild,v 1.1 2011/04/11 21:24:18 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild,v 1.1 2011/05/09 21:34:21 sochotnicky Exp $
 
 EAPI=2
 
diff --git a/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild
index 24f84c11088b..4293767f37f3 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild,v 1.2 2011/04/18 23:54:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild,v 1.1 2011/05/09 21:34:21 sochotnicky Exp $
 
 EAPI=2