From e9ef08fd5ccee49884d937231e7a382930363978 Mon Sep 17 00:00:00 2001 From: Petr Vaněk Date: Fri, 24 Jun 2022 10:29:41 +0200 Subject: */s6-*: revbump due to a static-libs removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Vaněk Closes: https://github.com/gentoo/gentoo/pull/25925 Signed-off-by: Sam James --- .../s6-networking/s6-networking-2.5.1.0-r1.ebuild | 63 ++++++++++++++++++ .../s6-networking/s6-networking-2.5.1.0.ebuild | 63 ------------------ .../s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild | 74 ++++++++++++++++++++++ .../s6-linux-init/s6-linux-init-1.0.7.3.ebuild | 74 ---------------------- sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild | 61 ++++++++++++++++++ sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild | 61 ------------------ sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild | 61 ++++++++++++++++++ sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild | 61 ------------------ sys-apps/s6/s6-2.11.1.0-r1.ebuild | 54 ++++++++++++++++ sys-apps/s6/s6-2.11.1.0.ebuild | 54 ---------------- 10 files changed, 313 insertions(+), 313 deletions(-) create mode 100644 net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild delete mode 100644 net-misc/s6-networking/s6-networking-2.5.1.0.ebuild create mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild delete mode 100644 sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild create mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild delete mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild create mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild delete mode 100644 sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild create mode 100644 sys-apps/s6/s6-2.11.1.0-r1.ebuild delete mode 100644 sys-apps/s6/s6-2.11.1.0.ebuild diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild new file mode 100644 index 000000000000..47977f15efc7 --- /dev/null +++ b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Suite of small networking utilities for Unix systems" +HOMEPAGE="https://www.skarnet.org/software/s6-networking/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="ssl static static-libs" + +REQUIRED_USE="static? ( static-libs ) + ssl? ( !static !static-libs )" + +RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?] + =dev-libs/skalibs-2.11*:=[static-libs?] + >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] + ssl? ( dev-libs/libretls ) + !static? ( + >=net-dns/s6-dns-2.3.5.2:= + ) +" +DEPEND="${RDEPEND} + >=net-dns/s6-dns-2.3.5.2[static-libs(-)?] +" + +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=/usr/$(get_libdir) + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(get_libdir) + --with-lib=/usr/$(get_libdir)/s6 + --with-lib=/usr/$(get_libdir)/s6-dns + --with-lib=/usr/$(get_libdir)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + --enable-shared + $(use_enable ssl ssl libtls) + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild deleted file mode 100644 index 47977f15efc7..000000000000 --- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="ssl static static-libs" - -REQUIRED_USE="static? ( static-libs ) - ssl? ( !static !static-libs )" - -RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?] - =dev-libs/skalibs-2.11*:=[static-libs?] - >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] - ssl? ( dev-libs/libretls ) - !static? ( - >=net-dns/s6-dns-2.3.5.2:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.5.2[static-libs(-)?] -" - -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=/usr/$(get_libdir) - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(get_libdir) - --with-lib=/usr/$(get_libdir)/s6 - --with-lib=/usr/$(get_libdir)/s6-dns - --with-lib=/usr/$(get_libdir)/skalibs - --with-sysdeps=/usr/$(get_libdir)/skalibs - --enable-shared - $(use_enable ssl ssl libtls) - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild new file mode 100644 index 000000000000..415a46d9f524 --- /dev/null +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Generates an init binary for s6-based init systems" +HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 ~arm x86" +IUSE="static static-libs +sysv-utils" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?] + >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] + >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] + sysv-utils? ( + !sys-apps/systemd[sysv-utils] + !sys-apps/sysvinit + ) +" +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=/usr/$(get_libdir) + --skeldir=/etc/s6-linux-init/skel + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(get_libdir) + --with-lib=/usr/$(get_libdir)/s6 + --with-lib=/usr/$(get_libdir)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + --enable-shared + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + if use sysv-utils ; then + "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die + into / + dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit} + fi +} + +pkg_postinst() { + einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html" + einfo "for usage instructions." +} diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild deleted file mode 100644 index 415a46d9f524..000000000000 --- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Generates an init binary for s6-based init systems" -HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm x86" -IUSE="static static-libs +sysv-utils" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?] - >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] - >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] - sysv-utils? ( - !sys-apps/systemd[sysv-utils] - !sys-apps/sysvinit - ) -" -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=/usr/$(get_libdir) - --skeldir=/etc/s6-linux-init/skel - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(get_libdir) - --with-lib=/usr/$(get_libdir)/s6 - --with-lib=/usr/$(get_libdir)/skalibs - --with-sysdeps=/usr/$(get_libdir)/skalibs - --enable-shared - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - if use sysv-utils ; then - "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die - into / - dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit} - fi -} - -pkg_postinst() { - einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html" - einfo "for usage instructions." -} diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild new file mode 100644 index 000000000000..4c6c8d4c1bca --- /dev/null +++ b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 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" +IUSE="static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] + >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] + >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] +" +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=/usr/$(get_libdir) + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(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 + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" + ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html" + ewarn "and the documentation for the s6-rc-format-upgrade utility." +} diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild deleted file mode 100644 index 4c6c8d4c1bca..000000000000 --- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 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" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] - >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] - >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] -" -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=/usr/$(get_libdir) - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(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 - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" - ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html" - ewarn "and the documentation for the s6-rc-format-upgrade utility." -} diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild new file mode 100644 index 000000000000..4c6c8d4c1bca --- /dev/null +++ b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 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" +IUSE="static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] + >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] + >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] +" +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=/usr/$(get_libdir) + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(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 + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" + ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html" + ewarn "and the documentation for the s6-rc-format-upgrade utility." +} diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild deleted file mode 100644 index 4c6c8d4c1bca..000000000000 --- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 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" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?] - >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] - >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?] -" -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=/usr/$(get_libdir) - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(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 - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!" - ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html" - ewarn "and the documentation for the s6-rc-format-upgrade utility." -} diff --git a/sys-apps/s6/s6-2.11.1.0-r1.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild new file mode 100644 index 000000000000..65697c3d13b7 --- /dev/null +++ b/sys-apps/s6/s6-2.11.1.0-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="skarnet.org's small and secure supervision software suite" +HOMEPAGE="https://www.skarnet.org/software/s6/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 ~arm x86" +IUSE="+execline static static-libs" + +REQUIRED_USE="static? ( static-libs )" + +RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) + >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] +" +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=/usr/$(get_libdir) + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(get_libdir) + --with-lib=/usr/$(get_libdir)/execline + --with-lib=/usr/$(get_libdir)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + $(usex execline '' '--disable-execline' ) + --enable-shared + $(use_enable static allstatic) + $(use_enable static static-libc) + $(use_enable static-libs static) + ) + + econf "${myconf[@]}" +} diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0.ebuild deleted file mode 100644 index 65697c3d13b7..000000000000 --- a/sys-apps/s6/s6-2.11.1.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="skarnet.org's small and secure supervision software suite" -HOMEPAGE="https://www.skarnet.org/software/s6/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm x86" -IUSE="+execline static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) - >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] -" -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=/usr/$(get_libdir) - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(get_libdir) - --with-lib=/usr/$(get_libdir)/execline - --with-lib=/usr/$(get_libdir)/skalibs - --with-sysdeps=/usr/$(get_libdir)/skalibs - $(usex execline '' '--disable-execline' ) - --enable-shared - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) - ) - - econf "${myconf[@]}" -} -- cgit v1.2.3-65-gdbad