gentoo resync : 17.02.2020

3 files changed, 2 insertions, 71 deletions

diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index f1a8d3e290c8..8f70ad508bd4 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -5,6 +5,5 @@ AUX tclreadline-2.1.0-rl-history-expand.patch 969 BLAKE2B 44b2aaf9f5ea2f518888b3
 AUX tclreadline-2.1.0-rl-prompt.patch 463 BLAKE2B c9faea41e07303d94ec6eb08f4098fd9ca483f47509a1e9a6a791649738cc6b31b2266783b84434b25072f100bc88d1a87c0a765245be305d56fbbdd33aef2b9 SHA512 b547e2077861d39701ed53b485f9758c8e0a636ecba7abfc25aa3fabeaa1337c6e48a08ba51425b95a55bae4021c2aa17e66686ee3836eb31cb6b4d115508073
 DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b9322a13175ca7c713c3981c0abc27967e31a62f3451b5d007569a30a7279be7c2a8f1c7c78e8d0c310964ddba18fa5cb SHA512 bd67a65fe2ec708834fb67fabf2e36e778a6aeeb7a7b69cda298f9e18acc9e03f3a379f81ff7d2d289bfbf1093bc86fecbf96fe5d04a2ca954899cc7df6fe4bf
 DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
-EBUILD tclreadline-2.1.0-r4.ebuild 1849 BLAKE2B 2d29bf48ee0a8397098d58adbbd2bb324d64335d072aa554479a3cebc28a10b05d4fec4f6434fa6fe20126f60b7b16882f908189ef2eeefce52989966c9f64fa SHA512 d7ae3c2baabaa532529df09b5a05b02d0a9ff551ea0a45d35c2680c65deee236b300a17a1aa8a42b381409ecc3f32d9db85dfa42540267e1d03dd9fa668e97c2
-EBUILD tclreadline-2.1.0-r5.ebuild 1852 BLAKE2B 93d16218228f1b3aa8af5d851b69e3ad346f638031ede94e8732f5b9c50484f406088213e721c12d070d9278e4d4758722b983bbce1234b5693de186a564dbbf SHA512 d186cfa81886c23d28c18862141f2d8f73016fd5aaef6cfed95c6b587d193c4b74c1894be558c3f0d3390bfdb3cdf4bbd0870dd910e1194457cf363127c0a0bd
+EBUILD tclreadline-2.1.0-r5.ebuild 1849 BLAKE2B b7fa4bf1db26f914acd559e6b30cfd8515f379d48dcc67b13f8be2e9a1ca8452fd802c59d5a31c34eb2e533c4996cb804fa75133cc309e87583dc3309e355199 SHA512 e07faa38e34fdab0c78673b3a824ae5f8fc9734e7477ae2a19aba437d0a90e1af0a8057a2d58f8dd7af6538ed6181336830402a0e3551c72046100b3fdbc1db6
 MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
deleted file mode 100644
index 6a7df2dded56..000000000000
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib toolchain-funcs
-
-DEBIAN_PATCH=12
-
-DESCRIPTION="Readline extension to TCL"
-HOMEPAGE="http://tclreadline.sf.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
-	dev-lang/tcl:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gold.patch
-	"${FILESDIR}"/${P}-alloc-free.patch
-	"${FILESDIR}"/${P}-rl-executing-macro.patch
-	"${FILESDIR}"/${P}-rl-history-expand.patch
-	"${FILESDIR}"/${P}-rl-prompt.patch
-	"${WORKDIR}"/debian/patches/complete_nontcl.patch
-	"${WORKDIR}"/debian/patches/completion_matches.patch
-	"${WORKDIR}"/debian/patches/completion_pbug.patch
-	"${WORKDIR}"/debian/patches/kfreebsd.patch
-	"${WORKDIR}"/debian/patches/link.patch
-	"${WORKDIR}"/debian/patches/manpage.patch
-	"${WORKDIR}"/debian/patches/memuse.patch
-#	"${WORKDIR}"/debian/patches/tclrldir.patch
-	"${WORKDIR}"/debian/patches/tclshpath.patch
-	"${WORKDIR}"/debian/patches/tinfo.patch
-	"${WORKDIR}"/debian/patches/varnames.patch
-
-	)
-
-src_prepare() {
-	sed \
-		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "/^TCLRL_LIBDIR/s:lib:$(get_libdir):g" \
-		-i configure.in || die
-	mv configure.{in,ac} || die
-	sed \
-		-e 's:configure.in:configure.ac:g' \
-		-i "${WORKDIR}"/debian/patches/* || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		--with-tcl-includes="${EPREFIX}/usr/include"
-		--with-readline-includes="${EPREFIX}/usr/include"
-		--with-readline-library="-lreadline"
-		)
-	autotools-utils_src_configure
-}
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
index 148b7aefd19c..98333a816ae6 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="