diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sys-apps/s6-portable-utils | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'sys-apps/s6-portable-utils')
8 files changed, 69 insertions, 186 deletions
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest index 7b6c54c93c3f..293009fcb71d 100644 --- a/sys-apps/s6-portable-utils/Manifest +++ b/sys-apps/s6-portable-utils/Manifest @@ -1,11 +1,5 @@ -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.2.2.1.tar.gz 47874 BLAKE2B e1a9677c304d256f8a890da9c35716b513971d506e705db847e71355f7e10a49c3b4a3cdec220513964429db2faaecce5dd3c09d94fc71d19fada6f83f7619d9 SHA512 2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed DIST s6-portable-utils-2.2.3.0.tar.gz 49239 BLAKE2B 3be6d6f7b92eea4fb67e3e52ced4409d2bc04c7bb23fea146d778b3739b4682f10dcd2f58cc37a7760368a645d0fa50c887445e6006a563d290c739e72634e9f SHA512 17cb58a49494bba323f031aa07db134505a0884827745ea48e4e93d1ea70b9d4dd141d065b126abb40d5c7625cbb03ba71090e66fd0adb0c54ab49478e929837 -EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3 -EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260 -EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a -EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9 -EBUILD s6-portable-utils-2.2.3.0.ebuild 1017 BLAKE2B 284b5576cf3ac0dff133e3fc70d6c8ec27aad7a820252564f7e8e0a903609e579ade7aa46d794b9710cc11273cbbbe021d9c8d72d453a53de5d17792eb26d7a3 SHA512 9a0a24a5a57eec4271a59bcccdb917ac30175e5191ee5fc2106d161f0446ba4c1dff553e516d3cd0a942658106f52b7bac329d1e9ec7ceb460b49441b009808d -MISC metadata.xml 373 BLAKE2B 9748ed7f48b3e0a32bc04066a0f5e1903ed94576d9cee2c923d885ebd6343132dbdb1d4388362b8735156bf19a3288bbe950f99eb56de2a9b86afe2e253a68e1 SHA512 813abae479b70464886859c667888ab16dbaea41de2008707cc5d6f154f5da371ed5a6437788bec0a65e0bd49006e356fe16af6e57307c4eef6cde89a6b8888a +DIST s6-portable-utils-2.2.3.4.tar.gz 50120 BLAKE2B 17eecbf432b91720ed672e0388665e3dd7302fa2638225d0cdb9ad3c580fa29734ebf5f6e838e1bc4fdcec841ac4414d5b13d78ccb9167f5fad18dc763d8f611 SHA512 1bb9f7bd1c00d12d8434dbabb7061fe589ee9de9f0745399aacf560712bb0c9b4df2dbc221b0c8144c351e9976982c7a7e69dd127517281799d810596d8db5a2 +EBUILD s6-portable-utils-2.2.3.0.ebuild 1128 BLAKE2B 028d23ac9833e15903d5a4bb8bde19423993280bc38c210ff31de80bf885f0aa216a55b2dc047df4ba565d4af5e4b53c08fe8488f6765697b77c8d667b5932eb SHA512 33674630d7611880b44a67cf390037007b8f321c138fe49be1588a3e27d75639d63b804cf60d9c5639b62cff5d5c355f34c75526c5bc614a6c5998985e90a898 +EBUILD s6-portable-utils-2.2.3.4.ebuild 1077 BLAKE2B 1b4a6e6eb72f693e5ec70eb66c0eca3796dfbac05a22d536ca78813af74305a5f8f1aa662eb0056125e92974968640f00ee7331c392483f12169741b6e73e789 SHA512 d18aa6f222636cfffa5b81f5cb0c6bc66ba56901aabc9d3fd646487eff44ebfb4923eae31088b1e22239af923382e12d0a133714b89f7403ba915b463f70a5b8 +MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9 diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml index 3c6c082ed21d..aed39d3983af 100644 --- a/sys-apps/s6-portable-utils/metadata.xml +++ b/sys-apps/s6-portable-utils/metadata.xml @@ -9,4 +9,12 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>arkamar@atlas.cz</email> + <name>Petr Vaněk</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> 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.2.2.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild deleted file mode 100644 index 445d1805af88..000000000000 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 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 ~arm ~x86" -IUSE="static" - -RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )" -DEPEND="${RDEPEND} - static? ( >=dev-libs/skalibs-2.9.1.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.2.3.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild index f7e0efbb5a78..321cb2248504 100644 --- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit 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" @@ -12,9 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="static" -RDEPEND="!static? ( >=dev-libs/skalibs-2.9.3.0:= )" +RDEPEND="!static? ( >=dev-libs/skalibs-2.10.0.0:= )" DEPEND="${RDEPEND} - static? ( >=dev-libs/skalibs-2.9.3.0[static-libs] ) + static? ( >=dev-libs/skalibs-2.10.0.0[static-libs] ) " HTML_DOCS=( doc/. ) @@ -25,9 +27,13 @@ src_prepare() { # 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 + + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die } src_configure() { + tc-export AR CC RANLIB + econf \ --bindir=/bin \ --dynlibdir=/usr/$(get_libdir) \ diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild new file mode 100644 index 000000000000..603e92d975b7 --- /dev/null +++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.3.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit 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" +IUSE="static" + +RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )" +DEPEND="${RDEPEND} + static? ( >=dev-libs/skalibs-2.11.1.0[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)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + $(use_enable static allstatic) + $(use_enable static static-libc) + ) + + econf "${myconf[@]}" +} |