Rename tracd.initd.2 to tracd.initd.

3 files changed, 5 insertions, 46 deletions

diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 3ccb5bec0aed..7ed135090c93 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,23 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinst-en.txt 1349 RMD160 019db0eb917956b84e2afe621edcba501e83a105 SHA1 337a6d417aee1cb94d936952584a154a18ae6d74 SHA256 af9ea54a0499737a454852d8f878368fea6540dc50fce3ce486ede2a0a201a39
 AUX postupgrade-en.txt 674 RMD160 088b1b590ebd7876347b06e71f9dda549238eda1 SHA1 f45997b23c35eec1188003b21dd971d28961ab98 SHA256 4ce5f023f0f2312ac6b6162b2db510397d204cc168db1d5c09ad3aae678ea6b0
 AUX tracd.confd 359 RMD160 7328dd041576abbc76130ce220041d837289dd00 SHA1 91a6077f1baf9301082826697e8828c6039f7648 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e
-AUX tracd.initd 881 RMD160 c215a990133d5b655bc94e13ab4de9d1c938a163 SHA1 2c1a9dbae7e4890c2fb71f22091786ba7396c940 SHA256 6e76bfffe7f6928bff24d79b97aa8bbd27dafdfbb16fe8c79b7ad298e202d950
-AUX tracd.initd.2 939 RMD160 2991a7a8d2d1a2911a899ed5f356fd88de872b5d SHA1 c8d00dc0e7ca92f17caa4ec1dfa49d3178fbc735 SHA256 9cd796e0fb516a91f5ec69037819144e9b9920af5df4f91839f9fb7fc67823a0
-DIST Trac-0.11.5.tar.gz 739783 RMD160 11f29af561531a33d4739d94b89f3b20104fbc3a SHA1 a4c24f006f79b405cea98a6b3b74a93be565cbaa SHA256 cc3362ecc533abc1755dd78e2d096d1413bc975abc3185318f4821458cd6a8ac
-DIST Trac-0.11.6.tar.gz 749517 RMD160 ff384a4774da3631b1763efa76943450406710ef SHA1 9bb360cd86dcb16ec139a8ef10dd1b346adcaa18 SHA256 4c4151fecfbf6ed3defdf94be9262a44076e40f544eb191cc6e73c0e4b83e05a
+AUX tracd.initd 939 RMD160 e488e124127eae14ea5dd637b31562bd64df872b SHA1 ffcb53377352a4beea834fd0338e4772dba0f316 SHA256 c9df15d1f349ec9b2b12ed8a1a0d475d8a0d786e30605176da6627c2f0bcbfb5
 DIST Trac-0.11.7.tar.gz 757073 RMD160 d55cc6095f00df4736b677163405b31cdd285341 SHA1 0a1b756ca580ecaac7e76531e80890728b976122 SHA256 c6af8cc9fa0cb8fd74611896e46a436cef9660b77be1972a99b0d3ddb894232f
-EBUILD trac-0.11.5.ebuild 2341 RMD160 5fbad9998cf3ea61703d0264d544ae86a7846e0c SHA1 4db7df7f484a234e615bb18bee9866a56c907a30 SHA256 190f4a9f72ec700d23782dd58231448a7df4f9edcce1c844738de188681e284f
-EBUILD trac-0.11.6.ebuild 2358 RMD160 d0180dd6af42e27fc80332c94b0b4dad5e223d03 SHA1 d5abe31428fe418d7b7f384def5f664a89cce71d SHA256 3af1f7638acf55798101a6182b370d64a356830e94e5c9b6eef225d59c811c34
-EBUILD trac-0.11.7.ebuild 2361 RMD160 6b28b2a619c39bcbe6d30178ccf0f0a6acc0a573 SHA1 f1608ada49411f0f846706c079836ada7ab16230 SHA256 3dde444563b3d87b98de28bcbb3d3cd30f8d9a0e7f69bb50e2faf54fb658e85b
-MISC ChangeLog 15706 RMD160 d7ec3ec0a14e4e597cfca4a106cfd20558b9c8ad SHA1 e7854e10b69659384552885efaa80df87c15066b SHA256 cbc8b4de2d10cb788fc74fa24e845ff94a5f7e669e64e9d004a2c4267de41400
+EBUILD trac-0.11.7.ebuild 2513 RMD160 6f076559005de5d7abe8d08d2bbd4fe66fb4b6fb SHA1 f3aa8aa6982fb094ac14a18ad1646ae75f4b6d95 SHA256 061ad9b334f11d6e522cd7251946a4cf46f8f6d4fd9042a38759fc00a6be8c73
+MISC ChangeLog 15831 RMD160 56f078fe390938435eff3b45b1a6ba435b6cf5db SHA1 33f95a52d5821055d98d5c62a92020b8debddb63 SHA256 3ff4cd24660056b4be8b8b0e2adb8a2d21566625ec0fdefb97df9f11e83bdff8
 MISC metadata.xml 261 RMD160 439806094e6f8f7947a46112764c2057124c81ef SHA1 b75fc0a9d7ee270f1b6ced43474c93416b534342 SHA256 4ebf43cd532745ee22b5b0aa44d7f3968ef23b611d4a2b49fbb93f734c6f332e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkv/oiEACgkQkKaRLQcq0GI/IgCdEVwuGU1gJprTUIvDhalOLMof
-uRUAoJWfL++/pMKYSyrnRTYzwbc2rf7C
-=uJLi
------END PGP SIGNATURE-----
diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd
index c63b794298a6..83f84052d3a4 100755
--- a/www-apps/trac/files/tracd.initd
+++ b/www-apps/trac/files/tracd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.3 2008/07/16 21:20:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.4 2010/05/28 14:43:40 arfrever Exp $
 
 depend() {
 	need net
@@ -14,6 +14,7 @@ start() {
 	# --background option of s-s-d.
 	start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
                 --pidfile /var/run/tracd.pid --make-pidfile --background \
+		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
 		--exec /usr/bin/python -- /usr/bin/tracd \
 		-p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/}
 	eend $?
diff --git a/www-apps/trac/files/tracd.initd.2 b/www-apps/trac/files/tracd.initd.2
deleted file mode 100755
index 75de90902efb..000000000000
--- a/www-apps/trac/files/tracd.initd.2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd.2,v 1.1 2008/09/10 07:50:30 wrobel Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting tracd"
-	# tracd fails to create pidfile if started as non-root user, thus we are asking
-	# s-s-d to do that. To have correct pid we avoid -d option of tracd and use
-	# --background option of s-s-d.
-	start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \
-                --pidfile /var/run/tracd.pid --make-pidfile --background \
-		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
-		--exec /usr/bin/python -- /usr/bin/tracd \
-		-p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping tracd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid
-	eend $?
-}