fix for bug #153100 reported by Dave

(Portage version: 2.1.1-r2)
 (Signed Manifest commit)

3 files changed, 17 insertions, 94 deletions

diff --git a/sys-process/daemontools-scripts/Manifest b/sys-process/daemontools-scripts/Manifest
index d5b93eb70a48..b4e2725dce13 100644
--- a/sys-process/daemontools-scripts/Manifest
+++ b/sys-process/daemontools-scripts/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST daemontools-scripts-1.0.2.tar.bz2 10256
-DIST daemontools-scripts-1.0.3.tar.bz2 7141 RMD160 44969d9d34d336001c592ab8a725f686c3229cf8 SHA256 00f18fa7d9104ec26bb38abacdcec9a65ac2fa1b8a04ad364c0f203f9cb70806
-EBUILD daemontools-scripts-1.0.2.ebuild 1795 RMD160 80d61b00c9503636e87c70e3cb3bf449feb55902 SHA1 e14af1f5d5171bb9de928a93ed56662d34b04ac5 SHA256 312e580391beaacb3fa814d00c05e948915012ed63103685ac477013f6cc3f6f
-MD5 a3d478fd7d207573465dadefe9bc8c49 daemontools-scripts-1.0.2.ebuild 1795
-RMD160 80d61b00c9503636e87c70e3cb3bf449feb55902 daemontools-scripts-1.0.2.ebuild 1795
-SHA256 312e580391beaacb3fa814d00c05e948915012ed63103685ac477013f6cc3f6f daemontools-scripts-1.0.2.ebuild 1795
+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
-MISC ChangeLog 1941 RMD160 b8b996da0f15d5d40ce06d9a099ad92ff18e76e9 SHA1 06015320684a576f02e24b1d4a15545caeca4f68 SHA256 9220d237dfd7d519a09357ae6fe58fd5801f5250bc48518c5beef5591b960c64
-MD5 a90f86b168666473655edf400b81df3a ChangeLog 1941
-RMD160 b8b996da0f15d5d40ce06d9a099ad92ff18e76e9 ChangeLog 1941
-SHA256 9220d237dfd7d519a09357ae6fe58fd5801f5250bc48518c5beef5591b960c64 ChangeLog 1941
+EBUILD daemontools-scripts-1.0.4.ebuild 1807 RMD160 c9ae72bec877f46522a0a6bf6cb7f6c8265e7716 SHA1 b43723a52af3e6eb89510c99ca000f30e20f3daa SHA256 599fcb888dadd3c285f9d4498c0ce5834cc4294baa7703a04174f6693a6506fd
+MD5 89adad54a744b5ff01ee9d4610669fdf daemontools-scripts-1.0.4.ebuild 1807
+RMD160 c9ae72bec877f46522a0a6bf6cb7f6c8265e7716 daemontools-scripts-1.0.4.ebuild 1807
+SHA256 599fcb888dadd3c285f9d4498c0ce5834cc4294baa7703a04174f6693a6506fd daemontools-scripts-1.0.4.ebuild 1807
+MISC ChangeLog 2143 RMD160 594a4e328eaf3403dcccb8b330823e0f7667bf82 SHA1 572d049459795a6f9233db9ea0819caf2ebb379a SHA256 858242d343f5288f1af0782b99048712b67d5216cfd25434033805155dd32e60
+MD5 65563ee5fde7c72b17a7d0ef8d42f2a6 ChangeLog 2143
+RMD160 594a4e328eaf3403dcccb8b330823e0f7667bf82 ChangeLog 2143
+SHA256 858242d343f5288f1af0782b99048712b67d5216cfd25434033805155dd32e60 ChangeLog 2143
 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 71c7a292909d199a29725e94e98ff148 files/digest-daemontools-scripts-1.0.2 77
-RMD160 bd23f1a96cbd371e5cdb62534e297f94692abdfe files/digest-daemontools-scripts-1.0.2 77
-SHA256 659afd81c1edb1e869236177456ba599114e2c2ff20a10c1ec0ee9e7ba32bc9c files/digest-daemontools-scripts-1.0.2 77
 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.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEzbNwGSBEIeh4AEYRAjF/AKCMi7BcJgkNV2f3huhE5jLT8evl6gCbBNKP
-5uteu3jpao8SWZWASw5g+nE=
-=50Yb
+iD8DBQFFbThZGSBEIeh4AEYRAs8mAJ4rJPwraUiNAJ9FYea+LOmyLTXLZgCfavFN
+a5tWsH1qzOrl+J75E7P0+mM=
+=msOo
 -----END PGP SIGNATURE-----
diff --git a/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild b/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild
deleted file mode 100644
index db6a003c7d6b..000000000000
--- a/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 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.2.ebuild,v 1.4 2005/12/30 07:39:49 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/files/digest-daemontools-scripts-1.0.2 b/sys-process/daemontools-scripts/files/digest-daemontools-scripts-1.0.2
deleted file mode 100644
index 38d639b162e2..000000000000
--- a/sys-process/daemontools-scripts/files/digest-daemontools-scripts-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee40aff24e928cd673338628e2242697 daemontools-scripts-1.0.2.tar.bz2 10256