diff options
Diffstat (limited to 'sys-apps/s6-portable-utils')
6 files changed, 56 insertions, 141 deletions
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest index f743de7c77c0..5c74fce4b105 100644 --- a/sys-apps/s6-portable-utils/Manifest +++ b/sys-apps/s6-portable-utils/Manifest @@ -1,3 +1 @@ -DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657 -DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4 -DIST s6-portable-utils-2.2.1.3.tar.gz 47619 BLAKE2B fc9c7a77f42bb64bdd1cd1cfd23d9e0aa0a208451d28d7b76b67a91aa93eebc75148604877af16f102b27581d81549c1fd6e9bf8ff6f62ad3bb9e344191c3886 SHA512 6640027e65a19417461e1e9c778d276d6ceb3f95ea5c720dd21b0d1755bb8f1a218cd9f42effd6ab6034889cc415ab935b4583b6696c2a96351417d9a8f4d7b0 +DIST s6-portable-utils-2.3.0.3.tar.gz 51186 BLAKE2B 9a0b9f33a89cca730afc8190ab7be7fc25ed286970b430d33d8eb91d5b6e5ac4261e659674ec44c5e5a88b32a324cb62ee63837923f0a7481675c8eaa3e8804c SHA512 f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml index 34f39bd4b285..fe8d13599aec 100644 --- a/sys-apps/s6-portable-utils/metadata.xml +++ b/sys-apps/s6-portable-utils/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>aranea@aixah.de</email> - <name>Luis Ressel</name> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>samuel@sholland.org</email> <name>Samuel Holland</name> </maintainer> @@ -13,7 +13,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.1.ebuild deleted file mode 100644 index d303c8bb16a9..000000000000 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="set of tiny portable unix utilities" -HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-libs/skalibs-2.6.0.0[static-libs] - ) - !static? ( - >=dev-libs/skalibs-2.6.0.0 - ) -" -RDEPEND=" - !static? ( - >=dev-libs/skalibs-2.6.0.0:= - ) -" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) -} diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild deleted file mode 100644 index d10b94ff05bd..000000000000 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="set of tiny portable unix utilities" -HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static" - -DEPEND="static? ( >=dev-libs/skalibs-2.7.0.0[static-libs] ) - !static? ( >=dev-libs/skalibs-2.7.0.0 ) -" -RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) -} diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.3.ebuild deleted file mode 100644 index f88473544beb..000000000000 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.1.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Set of tiny portable unix utilities" -HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static" - -RDEPEND="!static? ( >=dev-libs/skalibs-2.8.0.0:= )" -DEPEND="${RDEPEND} - static? ( >=dev-libs/skalibs-2.8.0.0[static-libs] ) -" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ - configure || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) -} diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild new file mode 100644 index 000000000000..f212f9178741 --- /dev/null +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs + +DESCRIPTION="Set of tiny portable unix utilities" +HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 arm x86" + +RDEPEND=">=dev-libs/skalibs-2.14.0.0:=" +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}" + --with-dynlib="/$(get_libdir)" + --with-lib="/usr/$(get_libdir)/skalibs" + --with-sysdeps="/usr/$(get_libdir)/skalibs" + --disable-allstatic + --disable-static + --disable-static-libc + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + optfeature "man pages" app-doc/s6-portable-utils-man-pages +} |