fixed initscript; thanks to heiliger @vdrportal.de

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 31 insertions, 23 deletions

diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog
index 3842aed61d89..d3b164b2c7b2 100644
--- a/www-misc/xxv/ChangeLog
+++ b/www-misc/xxv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/xxv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.6 2009/05/02 13:11:45 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.7 2009/05/02 17:39:39 hd_brummy Exp $
+
+  02 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/xxv.utf8-v3,
+  files/xxv.utf8-v4:
+  fixed initscript; thanks to heiliger @vdrportal.de
 
 *xxv-1.3.1 (02 May 2009)
 
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 6d0d8997ae6d..d5c38067a762 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -4,8 +4,8 @@ Hash: SHA1
 AUX xxv 1740 RMD160 0bf23d7ad41d16886ab634ce0f72525d01c62bbe SHA1 4810b59fa54eb5ce67be25f8c2320dbc93964afa SHA256 7ca0191b439184d0e0acfdc64fd3fe550b46f5ea4ed2437aa00463358061332f
 AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86 SHA1 712257f3d7a98da402f3c67bbd41b6bb132ff0a3 SHA256 ac8db7fb3d75be90dc33fdf427265dcd14355e572500140718fce2c731166822
 AUX xxv.utf8-v2 2080 RMD160 61b893d242635d00a6c2d079b57f7949d09a3e65 SHA1 06d77b27898d2d0e2dcbe121aa678bd9eb9df991 SHA256 c12eeef4f65971c8084b2d698ce276f94ca3b101f5c48d8f72189c1a2f96b73a
-AUX xxv.utf8-v3 2392 RMD160 8a14e2a3efd3cf5ae641d9910dca5c4ff002faff SHA1 2627a4a68e41fee353874a8a6e4d00a956a5a886 SHA256 a10bb1cfd40685fe815495e3b4cfafdb62951db3c50636ed5e9b884bf6da130e
-AUX xxv.utf8-v4 2369 RMD160 30ff9292aecff66ae5067ec1b2bd164a55984c76 SHA1 8c52af8d58a28faf7217f596bfbeaef462994279 SHA256 b116764a37ec1a3b52a397531327fd6cfe29474b0c879dd04949f1b3413dd7b4
+AUX xxv.utf8-v3 2425 RMD160 a6e6ac528b437af2f373e792745418e1ded214d6 SHA1 819051dc5d2636553a2681093d0596da23dcd9d2 SHA256 55d44e9e875dfa261da45b269f54615b7e0d8189d1517fa9800897a4ffb518f2
+AUX xxv.utf8-v4 2402 RMD160 0383b510616c4606fc75ee614524ccd04bb5d724 SHA1 76054d84354fde02982c114d03cafd9838a9fd26 SHA256 e5d22a0640a84332f6c5fad74650174f56ffbc900a60d0be48165fe4164bec84
 AUX xxvd-1.0.cfg 2257 RMD160 2f0ed9987f6a85fa4bc1a7ae68b31251f4e72b00 SHA1 f82efba3aefb1216067767e52236e119da6d65dc SHA256 a49c7c402e8c9990f84e8b3ae5207559f9dd9262075b5ab0606058ff08061016
 AUX xxvd-logrotate 478 RMD160 5945c1c40750b594dce1bec7ba8cf9cc7aa43ea0 SHA1 450c4e18023716851a86a1afc8a8ce749a9e3513 SHA256 0b16eda74181e54f0beb5a3de92d2e12288270bc891e378d61a076274e53f11a
 DIST xxv-1.0.1.tgz 920320 RMD160 fa71db154cb9d185e6175f21d4e2ad3fa1747cd6 SHA1 b58e81e218e47e99e9fddbdeab776201c266a044 SHA256 94a13c087e7a6d180b3e23815bd8d36b1ee5ac81fd31faa0f825d0395d8d6f78
@@ -18,13 +18,13 @@ EBUILD xxv-1.2-r1.ebuild 4392 RMD160 d9b5d1bf7dfb367e0831ba503865c2c8110c00ea SH
 EBUILD xxv-1.2.1402.ebuild 4401 RMD160 47f33526c93ab4d9fc7ca8b17b3ddbc467fd65ff SHA1 aa81f2e3555895570303c5d86bfb471c72fbd025 SHA256 22732f0df4b92a1c75db7afae48f179a357b89e1854fd084039ec38692ee4e38
 EBUILD xxv-1.3.1.ebuild 4496 RMD160 17ddf07de63911ee94241edf3a6febfb8cc56f1b SHA1 5b22ca07e8da72aad7560bc28e171fe95eeed89a SHA256 90179094ea198afbcd74de4db906f48ed153bb601385d99818434d180bc615f1
 EBUILD xxv-1.3.ebuild 4318 RMD160 c5d8a754d9da39fcbb7d209ed2d4fb54027381c4 SHA1 2be85dfa6804a8db94d70dcd108de4659a2ca629 SHA256 c40f5d57b3c1c8927ab6ae463f91d86c51b2ba04648cbb2b2e77138d4952b671
