From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E10AB15823F for ; Fri, 17 Nov 2023 11:09:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 995162BC02B; Fri, 17 Nov 2023 11:09:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D2F72BC02B for ; Fri, 17 Nov 2023 11:09:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 936D0335D79 for ; Fri, 17 Nov 2023 11:09:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB255139E for ; Fri, 17 Nov 2023 11:09:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1700219284.5d52e756ae04a116425ebc4fe80eefb5241d0650.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-rc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/s6-rc/Manifest sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild X-VCS-Directories: sys-apps/s6-rc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d52e756ae04a116425ebc4fe80eefb5241d0650 X-VCS-Branch: master Date: Fri, 17 Nov 2023 11:09:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 014e79f5-5e5d-40f0-b137-fcebf3fb42cc X-Archives-Hash: d0c33a251ece6abf866d68c1949204ab commit: 5d52e756ae04a116425ebc4fe80eefb5241d0650 Author: Petr Vaněk atlas cz> AuthorDate: Wed Nov 8 12:07:46 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 17 11:08:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d52e756 sys-apps/s6-rc: add 0.5.4.2 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> sys-apps/s6-rc/Manifest | 1 + sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild | 65 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest index 2dfed362bf6c..a37e5cd863c7 100644 --- a/sys-apps/s6-rc/Manifest +++ b/sys-apps/s6-rc/Manifest @@ -1 +1,2 @@ DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086 +DIST s6-rc-0.5.4.2.tar.gz 100896 BLAKE2B d9e6f580a32d27950c7c525a5b657b429616d1c937c71cee302939b847a58bae1d5e209f53113dc82b953b5aa14c6078b206566e4809902a8f06b17c5621205f SHA512 f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443 diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild new file mode 100644 index 000000000000..7d597db9002f --- /dev/null +++ b/sys-apps/s6-rc/s6-rc-0.5.4.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Service manager for the s6 supervision suite" +HOMEPAGE="https://www.skarnet.org/software/s6-rc/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + dev-lang/execline:= + >=dev-libs/skalibs-2.14.0.0:= + >=sys-apps/s6-2.11.3.0:=[execline] +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition + sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die + + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die +} + +src_configure() { + tc-export AR CC RANLIB + + local myconf=( + --bindir=/bin + --dynlibdir="/$(get_libdir)" + --libdir="/usr/$(get_libdir)/${PN}" + --libexecdir=/lib/s6 + --with-dynlib="/$(get_libdir)" + --with-lib="/usr/$(get_libdir)/execline" + --with-lib="/usr/$(get_libdir)/s6" + --with-lib="/usr/$(get_libdir)/skalibs" + --with-sysdeps="/usr/$(get_libdir)/skalibs" + --enable-shared + --disable-allstatic + --disable-static + --disable-static-libc + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + for ver in ${REPLACING_VERSIONS}; do + if ver_test "${ver}" -lt "0.5.4.0"; then + elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in" + elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and" + elog "restart s6rc-oneshot-runner service because you are upgrading from older" + elog "version." + fi + done +}