Fix #541092 thanks to felix.janda@posteo.de and remove old versions

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)

4 files changed, 11 insertions, 114 deletions

diff --git a/sys-apps/s6/ChangeLog b/sys-apps/s6/ChangeLog
index 7c9cc7e3e7ac..ff2d8770200d 100644
--- a/sys-apps/s6/ChangeLog
+++ b/sys-apps/s6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/s6
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/ChangeLog,v 1.3 2015/02/21 04:54:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/ChangeLog,v 1.4 2015/02/24 23:05:08 williamh Exp $
+
+  24 Feb 2015; William Hubbs <williamh@gentoo.org> -s6-1.1.0.ebuild,
+  -s6-1.1.3.2.ebuild, s6-2.1.1.1.ebuild:
+  Fix #541092 thanks to felix.janda@posteo.de and remove old versions
 
 *s6-2.1.1.1 (21 Feb 2015)
 
diff --git a/sys-apps/s6/s6-1.1.0.ebuild b/sys-apps/s6/s6-1.1.0.ebuild
deleted file mode 100644
index 47a8a7b072f7..000000000000
--- a/sys-apps/s6/s6-1.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/s6-1.1.0.ebuild,v 1.1 2013/10/02 23:09:29 williamh Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/skalibs-1.4.0
-	>=dev-lang/execline-1.2.2"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/admin/${P}
-
-src_configure()
-{
-	echo $(tc-getCC) ${CFLAGS} > conf-compile/conf-cc
-	echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-dynld
-	echo /usr/$(get_libdir)/s6 > conf-compile/conf-install-library
-	echo /$(get_libdir) > conf-compile/conf-install-library.so
-	echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-ld
-	echo > conf-compile/conf-stripbins
-	echo > conf-compile/conf-striplibs
-	rm conf-compile/flag-slashpackage
-	echo /usr/lib/skalibs/sysdeps > conf-compile/import
-	echo /usr/include/skalibs > conf-compile/path-include
-	echo /usr/include >> conf-compile/path-include
-	echo /usr/$(get_libdir)/skalibs > conf-compile/path-library
-	echo /usr/$(get_libdir) >> conf-compile/path-library
-	echo /$(get_libdir)/skalibs > conf-compile/path-library.so
-	echo /$(get_libdir) >> conf-compile/path-library.so
-}
-
-src_compile()
-{
-	emake -j1
-}
-
-src_install()
-{
-	into /
-	dobin command/*
-
-	dodoc -r examples
-	dohtml -r doc/*
-}
diff --git a/sys-apps/s6/s6-1.1.3.2.ebuild b/sys-apps/s6/s6-1.1.3.2.ebuild
deleted file mode 100644
index 7b030740432a..000000000000
--- a/sys-apps/s6/s6-1.1.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/s6-1.1.3.2.ebuild,v 1.1 2014/11/04 04:58:35 williamh Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="skarnet.org's small and secure supervision software suite"
-HOMEPAGE="http://www.skarnet.org/software/s6/"
-SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/execline-1.3.1.1
-	>=dev-libs/skalibs-1.6.0.0"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/admin/${P}
-
-src_configure()
-{
-	echo $(tc-getCC) ${CFLAGS} > conf-compile/conf-cc
-	echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-dynld
-	echo /usr/$(get_libdir)/s6 > conf-compile/conf-install-library
-	echo /$(get_libdir) > conf-compile/conf-install-library.so
-	echo $(tc-getCC) ${LDFLAGS} > conf-compile/conf-ld
-	echo > conf-compile/conf-stripbins
-	echo > conf-compile/conf-striplibs
-	rm conf-compile/flag-slashpackage
-	echo /usr/lib/skalibs/sysdeps > conf-compile/import
-	echo /usr/include/skalibs > conf-compile/path-include
-	echo /usr/include >> conf-compile/path-include
-	echo /usr/$(get_libdir)/skalibs > conf-compile/path-library
-	echo /usr/$(get_libdir) >> conf-compile/path-library
-	echo /$(get_libdir)/skalibs > conf-compile/path-library.so
-	echo /$(get_libdir) >> conf-compile/path-library.so
-}
-
-src_compile()
-{
-	emake -j1
-}
-
-src_install()
-{
-	into /
-	dobin command/*
-
-	dodoc -r examples
-	dohtml -r doc/*
-}
diff --git a/sys-apps/s6/s6-2.1.1.1.ebuild b/sys-apps/s6/s6-2.1.1.1.ebuild
index 629e7774b9ff..0f25bcb6418c 100644
--- a/sys-apps/s6/s6-2.1.1.1.ebuild
+++ b/sys-apps/s6/s6-2.1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/s6-2.1.1.1.ebuild,v 1.1 2015/02/21 04:54:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s6/s6-2.1.1.1.ebuild,v 1.2 2015/02/24 23:05:08 williamh Exp $
 
 EAPI=5
 
@@ -54,6 +54,11 @@ src_configure()
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
 }
 
+src_compile()
+{
+	emake DESTDIR="${D}"
+}
+
 src_install()
 {
 	default