fix for bug# 172391

Package-Manager: portage-2.1.2.2

5 files changed, 20 insertions, 103 deletions

diff --git a/sys-process/daemontools-scripts/ChangeLog b/sys-process/daemontools-scripts/ChangeLog
index 55f60990421d..86ddc35dbb5d 100644
--- a/sys-process/daemontools-scripts/ChangeLog
+++ b/sys-process/daemontools-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/daemontools-scripts
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/ChangeLog,v 1.12 2006/12/17 20:12:02 kaiowas Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/ChangeLog,v 1.13 2007/03/28 08:16:40 kaiowas Exp $
+
+  28 Mar 2007; Petre Rodan <kaiowas@gentoo.org>
+  daemontools-scripts-1.0.4.ebuild:
+  fix for bug# 172391
 
   17 Dec 2006; Petre Rodan <kaiowas@gentoo.org>
   daemontools-scripts-1.0.4.ebuild:
diff --git a/sys-process/daemontools-scripts/Manifest b/sys-process/daemontools-scripts/Manifest
index 652a1345b4e9..6cae813d2d7b 100644
--- a/sys-process/daemontools-scripts/Manifest
+++ b/sys-process/daemontools-scripts/Manifest
@@ -1,34 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST daemontools-scripts-1.0.3.tar.bz2 7141 RMD160 44969d9d34d336001c592ab8a725f686c3229cf8 SHA1 7dc863f4d0cb2b938ca6a82be86d33baee7b2811 SHA256 00f18fa7d9104ec26bb38abacdcec9a65ac2fa1b8a04ad364c0f203f9cb70806
 DIST daemontools-scripts-1.0.4.tar.bz2 7145 RMD160 759b783aab6f6a9b95500db56403a8c49aee2854 SHA1 7fffd7bad0bdb8cf0df2e597c0e2a1f1a1576825 SHA256 3af568255e75da9681144355379df3b8e70ff945df101a1903f435166cac1264
-EBUILD daemontools-scripts-1.0.3.ebuild 1797 RMD160 ba228771a411e0bd25b06dc10ca8a140b6e87f0b SHA1 ad97d16ab7edb7c32365b15bbea678e41c808c05 SHA256 b7419eb02f8f3ffd7ffd25e8f4431a5d9edd5d7e519b24f8d3b0cf4f7020a52d
-MD5 1ad5ae9f359511ea5757b5bf741ba67d daemontools-scripts-1.0.3.ebuild 1797
-RMD160 ba228771a411e0bd25b06dc10ca8a140b6e87f0b daemontools-scripts-1.0.3.ebuild 1797
-SHA256 b7419eb02f8f3ffd7ffd25e8f4431a5d9edd5d7e519b24f8d3b0cf4f7020a52d daemontools-scripts-1.0.3.ebuild 1797
-EBUILD daemontools-scripts-1.0.4.ebuild 1797 RMD160 101e7a6b76f5a75297995f7ce8e40cd9ce27b1a9 SHA1 e4c7bbd90395a4bc1f08dc8e066933bcb7217f58 SHA256 3c3993fd326a10f2879c3f65f29d4c8c2e55bc56ff77ce4cd49b7cfba3ed7b44
-MD5 ab21b69cd061bc3ba76bcf493359427f daemontools-scripts-1.0.4.ebuild 1797
-RMD160 101e7a6b76f5a75297995f7ce8e40cd9ce27b1a9 daemontools-scripts-1.0.4.ebuild 1797
-SHA256 3c3993fd326a10f2879c3f65f29d4c8c2e55bc56ff77ce4cd49b7cfba3ed7b44 daemontools-scripts-1.0.4.ebuild 1797
-MISC ChangeLog 2298 RMD160 68e86be6b4ce8caf5efa6f6f368ff574577d95cf SHA1 a1cc3b45d4fc6de0f03f1b84f5a8ad8451fe7bd7 SHA256 3a867a5da8091af9155f22354d986d383559ef48dea67fd9e0a28a03c52c69dd
-MD5 0144c5d16506ca9b69364e07fa53fae3 ChangeLog 2298
-RMD160 68e86be6b4ce8caf5efa6f6f368ff574577d95cf ChangeLog 2298
-SHA256 3a867a5da8091af9155f22354d986d383559ef48dea67fd9e0a28a03c52c69dd ChangeLog 2298
+EBUILD daemontools-scripts-1.0.4.ebuild 1807 RMD160 1768c887cf82ca9cd5cc26648488204d9a72af4e SHA1 0f69dc305563dc11f48312994d03283f03eecb8d SHA256 0f6e8a1674e53d8846b6103156d847599be9418492ccfa3a1acd9b1c1c8c13ff
+MD5 baf631016f63c41971c46c04c8582cb9 daemontools-scripts-1.0.4.ebuild 1807
+RMD160 1768c887cf82ca9cd5cc26648488204d9a72af4e daemontools-scripts-1.0.4.ebuild 1807
+SHA256 0f6e8a1674e53d8846b6103156d847599be9418492ccfa3a1acd9b1c1c8c13ff daemontools-scripts-1.0.4.ebuild 1807
+MISC ChangeLog 2405 RMD160 9e636436e044e314409c097a70d6b7a322cd8b88 SHA1 aef28adc343af9b977e6194f16f3a6bc2325831a SHA256 07dec39facff163b76dfdfb293a8a877eeb210ef324d74be82bca26d044f1295
+MD5 937f0680746bc6ff204f6de3e0be86b4 ChangeLog 2405
+RMD160 9e636436e044e314409c097a70d6b7a322cd8b88 ChangeLog 2405
+SHA256 07dec39facff163b76dfdfb293a8a877eeb210ef324d74be82bca26d044f1295 ChangeLog 2405
 MISC metadata.xml 358 RMD160 3c801c757537e0588a43053e99fbe29e90865986 SHA1 7a636d73dec668012408c16cee024a8dfc7144d9 SHA256 0637d557e904994f965e5f4a31789f689c359ea50eb48df3dcce8567975b4d08
 MD5 7b74ebc39d0a3ddfede1e6b4fe37dacc metadata.xml 358
 RMD160 3c801c757537e0588a43053e99fbe29e90865986 metadata.xml 358
 SHA256 0637d557e904994f965e5f4a31789f689c359ea50eb48df3dcce8567975b4d08 metadata.xml 358
