From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- app-shells/Manifest.gz | Bin 8629 -> 8629 bytes app-shells/dash/Manifest | 4 +-- app-shells/dash/dash-0.5.11.4.ebuild | 61 ---------------------------------- app-shells/dash/dash-0.5.11.5.ebuild | 61 ++++++++++++++++++++++++++++++++++ app-shells/ksh/Manifest | 4 +-- app-shells/ksh/ksh-2020.0.0-r1.ebuild | 4 +-- app-shells/ksh/ksh-9999.ebuild | 4 +-- 7 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 app-shells/dash/dash-0.5.11.4.ebuild create mode 100644 app-shells/dash/dash-0.5.11.5.ebuild (limited to 'app-shells') diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index 81fefdbdb2a4..58ebfa205c76 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 2517982bb010..34550de82d50 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,6 +1,6 @@ AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 -DIST dash-0.5.11.4.tar.gz 240652 BLAKE2B 67c8c148448b8d95d09e5229953a88d52338d71c8e647977b92c12c56f19ffc62f24c775409231409bde9f7e5cf05f97f131a4967dd93fbdc16f539846467e61 SHA512 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160 +DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf EBUILD dash-0.5.11.3-r1.ebuild 1802 BLAKE2B b4ed4b396ad07bc350e2eb78db47167051ac38a305b8c80fdfa3ba12677498c83840dd7d5b453e5c14a59f9666e463f3a2a89c716704ca684b3371e3fc09cbc1 SHA512 6062ceecdef0bd6b9042d36b2e77958477a499bf563eeb5e0cfdfc1dc0944d9f5e946bb2ff6d54c1a0d63a3f3081cdcfd4958dcbd8d129b858478d19af5f2847 -EBUILD dash-0.5.11.4.ebuild 1809 BLAKE2B 0d871ef3b3f8b2dcb92d046c88ae1fa7701b57be1ac572bb6d9a73ca47b35d1bd6dc761809cc4085b8fe714ae6b6bb44acdf09dc9f1c60e6dbaa28e3c78a47d5 SHA512 cb09c1f7a30caa3ac947c849e8edb33de5f05b190a72e3f9b776f5d82e4025562bcf1d5920be1f95771e8338577d905cf36c50bb863176e927fb7dc6151d05fc +EBUILD dash-0.5.11.5.ebuild 1809 BLAKE2B 0d871ef3b3f8b2dcb92d046c88ae1fa7701b57be1ac572bb6d9a73ca47b35d1bd6dc761809cc4085b8fe714ae6b6bb44acdf09dc9f1c60e6dbaa28e3c78a47d5 SHA512 cb09c1f7a30caa3ac947c849e8edb33de5f05b190a72e3f9b776f5d82e4025562bcf1d5920be1f95771e8338577d905cf36c50bb863176e927fb7dc6151d05fc MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd diff --git a/app-shells/dash/dash-0.5.11.4.ebuild b/app-shells/dash/dash-0.5.11.4.ebuild deleted file mode 100644 index 1c194ba16619..000000000000 --- a/app-shells/dash/dash-0.5.11.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Debian Almquist Shell" -HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" -SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libedit static" - -BDEPEND="virtual/pkgconfig" -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -PATCHES=( - "${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267 -) - -src_prepare() { - default - - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - - # Use pkg-config for libedit linkage - sed -i \ - -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ - configure || die -} - -src_configure() { - if [[ ${CHOST} == *-solaris* ]] ; then - # don't redefine stat, open, dirent, etc. on Solaris - export ac_cv_func_stat64=yes - export ac_cv_func_open64=yes - - # if your headers strictly adhere to POSIX, you'll need this too - [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255 - fi - if [[ ${CHOST} == powerpc-*-darwin* ]] ; then - sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \ - src/jobs.c || die - fi - append-cppflags -DJOBS=$(usex libedit 1 0) - use static && append-ldflags -static - # Do not pass --enable-glob due to #443552. - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}"/bin - --enable-fnmatch - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -} diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild new file mode 100644 index 000000000000..1c194ba16619 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Debian Almquist Shell" +HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" +SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="libedit static" + +BDEPEND="virtual/pkgconfig" +RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" +DEPEND="${RDEPEND} + libedit? ( static? ( dev-libs/libedit[static-libs] ) )" + +PATCHES=( + "${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267 +) + +src_prepare() { + default + + # Fix the invalid sort + sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins + + # Use pkg-config for libedit linkage + sed -i \ + -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ + configure || die +} + +src_configure() { + if [[ ${CHOST} == *-solaris* ]] ; then + # don't redefine stat, open, dirent, etc. on Solaris + export ac_cv_func_stat64=yes + export ac_cv_func_open64=yes + + # if your headers strictly adhere to POSIX, you'll need this too + [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255 + fi + if [[ ${CHOST} == powerpc-*-darwin* ]] ; then + sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \ + src/jobs.c || die + fi + append-cppflags -DJOBS=$(usex libedit 1 0) + use static && append-ldflags -static + # Do not pass --enable-glob due to #443552. + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}"/bin + --enable-fnmatch + $(use_with libedit) + ) + econf "${myeconfargs[@]}" +} diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index aca866be285c..9d2434bb69d6 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -2,6 +2,6 @@ AUX CVE-2019-14868.patch 3746 BLAKE2B 0be6843120195f876631e92205430f8a389d23c6c9 AUX ksh-2020.0.0-ensure-user-set.patch 1017 BLAKE2B 8a0d9fd9fd8940969741214f6ba9251ae1b404bae80385d79428ab7231a5809bafcaa5033084af0582872171666e89b590b7c2cfba1ded740da49c77b1751888 SHA512 bea76ef4350d2813395bbfaa682b97a34548292efe9986a1d63dde2476bbfbfd21dc9b10ccb7ac3bcf33e9aeb3c0eebdcffb22a3b6472302597473ac994b2493 AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc068f8ec3e46b6f4c6d82e1043629368bfcabd1a5d360bae702777e5b01914ac70c9edbdce5ee0bba7e9f69916a3c38b1820 SHA512 e4314599821b3f654b4c87900aa696930953a96b984f43ca00fd17aa91b968ed8f277944c6736ebddae4ee7086e9806f84e3432b24450565d1c679bdbb39e01a DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792 -EBUILD ksh-2020.0.0-r1.ebuild 1123 BLAKE2B a1ca7574835877a1354c39ccb6c65c4ae4aba7f7bfdd3c198b641f97174841a46bd6a3dc931808418ff0fa2a93e16d2a9fc11774f1b7d4c24b7f3899a2d6c4ff SHA512 1dc0af0d3469c8a9d106880d7b8e21c6bc48e6629965de6e53880bdca308e63f93bf610775592795c5d5caa844a9083fe8f4ba5fadb03ecb93bb3fb3095a6e0c -EBUILD ksh-9999.ebuild 976 BLAKE2B 4807cd3805a2f7f05a726019c707c6fe0106b636f0d221f31dd08b62b249df4815cb4bf6c5b0309863e2916a919c53aabcbe4c8efe3e8218655f2078cbb03361 SHA512 09f6498596ea5cf1c9a49eec1d8572a30b27649b0aa3a1eda99eaff959279627db59fd3a694a5929e8075dc2e641bfa65442a1a4819b9f1af5ca174d91bb5fb5 +EBUILD ksh-2020.0.0-r1.ebuild 1135 BLAKE2B 771f0f2bd6341ebeb69cfd5e3f1e478baf4c096e8e6898240af19a53881309f1ed12c5cd6fa3ff1faa33a3a128396d73258dc9541f99132b486c65c714a8168f SHA512 99a023e50d8156036258e971d8f62735ffe3b44b6ee3d967b5900070aacd75e8a3255cce84264e4e0ac8e9404959b5f246a0334f1d19abbf705303e0da88e57c +EBUILD ksh-9999.ebuild 988 BLAKE2B c3c9b71902c48c5806614626ddec8150ffa733185a4852f0c517d17bac6447f13c8038611361114dd8e4ef682be1450ce886ffb9fa95ea4af63433711b84b5d1 SHA512 dd73989e93af9753e1c377cf36f05832467633a57c635f465647ee7298bdee37e66f7569920de539e1487f1e94e05bac4f41a1e034ef2df055a974c4285bfe78 MISC metadata.xml 1292 BLAKE2B 4815be9e58a765c46e6561b0e92cef0fddc8b29c368a1a10f3a320e59bcbd41e3b26a9274d0f41a4ffd3df9a8a8642eacc8fee940c6311728dd5af1a14390e91 SHA512 a8c28e9efc5f866c2fe9caea2f023e4644733a956407f3197b9d16e4883feffb26caa320904950fe9ab1d016081cf523b9b5157717164a48689a698d6d80d85d diff --git a/app-shells/ksh/ksh-2020.0.0-r1.ebuild b/app-shells/ksh/ksh-2020.0.0-r1.ebuild index 3c4891ea637e..5eb45fad5785 100644 --- a/app-shells/ksh/ksh-2020.0.0-r1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +inherit meson ninja-utils if [[ ${PV} == 9999 ]]; then inherit git-r3 diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild index 9e136daa8efa..e5b08b6bef9c 100644 --- a/app-shells/ksh/ksh-9999.ebuild +++ b/app-shells/ksh/ksh-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +inherit meson ninja-utils if [[ ${PV} == 9999 ]]; then inherit git-r3 -- cgit v1.2.3