drop daemontools from DEPEND #110618

Package-Manager: portage-2.0.53_rc6

diff --git a/sys-process/daemontools-scripts/Manifest b/sys-process/daemontools-scripts/Manifest
index 00676fd842d14102cbea91681d6e6511ecbb357b..8998e3add66c0faa0661b15e8652e0fdb3e4be45 100644 (file)
--- a/sys-process/daemontools-scripts/Manifest
+++ b/sys-process/daemontools-scripts/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 b2809bb2b5552f6916013d03089c834a ChangeLog 1488
-MD5 7b74ebc39d0a3ddfede1e6b4fe37dacc metadata.xml 358
-MD5 82f1beb90fb3d85352637bd9d73a27a0 daemontools-scripts-1.0.2.ebuild 1859
+MD5 19c221e1cf6263efb4680e9846053d1c daemontools-scripts-1.0.2.ebuild 1858
 MD5 71c7a292909d199a29725e94e98ff148 files/digest-daemontools-scripts-1.0.2 77
+MD5 7b74ebc39d0a3ddfede1e6b4fe37dacc metadata.xml 358
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDCt7IGSBEIeh4AEYRAnFsAJ9cQNtfbkaGBJ4V7sJh50rMl4R7uQCfZhq/
-1n1PxDbSupG3qMUTq5smi+8=
-=2qck
+iD8DBQFDYYM1gIKl8Uu19MoRAoObAJ4+aoF+MSjwUHL63Ou0dsXQ9RJREgCcC0pV
+ICludxN32knZH/iljba93Dc=
+=vJyU
 -----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
index 349a33bbc7cfe4b7bf5f02f0254d085d56803558..592e02bd5e66461e5ebec6c257a4d0cd2d92dcf7 100644 (file)
--- a/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild
+++ b/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2005/08/23 07:13:01 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-scripts/daemontools-scripts-1.0.2.ebuild,v 1.3 2005/10/28 01:47:19 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="gentoo specific daemontools wrapper scripts"
 HOMEPAGE="http://dev.gentoo.org/~kaiowas/"
@@ -13,14 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="static selinux withsamplescripts"
 
-RDEPEND="selinux? ( sys-apps/policycoreutils )
-               sys-process/daemontools"
+RDEPEND="selinux? ( sys-apps/policycoreutils )"
 DEPEND=""
 
 src_compile() {
        use static && append-ldflags -static
 
-       make -C ${S}/src CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
+       make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
                CFLAGS="${CFLAGS}" || die
 }
 
@@ -44,25 +43,24 @@ pkg_setup() {
 }
 
 src_install() {
-
        into /
-       doenvd ${S}/etc/env.d/50svcinit
-       dosbin ${S}/sbin/*
-       dosbin ${S}/src/svcinit
+       doenvd etc/env.d/50svcinit
+       dosbin sbin/* || die
+       dosbin src/svcinit || die
 
        # usage() script
        exeinto /lib/rcscripts/sh
-       doexe ${S}/lib/rcscripts/sh/*
+       doexe lib/rcscripts/sh/* || die
 
        # this directory is targeted by daemontools
        keepdir /service
 
-       use withsamplescripts && (
+       if use withsamplescripts ; then
 
                # fill up /var/service/*
                keepdir /var/service
 
-               cd ${S}/var/service
+               cd "${S}"/var/service
 
                services=`find ./ -type d`
                for service in ${services}; do
@@ -75,7 +73,7 @@ src_install() {
                        exeinto /var/service/${path}
                        doexe ${file}
                done
-       )
+       fi
 }