gentoo resync : 06.08.2019

4 files changed, 4 insertions, 75 deletions

diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 32c579ae9ddb..1ac34c589aa4 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,13 +1,7 @@
-AUX teco-double-free.diff 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
+AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
-DIST tech.txt.gz 1971 BLAKE2B 327f9b860a3550e5e56ec1524dbc7ccfec31a4a58646f5a191f0867bdd94b97ecdad694cd5205be2896cef013ef63a52fe91859fe00db17da02160ad3a00384c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
-DIST teco.doc.gz 129896 BLAKE2B 0372d5a697f432e41b138de9a5faff8c1032d7843ece1d1b54c325852280f51ef76d0d891e8747270b0c364edcbd731bfa849bd692afffc09041212325d010a2 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da
-DIST teco.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-DIST tecolore.txt.gz 7039 BLAKE2B db19af3081c4c9129d8298709fe77bb8acaf1c0b19e87d4d313cf65a9426449d9fc864378c85712b5716bc6b535c36bc1b9371a212b43ff4cff6d3aca290146c SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e
-DIST tecoprog.doc.gz 15629 BLAKE2B c47ce219e6b7e98b4cd3332f78ea48bb9d98b7beadb0a11de0361ee680a014da4997e0657ad12052ebef02d1b3dbd234330be9f7c198b5645cc0dc6290aa01f6 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55
-EBUILD teco-1.00-r4.ebuild 1698 BLAKE2B 4dee8cd8bf51f8981e51a4dd52066be80c1734e54dd326d94c877bdff97c00db1605728a80d94af46772b1c575f904332c8e6f0578a69c55ee906c04d2302952 SHA512 4c346e648fcde6b8bce1d16a83ae345d01b719983075c532aa7f729ec4d5504447685cc5644e696f637d40f65cf62faa1067a620d10e9276e098a3c904ab7c31
-EBUILD teco-36_p19940820.ebuild 1460 BLAKE2B d87d09d90937509002d83bdaf590e143c80323a98c165f60d7ba5af83720004e361b04b9b62dde53024184571c7dccbf6c25c3863b4d19f96ace7f41ae8d871a SHA512 0e32a7ee28c2bd703eda6d3f3882c3492b6fa907bb775bdaeabb3128328b0f83bb891de60e7ebd85be8319ec63fd3964d43219318b401072434788318c9c47bb
+EBUILD teco-36_p19940820.ebuild 1458 BLAKE2B 27dbb4e4ebfe5b62561c612e7330afe5ed9ca78b725db0b9002c3b4a8857df2cf313be572d98433908d336f78519cdd224290f3c0f88327575737eea045582ee SHA512 8100eca3bb36b8d9f89cb57586d198eb991feb6ee47ea0dbf44dfb1a0069788c79b2c3cc1a13923d0fbd937afdab240e14a97c6ba4c626fdbc75afe3d8cd5bf8
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.patch
index 344aa6dd2dff..344aa6dd2dff 100644
--- a/app-editors/teco/files/teco-double-free.diff
+++ b/app-editors/teco/files/teco-double-free.patch
diff --git a/app-editors/teco/teco-1.00-r4.ebuild b/app-editors/teco/teco-1.00-r4.ebuild
deleted file mode 100644
index 5973b0b3eeda..000000000000
--- a/app-editors/teco/teco-1.00-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic readme.gentoo
-
-DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
-SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
-	doc? ( mirror://gentoo/tecolore.txt.gz
-		mirror://gentoo/tech.txt.gz
-		mirror://gentoo/teco.doc.gz
-		mirror://gentoo/tecoprog.doc.gz )"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack teco.tar.gz
-	if use doc; then
-		mkdir doc
-		cd doc || die
-		unpack tecolore.txt.gz tech.txt.gz teco.doc.gz tecoprog.doc.gz
-	fi
-}
-
-src_prepare() {
-	local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
-	sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
-		Makefile || die
-	# bug 103257
-	epatch "${FILESDIR}"/${PN}-double-free.diff
-	epatch "${FILESDIR}"/${PN}-gcc4.patch
-	epatch "${FILESDIR}"/${PN}-warnings.patch
-}
-
-src_compile() {
-	append-flags -ansi
-	append-cppflags -D_POSIX_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin te
-	doman te.1
-	dodoc sample.tecorc sample.tecorc2 READ.ME MANIFEST
-	if use doc; then
-		cd doc
-		dodoc tecolore.txt tech.txt teco.doc tecoprog.doc
-	fi
-
-	DOC_CONTENTS="The TECO binary is called te.
-		\nSample configurations	and documentation are available
-		in /usr/share/doc/${PF}/."
-	readme.gentoo_create_doc
-}
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index d8bd29428abb..f46d3c234792 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.t
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses:0="
@@ -22,7 +22,7 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-double-free.diff
+	"${FILESDIR}"/${PN}-double-free.patch
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 )