gentoo resync : 16.09.2020

5 files changed, 2 insertions, 113 deletions

diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index fe65853df0aa..c10e4582fb8e 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,9 +1,5 @@
-AUX dash-0.5.20.2-gcc-fno-common.patch 1131 BLAKE2B cce4ed8a97d95e294aa7679c0ef164337a836ed9f0b7e18b38a6032545796260eba8c7502817e57bc5948aadb74b9826eb7cb5b02e66cdb954e35a5ed762f460 SHA512 6056f196a353f382b97c6865e89dbc5a63295c404fc9be83551b1458e2a42f93786ec3d0b7dac1b674b40b59e90cd968d6f1e9e0c8ca953704f4de8bb9251cbb
-AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6
-DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
 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.10.2-r1.ebuild 1599 BLAKE2B bd791b7188f16fe8bf627321cc99b9bd165d35c4bd42f6c5c9de0446ba99277ffbe88f6df1cfd6c51518f5f506b9966680159e0bbc7fa46ee34d881368ae1ce9 SHA512 672b9b87555c251c071772a505b77f70190513692002ee974587e6905fc4f100eba3cde7d115f380ceb0d8102fc7e3091354e8693ce466cb48f7d88713ec0d3b
-EBUILD dash-0.5.11.1.ebuild 1522 BLAKE2B f578265951b2f4120b8f1699e2043e440ba6a11cf8d6339135e6c43f37573afb16d30a6d3fec3953f8b1aec9c5bd0114e54d0f6f4d7b494f0c54e745f27510c7 SHA512 8ef211dd5d4d40b56f752cb7b126660bf011ec354a2c64e181a43e866dc7e49a836e0661a2c353e77de464be4cf6a274f33a7ed06ee762ebea0e543435e2dcec
+EBUILD dash-0.5.11.1.ebuild 1521 BLAKE2B 4c5f48602cf369d52316295260aee45ae5a7fcfcc83d4323db37b97dc1c040601a8cd5a52b9bae1c60f4f6f89d8294a56c73344d18a6b09a16db4e2dd7867863 SHA512 dca19866abb5ecee64b869e36a588b9b96a5304753fc8cffe556559b4823549b4816fd6a59d019829a187b4a1c9ea5108b970a503a8cf304a09d081b8c1f3abe
 EBUILD dash-0.5.11.2.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild
deleted file mode 100644
index cb4780554abe..000000000000
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild
+++ /dev/null
@@ -1,56 +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] ) )"
-
-PATCHES=(
-	"${FILESDIR}/dash-0.5.9.1-format-security.patch"
-	"${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch"
-)
-
-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=(
-		--bindir="${EPREFIX}"/bin
-		--enable-fnmatch
-		$(use_with libedit)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild
index 9ec6fecce8e4..740faacabec8 100644
--- a/app-shells/dash/dash-0.5.11.1.ebuild
+++ b/app-shells/dash/dash-0.5.11.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
deleted file mode 100644
index 08d5ed08a398..000000000000
--- a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001
-From: Jeroen Roovers <jer@gentoo.org>
-Date: Mon, 16 Mar 2020 19:25:00 +0100
-Subject: [PATCH] input: Fix compiling against libedit with -fno-common
-To: dash@vger.kernel.org
-
-With -fno-common, which will be enabled by default in GCC 10, we see
-this error:
-
-ld: input.o:(.bss+0x0): multiple definition of `el';
-histedit.o:(.bss+0x8): first defined here
-
-To fix this, simply remove the definition as it is not needed.
-
-Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- src/input.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/input.c b/src/input.c
-index ae0c4c8..e84eca8 100644
---- a/src/input.c
-+++ b/src/input.c
-@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ];	/* buffer for top level input file */
- struct parsefile *parsefile = &basepf;	/* current input file */
- int whichprompt;		/* 1 == PS1, 2 == PS2 */
- 
--#ifndef SMALL
--EditLine *el;			/* cookie for editline package */
--#endif
--
- STATIC void pushfile(void);
- static int preadfd(void);
- static void setinputfd(int fd, int push);
--- 
-2.25.1
-
diff --git a/app-shells/dash/files/dash-0.5.9.1-format-security.patch b/app-shells/dash/files/dash-0.5.9.1-format-security.patch
deleted file mode 100644
index ea2114f392b3..000000000000
--- a/app-shells/dash/files/dash-0.5.9.1-format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1037030#c2
-
---- a/src/jobs.c
-+++ a/src/jobs.c
-@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly)
- 				goto out;
- #endif
- 		}
--		col = fmtstr(s, 32, strsignal(st));
-+		col = fmtstr(s, 32, "%s", strsignal(st));
- #ifdef WCOREDUMP
- 		if (WCOREDUMP(status)) {
- 			col += fmtstr(s + col, 16, " (core dumped)");