-MD5 f1bb46336f8db9bc07b8395bb2827a6f files/digest-daemontools-scripts-1.0.3 274
-RMD160 436c3d583f188011b5b9de598dc66e6d4291fc29 files/digest-daemontools-scripts-1.0.3 274
-SHA256 623f8d2b29a4c3c1240c14936ff41073d24e064d129b680b6a242422a62def5d files/digest-daemontools-scripts-1.0.3 274
 MD5 3272126e793d9517fa9b3339f38a74d7 files/digest-daemontools-scripts-1.0.4 274
 RMD160 f63a7cc546000c79717a623f7828a6f2969ec801 files/digest-daemontools-scripts-1.0.4 274
 SHA256 c91a7bb0561c0b869773d5f5c9078789764361d85db177a95471a527ba697ce9 files/digest-daemontools-scripts-1.0.4 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFFhaSZGSBEIeh4AEYRAjkIAJ9iz7ImXN9JWTFDBLjz/l/ccWB8pQCggxqx
-tsVb9gIuGZGDjZ6x125m/xw=
-=vxSS
+iD8DBQFGCiSMGSBEIeh4AEYRAjfhAJwPk+V9RHMvGhKcsQqP636Vdis3/gCgkEQu
+FvDuC9NYakRprT9OXK1rgNc=
+=L/wI
 -----END PGP SIGNATURE-----
diff --git a/sys-process/daemontools-scripts/daemontools-scripts-1.0.3.ebuild b/sys-process/daemontools-scripts/daemontools-scripts-1.0.3.ebuild
deleted file mode 100644
index e70eece0722e..000000000000
--- a/sys-process/daemontools-scripts/daemontools-scripts-1.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/daemontools-scripts-1.0.3.ebuild,v 1.2 2006/07/31 07:38:16 kaiowas Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="gentoo specific daemontools wrapper scripts"
-HOMEPAGE="http://dev.gentoo.org/~kaiowas/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="static selinux withsamplescripts"
-
-RDEPEND="selinux? ( sys-apps/policycoreutils )"
-DEPEND=""
-
-src_compile() {
-	use static && append-ldflags -static
-
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die
-}
-
-pkg_setup() {
-
-	use withsamplescripts && ( echo "${CONFIG_PROTECT}" | grep '/var/service' >/dev/null || \
-		if [ -d /var/service ]; then
-			ewarn ""
-			ewarn "PLEASE NOTE: You are currently using /var/service for"
-			ewarn "some daemontools services."
-			ewarn "In order to avoid damages to your system, please run"
-			ewarn ""
-			ewarn "echo 'CONFIG_PROTECT=\"/var/service\"' > /etc/env.d/51svcinit"
-			ewarn "env-update"
-			ewarn "source /etc/profile"
-			ewarn ""
-			epause 15
-		fi
-	)
-
-}
-
-src_install() {
-	into /
-	doenvd etc/env.d/50svcinit
-	dosbin sbin/* || die
-	dosbin src/svcinit || die
-
-	# usage() script
-	exeinto /lib/rcscripts/sh
-	doexe lib/rcscripts/sh/* || die
-
-	if use withsamplescripts ; then
-
-		# fill up /var/service/*
-		keepdir /var/service
-
-		cd "${S}"/var/service
-
-		services=`find ./ -type d`
-		for service in ${services}; do
-			dodir /var/service/${item}
-		done
-
-		files=`find ./ -type f`
-		for file in ${files}; do
-			path=`dirname ${file}`
-			exeinto /var/service/${path}
-			doexe ${file}
-		done
-	fi
-}
-
-
diff --git a/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild b/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild
index c71b0a7f7e08..ffb9818a3846 100644
--- a/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild
+++ b/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild,v 1.2 2006/12/17 20:12:02 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/daemontools-scripts-1.0.4.ebuild,v 1.3 2007/03/28 08:16:40 kaiowas Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -49,7 +49,7 @@ src_install() {
 	dosbin src/svcinit || die
 
 	# usage() script
-	exeinto /lib/rcscripts/sh
+	exeinto /$(get_libdir)/rcscripts/sh
 	doexe lib/rcscripts/sh/* || die
 
 	if use withsamplescripts ; then
diff --git a/sys-process/daemontools-scripts/files/digest-daemontools-scripts-1.0.3 b/sys-process/daemontools-scripts/files/digest-daemontools-scripts-1.0.3
deleted file mode 100644
index 8ff7a2996e2a..000000000000
--- a/sys-process/daemontools-scripts/files/digest-daemontools-scripts-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2149adde90b51b834f1a5ebde17f4bc8 daemontools-scripts-1.0.3.tar.bz2 7141
-RMD160 44969d9d34d336001c592ab8a725f686c3229cf8 daemontools-scripts-1.0.3.tar.bz2 7141
-SHA256 00f18fa7d9104ec26bb38abacdcec9a65ac2fa1b8a04ad364c0f203f9cb70806 daemontools-scripts-1.0.3.tar.bz2 7141