gentoo resync : 25.01.2018

3 files changed, 3 insertions, 62 deletions

diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index b60ac66dd9bd..443fdf5d116d 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
-DIST ansifilter-2.8.1.tar.bz2 436461 BLAKE2B f4b059ed7c8cb2823c9793cffd49193160295b1be0a25981464979add2759116d62b7a938c599eb3a45ea7f647f2293f9bd67883e4b2010ff395d24d6bea9da5 SHA512 f736b1e9d975a17431a19c2a889ede1feab6b8967d6981fa08d4d1a541cdc1478258dbf6173b7d00f9aa476cf79cfd1c7321c9d017a8aa6ad7ac9133b33a0830
 DIST ansifilter-2.9.tar.bz2 455885 BLAKE2B 0865e17f45d16657e78444e65bcde07f74ee9d8605e100ef34354fc874210fa6cc4d01162e234bfca9c486fac3c41be0d1e0caa014d9702d4a90798b1fa85636 SHA512 9fd086d9b5fecb7c1d42f96baa728b2b6c155505bfb42f92c1a79ce59571abff541c7d55e14b159ad0e7890434fdbc1b383bc76ab4c22a16d835e270b6095005
-EBUILD ansifilter-2.8.1.ebuild 1000 BLAKE2B 35f62af10daf5bfb2e625b40a70bb66df10a049485d852cbc25960358ea6aa67dc63abfa265d28632b98eaab971182d58c84df2700deb30c3bff2c0ca2832eb2 SHA512 a409b86071066d8fab61c5b69b0c576e8210522b07741972898dde788a262138d44f4d28b4018ec1ef8a23adffcdb34ab6263045881cf4014c3bf366106f6ed5
-EBUILD ansifilter-2.9.ebuild 1002 BLAKE2B b0333d5acdcef7516fd0b45d4a1ff0942d7c4330ea5bc44858072e3fb42249a600a44bccfca38ca1bcd13b9475a68955008f1f9759ed099971a02c655e090ec4 SHA512 182a3053e91180f2599debf271e29d3a6db0f1e923334742329156e1ad10dc4d3a169ea602baaf71eeece45fe223f67e2e8cc8c655c83617c720b093f64158f1
+EBUILD ansifilter-2.9.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.8.1.ebuild b/app-text/ansifilter/ansifilter-2.8.1.ebuild
deleted file mode 100644
index 47881d0b8810..000000000000
--- a/app-text/ansifilter/ansifilter-2.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.9.ebuild b/app-text/ansifilter/ansifilter-2.9.ebuild
index a4c7a3b32c73..05823fc22ef7 100644
--- a/app-text/ansifilter/ansifilter-2.9.ebuild
+++ b/app-text/ansifilter/ansifilter-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qt5"
 
 RDEPEND="