-MISC ChangeLog 3739 RMD160 2ac103baa17d1f968cb69c05023ba54521d1889a SHA1 41ac157e9073d1f36e03fe983f2021817883c86a SHA256 1ae6ca319120dba46e3fdd6dcc910117bc698f3dc35557582f3b148fdecded0c
+MISC ChangeLog 3888 RMD160 bcc1902173e52cc1d372fc0f81df0eed5779478f SHA1 98bfec5b30126253bc5065b190b0679142f25a9b SHA256 b3d85b14dd391ead5f72da78bb2e050499d63efa78c668b495baf4ace983f1a3
 MISC metadata.xml 607 RMD160 423ff4aae1b8fcfab1b50267a6d0084bea950655 SHA1 be987c97532f8a8efa4746ca36772352490e6b7f SHA256 b1dc077f8c2d9cba527f27261f18b2186275f7202e5393c367cd594b57d18037
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFJ/Eaddn07HTTCgIoRAg7cAJ9F/zJ/qzuTt0Hh4SlR9P5qR4KMHQCgmxZq
-OoPZCDxtIVN2i81dvf9uBOE=
-=EL8F
+iD8DBQFJ/IVmdn07HTTCgIoRAr5tAJ9nAGLXM3pCBYFZhQ9b+q0HeulW8ACgreDl
+RgdgWdzXYB8ImOqHLmvY+wo=
+=m8jd
 -----END PGP SIGNATURE-----
diff --git a/www-misc/xxv/files/xxv.utf8-v3 b/www-misc/xxv/files/xxv.utf8-v3
index cb8a3af74276..e56d4ee7df92 100644
--- a/www-misc/xxv/files/xxv.utf8-v3
+++ b/www-misc/xxv/files/xxv.utf8-v3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.1 2009/04/16 00:28:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v3,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $
 
 RUNAS_USER="root"
 
@@ -44,9 +44,10 @@ xxv_kill_pid() {
 
 	# After unclear stop, xxvd.pid will not removed, fixed with next line
 	if [ ! -x /etc/init.d/root ]; then
-		[ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]
-		rm ${PIDFILE}
-		killall xxvd 2> /dev/null
+		if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then
+			rm ${PIDFILE}
+			killall xxvd 2> /dev/null
+		fi
 	fi
 
 }
@@ -56,10 +57,11 @@ xxv_kill_initfile() {
 	# After unclear stop, init file in /var/lib/init.d/started/ still not removed
 	
 	if [ ! -x /etc/init.d/root ]; then
-		[ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]
-		rm /var/lib/init.d/started/xxv
-		/etc/init.d/xxv zap
-		killall xxvd 2> /dev/null
+		if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then
+			rm /var/lib/init.d/started/xxv
+			/etc/init.d/xxv zap
+			killall xxvd 2> /dev/null
+		fi
 	fi
 
 }
diff --git a/www-misc/xxv/files/xxv.utf8-v4 b/www-misc/xxv/files/xxv.utf8-v4
index f0d6a4890c0d..c1f3d0b8ead3 100644
--- a/www-misc/xxv/files/xxv.utf8-v4
+++ b/www-misc/xxv/files/xxv.utf8-v4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.1 2009/05/02 13:11:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/files/xxv.utf8-v4,v 1.2 2009/05/02 17:39:39 hd_brummy Exp $
 
 RUNAS_USER="vdr"
 
@@ -41,9 +41,10 @@ xxv_kill_pid() {
 
 	# After unclear stop, xxvd.pid will not removed, fixed with next line
 	if [ ! -x /etc/init.d/root ]; then
-		[ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]
-		rm ${PIDFILE}
-		killall xxvd 2> /dev/null
+		if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then
+			rm ${PIDFILE}
+			killall xxvd 2> /dev/null
+		fi
 	fi
 
 }
@@ -53,10 +54,11 @@ xxv_kill_initfile() {
 	# After unclear stop, init file in /var/lib/init.d/started/ still not removed
 	
 	if [ ! -x /etc/init.d/root ]; then
-		[ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]
-		rm /var/lib/init.d/started/xxv
-		/etc/init.d/xxv zap
-		killall xxvd 2> /dev/null
+		if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then
+			rm /var/lib/init.d/started/xxv
+			/etc/init.d/xxv zap
+			killall xxvd 2> /dev/null
+		fi
 	fi
 
 }