From 6ad0038f1ede9381fb3f04e483d381ce24dc3e4d Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 24 Feb 2015 23:05:10 +0000 Subject: [PATCH] Fix #541092 thanks to felix.janda@posteo.de and remove old versions Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x30C46538 --- sys-apps/s6/ChangeLog | 6 +++- sys-apps/s6/Manifest | 14 ++++----- sys-apps/s6/s6-1.1.0.ebuild | 56 ----------------------------------- sys-apps/s6/s6-1.1.3.2.ebuild | 56 ----------------------------------- sys-apps/s6/s6-2.1.1.1.ebuild | 7 ++++- 5 files changed, 16 insertions(+), 123 deletions(-) delete mode 100644 sys-apps/s6/s6-1.1.0.ebuild delete mode 100644 sys-apps/s6/s6-1.1.3.2.ebuild 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 -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/Manifest b/sys-apps/s6/Manifest index aa60538fcac9..1f508e9596b5 100644 --- a/sys-apps/s6/Manifest +++ b/sys-apps/s6/Manifest @@ -1,18 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST s6-1.1.0.tar.gz 104852 SHA256 fe466be5855286168b4afeb6b8bbd4b8d86a5bf7bcd0bc2cf6abbe6b5ca8c1d3 SHA512 926a986c6f80349230e516af7ae41aa567ea56829bb04b7c3978ae71f6aaa6d9b07c7687d1687d32e10e27bb3c87301f3d46cfaa0162d092603d5a8f383dbd2e WHIRLPOOL 9d5b79b40b2fe8eb4cda973b3ee4918ebb78156e4b94b659f4af1fc882c081f07e8287ab7b7783a9650bf2b332c77660caf8b8897de0992dec717f0ab19faefb -DIST s6-1.1.3.2.tar.gz 106999 SHA256 77467d5754ea4d409d400d251d984115998b1c8d40632cf53097d6d1466b5d36 SHA512 35b9686885f508c6ff6942d83f5a86238936b05d644fa83b796d5cbf82e47c796501e03442306bad2d509bcb8838d236715d4512171dd117eba8915758a477d1 WHIRLPOOL e8d19003f5049497ca975841566082881865205311af15b6fee19e1f97bda2c15f176f22a99e70c0a84df636acc84ad0c37820397e109a29d554eadfad2b5a2f DIST s6-2.1.1.1.tar.gz 180033 SHA256 857c841cb80935a945347c768981b729f11a6a441140744f58f3e3316b9ef336 SHA512 74b4e925ad43fe2510b06d779327b875834080d77890601600045d4a8269ca26e32b0624674b0416442b11bdd7b8e7b64c391f0f7c0ba871eedecd72976fa57a WHIRLPOOL e293ece949215315acc1882c0066578597f65879cd8b4465c64b64795a50df44acab6376af05750e454bdd9679c07b8a948e2caf2be99160de4afb079140b7b7 -EBUILD s6-1.1.0.ebuild 1540 SHA256 02a22d92727360c5121b13130d6cb8ee37fc2dd0cf0af6eb3982f70ec4775593 SHA512 3c5cff3ea336fefaf88639a3744e326b98407ffdd1f2d361da3650022612f5411f7b2d8ca0a6584f628305b25dd5ce56a52fd26805680236f1d4bc29a40469c9 WHIRLPOOL 2a298cc4c30325e6c87bc36c568bd86fe5ddbcefa0857a750a77b642188af8d7f3ce07047c42739f41edb81999e79970d0f6991bde8030c8be6662cf96136965 -EBUILD s6-1.1.3.2.ebuild 1546 SHA256 dad12301397a674bbe098a783364a76a123f69467945d2424ffb7a042c48ae15 SHA512 3c6d2222b4731ded0d64f1d1241a1d6103f5ab39b938531138b385e0ed6c10dadf6babda80b514e05fd4d3502e4bb606dd8c7eee7b06a425779ed9789e232133 WHIRLPOOL 0b94eaba05ae8f0f5b33ec7d94afcbb686b1c8594079431f4921b43492756d4a45b5ad4179a9cabe7f368b83b3e92fd919924e342ffb6cbadb226ff6ef20a237 -EBUILD s6-2.1.1.1.ebuild 1351 SHA256 adaf7b8e02efe4e87f46fd3b0ea9d8b3fe65d70516775f3319fb620c8d718b95 SHA512 7e018482e9b5e04ff93dae2d34dfd0b4fe7fa47365c29e476c960238b7384fae38e0811bf850b9d270292d38a8967ffd2ed455dd9534c63e8c3bb0fbb45405c8 WHIRLPOOL f8b2993fcf955ffdf747864b24e03e8c483f46e947814591270c07f98008b42ae2587fb095ce70048cb8a38b347d58f443309a7c4487635dae8c6c72be4542b4 -MISC ChangeLog 565 SHA256 4b3dd8b967d03fc84698b1712ff93aff1d5a9402f9eeec60036fb93450be622e SHA512 c918ec13783348839f083a8cba0c628bbda91528a187a8fc0e5bbcaef8d29c5f6aa58d583a559f72f2eeab4c2dcf5e4047ad5d2f71bf79b6191ffc1e815278c7 WHIRLPOOL dfd8521cf19348abfe064a82baf4eddc46bcea1c9fc47758889884a44a524bff59a5c0afaf4666dcaa9fc2424991542174242015dd6db15e7e87d529ef068996 +EBUILD s6-2.1.1.1.ebuild 1392 SHA256 8680147c998e71dd0c7a3f52e2e7d0e44e15c6ef5cd3a252111128cfe1adb438 SHA512 c908976f7d8c5faf9f84de826cd03959fbe1245f2553a42aa13f45cc19b2295e0232d44a0ac92e3edb3fd503d7099c3632ee8c5458441d7163f07fe01ec5e2a5 WHIRLPOOL ad6939924bd03231ef00c975875c8cdf60c9f23f9e61730112041028c734c0866e78f6768e784178c090b2b25783bc5afd0459bd457a1112ad2252166fc92d50 +MISC ChangeLog 746 SHA256 00025075c43713fafa861e67e4f8908b9c561b95f489fa7413a4e4d4a7f62b49 SHA512 6d138e6a2c2a48504ef0029a509a89adf2eef628ba7d08d1a7066e87822386ac00ab2dd73e6c36eb90fb81068dc1bcd2370fb9a2bb8017d6f8dbed78d2bee442 WHIRLPOOL 2fd8dc767abf79a22ba394bc111c0af7da62583b3fee2b53665da5f48a94e6a3165a7f6d15b037a8ebbc0b5263be45e549f396726553b837f86f10a010e1b829 MISC metadata.xml 399 SHA256 3c9abd4c71bd57fbb62ab82ac8841ddbb383a8f9a2033d83e33f31fffce22b06 SHA512 607d5d4638f3bab37b724132a63799efb8283fdf579b87936817738a77b4c56ecf5ef28e1d7b45689b31aa884fa8428722d0cb4cd95a2105a717182c68642100 WHIRLPOOL a27682d494ae99ab6acaa3a211386d5288301b1cb64e53cf24d9737cf3c513a497b424afecd64578012707ae6089518bc2314c44e6b726c992982ff99fecf15e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlToD3sACgkQblQW9DDEZThp9QCdFhbKnQFaXFF8KE8SfI5RXqxa -3osAniAkoDRYFp1i548XNXb2iQaezfrl -=023+ +iEYEAREIAAYFAlTtA6UACgkQblQW9DDEZTgkEQCfa5+HWrOG1FMBxH1yHUidAcVH +bIgAmgOB0ap6tNaZgkA7JV9gARsnCFrb +=+6Ko -----END PGP SIGNATURE----- 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 -- 2.26.2