gentoo resync : 28.11.2020

5 files changed, 2 insertions, 56 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7f8388216ae4..b73f1c7bfafe 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 977ad53f6f05..c494896b9eeb 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,5 +1,3 @@
-DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
-EBUILD dash-0.5.11.1.ebuild 1521 BLAKE2B 4c5f48602cf369d52316295260aee45ae5a7fcfcc83d4323db37b97dc1c040601a8cd5a52b9bae1c60f4f6f89d8294a56c73344d18a6b09a16db4e2dd7867863 SHA512 dca19866abb5ecee64b869e36a588b9b96a5304753fc8cffe556559b4823549b4816fd6a59d019829a187b4a1c9ea5108b970a503a8cf304a09d081b8c1f3abe
 EBUILD dash-0.5.11.2.ebuild 1573 BLAKE2B 0004a26ef789e1fc2dc84fd2acfa2b844a3c01f82edc4a2c8aaa26607a24636624df62a92d020efc17e7075958e6f8dbe6a66b09784743a2a3aef368aa787803 SHA512 02757904f79a36ef7f76f938533918aee250494d50690e19bd9769f3a4f75c11e4b4b0b80df115e8010df36e49c6570f89c71c5ed3ebfc69cf2f82cec00219b1
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild
deleted file mode 100644
index 740faacabec8..000000000000
--- a/app-shells/dash/dash-0.5.11.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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] ) )"
-
-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() {
-	# don't redefine stat on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export ac_cv_func_stat64=yes
-
-		# if your headers strictly adhere to POSIX, you'll need this too
-		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
-	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/tcsh/Manifest b/app-shells/tcsh/Manifest
index 11b584434410..26e2279cd6f6 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -10,5 +10,5 @@ DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
 EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 2b5ad0097df223dacfd66b9b8c099fe7ef994d76e51fef471683af55806ddc2363afa6956fa0f28f0bf951704b22da223513a3c3fd4ba64ad9d14251b2e976ac SHA512 40396ddd6f0b25df42624d3cf1d9147574f76ac7a9ba43b6a33ad87359f4a55c385713e844f2849d97c895f360357f3186cda02f8a84606aa9fc1896e28c39fd
 EBUILD tcsh-6.21.00-r1.ebuild 2749 BLAKE2B 2cfc425298008d6cae273ad61608c19bd5ee1a31c0fb2a322df27ebd829f323adca1c7ec7076f310fd6d162180f1b6a7aec9161585bc7a9ffdf26db5c99922bd SHA512 63cc36b2b6b5facf87c577facca0e8b2a2dc57345a79da8375217363046fc5a0409e606367f6e3e369fb85ceb93b20d994ca7a659d008c128e37eefdb3743b95
-EBUILD tcsh-6.22.02.ebuild 2868 BLAKE2B 6131385aa936fe96f504d20dba69547f36773408474f108c7897ef7a7baff1b378b0c51a6759687b24199c859f7476db3b24f8dfc4b9d0db7ac29e20e3bd8f3a SHA512 90a072d37910bab1ade9918a9bd8089bc55d5362e0d291c45a7469c49d31e81684192ed77bc59fa65f24ff15d5eeb1f692c7bc61dc709d5778ef33f3e70c6c25
+EBUILD tcsh-6.22.02.ebuild 2867 BLAKE2B c43297b6500f6c28345e622e8eb5952d5395d94a689561e11201e9f9a15c00e7c4cb6e8f34f94cf5804c6a4b0281f7af46fa8f95da1f7a118a21ef93425a0b5f SHA512 6de94b4bff8e605ed4124f7c21ed96b1225919d439b9b9bdb3030a8ca41cdc3d484964852385c37d3b129b7b7d404dcb59102c156ff48b7fcead209e0069bb40
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02.ebuild
index fa187740653e..7b4aaffdc163 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"