commit: 46bf1af778977e7c57fd6b7046c325f9e77463fa Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Sun Apr 2 22:02:22 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Apr 15 12:15:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bf1af7
sys-apps/s6-rc: drop 0.5.3.3, 0.5.4.0 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/30450 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-apps/s6-rc/Manifest | 2 -- sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild | 63 ----------------------------------- sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild | 65 ------------------------------------- 3 files changed, 130 deletions(-) diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest index b9ccdc89bb41..971a8e7a1c22 100644 --- a/sys-apps/s6-rc/Manifest +++ b/sys-apps/s6-rc/Manifest @@ -1,4 +1,2 @@ DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051 -DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e SHA512 9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b -DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4 SHA512 04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70 DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086 diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild deleted file mode 100644 index a64dada495c4..000000000000 --- a/sys-apps/s6-rc/s6-rc-0.5.3.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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:= - >=sys-apps/s6-2.11.2.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=/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 - --disable-allstatic - --disable-static - --disable-static-libc - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - for ver in ${REPLACING_VERSIONS}; do - if ver_test "${ver}" -ge "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 downgrading from newer" - elog "version." - fi - done -} diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild deleted file mode 100644 index 9e9118dc6ea2..000000000000 --- a/sys-apps/s6-rc/s6-rc-0.5.4.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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:= - >=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 -}
