gentoo resync 31.01.2019

14 files changed, 10 insertions, 385 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 346fd8a8bd33..ab5b87451beb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 90c68997bd7c..a7d0429739c5 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,10 +1,4 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb
-DIST bluefish-2.2.6.tar.bz2 3793018 BLAKE2B f77b5e21a3289ebd2c9e3986476dca30e42ff489240adccba91a5aaa4a2e35282fb2b0a38137d249747e0496f410cd51159cdd7dc4e3b46a6affcb68d9b58099 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e
-DIST bluefish-2.2.8.tar.bz2 4097769 BLAKE2B f0e38841dde2e620fa2ea7390891f2c09f349d9861aeeef9b919dbdc67d7be15dd28852736590e99f0cd167feee3089df929e261e8a244f1301e130a3bad451b SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1
-DIST bluefish-2.2.9.tar.bz2 4082978 BLAKE2B a99db5acc2bce79aefccdf676a9ce965f682e99531790f20d6c67ad7f43c566009793efc4f3369aa425fc764dcf05f2a83b0260bf6531845cac2c707009c7967 SHA512 ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae
 EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 2b122e7bc7e3759e37b9e64ff4a618f5fff15d1931bf33ae4408c870758c61c99f28c7303ce0d3ea8f12a658f85bc4fff28422beb499ef764905121dec0a7bbf SHA512 29663a481073d4d158e0c529479464019d4edc5bb0d639f2755d439bb30e86c36d0935a4ae9f9694c737e9b96a326893f55df6358aa47325d19b70a8f644e61d
-EBUILD bluefish-2.2.6.ebuild 2340 BLAKE2B ffa844212337201b9a851f31b6b47f0e53a79df5624b1045074e729610af1d7a03752bfd6fe1f9559c6ddf557d3d8b3c33dd619aaa2569059322eeff9d9ff1b1 SHA512 d0ff8dd70461bcfe97888ad97bcf8fb4cf8cec932eeb0ca79614ac612ab04623cc928b988bce0f9c301482371d21ceaf093b9e70e2f854a824b18c3655503dba
-EBUILD bluefish-2.2.8.ebuild 2605 BLAKE2B 25c8fcd77c7b717e2625e5c59f20b443e710b92e44d0ac1b59416e410b5bff6b38cf444be6b4ef8249717dc5bc36189a300d17730cd9924918e3a31214bd2154 SHA512 3c096bbbdd8b77c18f5b92246f6d4ac6548c0499148c3562e9a308a45da602f236c1595a1534c8141f5d123c2c3d277eb6f9ff634a60054e852aaf9a7a7df065
-EBUILD bluefish-2.2.9.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
-MISC metadata.xml 542 BLAKE2B 0680cbbd32a85e3c53e10b4605e820d5eabc79761ef70bd41a5fe3cfb2a25a19251696c5b2e35f729e38c481728635cfbf8253ef07f15c656f8b164df905d3ef SHA512 7449eb863eecc8ed11167409f150847c628077e328f13481db6206498d15c7c6e148e7c309ed40eaf781f401147b7a757e8216324b2c01ea65202e39bf57fe5f
+MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98
diff --git a/app-editors/bluefish/bluefish-2.2.6.ebuild b/app-editors/bluefish/bluefish-2.2.6.ebuild
deleted file mode 100644
index 2e47961b2f0c..000000000000
--- a/app-editors/bluefish/bluefish-2.2.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-SLOT="0"
-IUSE="nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	gnome-extra/gucharmap:2.90
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.8.ebuild b/app-editors/bluefish/bluefish-2.2.8.ebuild
deleted file mode 100644
index 2ffd0fb8bb4f..000000000000
--- a/app-editors/bluefish/bluefish-2.2.8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="gtk2 +gtk3 gucharmap nls python spell"
-
-RDEPEND="
-	sys-libs/zlib
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	gucharmap? ( gnome-extra/gucharmap:2.90 )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-REQUIRED_USE="
-	gtk2? ( !gtk3 !gucharmap )
-	gtk3? ( !gtk2 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-# Never eautoreconf this package as gettext breaks completely (no translations
-# even if it compiles afterwards)!
-
-src_prepare() {
-	default
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with gtk2 ) \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/bluefish-2.2.9.ebuild b/app-editors/bluefish/bluefish-2.2.9.ebuild
deleted file mode 100644
index 2e9a485511db..000000000000
--- a/app-editors/bluefish/bluefish-2.2.9.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.24:2
-	virtual/pkgconfig
-	x11-libs/pango
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# there actually is just some broken manpage checkup -> not bother
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
-
-# eautoreconf seems to no longer kill translation files.
-src_prepare() {
-	default
-	eautoreconf
-	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable python)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
-		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
-		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to add XML catalog entries."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
-		--del 'Bluefish/DTD/Bflang' \
-		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
-		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
-		|| ewarn "Failed to remove XML catalog entries."
-}
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 7e95699afd85..98078743b336 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 	<use>
-	<flag name="gtk2">Enable GTK2 instead of GTK3 even if GTK3 is available</flag>
 	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 	<flag name="python">Enable Python integration for zen-coding plugin</flag>
diff --git a/app-editors/dav/Manifest b/app-editors/dav/Manifest
index 79f937c9918e..76c0900cc7be 100644
--- a/app-editors/dav/Manifest
+++ b/app-editors/dav/Manifest
@@ -3,5 +3,5 @@ AUX dav-0.8.5-davrc-buffer-overflow.patch 246 BLAKE2B ef18f5ad8107e981c60f3bd319
 AUX fix-Wformat-security-warnings.patch 1179 BLAKE2B 524644da22ea8623c3bbdaa9c83ca74a87124cc896dec0f90221cf854d14744d1bc1a86e76a5ff3543fb2e2fc743d76db70bb7be3fe30e22508a374f6f122b83 SHA512 c5665be995e718a460b6c75ae3843104721a58c2d4a5321659d8527034f413d433fdd1140b14d6a8587f298a2e4935f8a07579071e5aa5d6fa49e125da5e4895
 DIST dav-0.8.5.tar.gz 22824 BLAKE2B 969458aa6b914f9cd624554690a88f4c2999dcc6e89db38d13d9ba98db7881a34ce1575ccbdf74b3ecca34345f2ec639cfc805a350e31f856f7d086cf23752de SHA512 cdedff875df392e8525399b40d45cdf4e984b1b014f03d9f5cd5be270eebe0003fcf48e9738f6ac2789138973970bb9fe6d0b8babd20c1df61e193f84ee066b3
 EBUILD dav-0.8.5-r1.ebuild 880 BLAKE2B f3d671be06467efb4d791933855bea1f9e61631a2bfb2ecf77e7ef586c25e274abbc9ff69c28ba30321fdeeb34ffd14618ac95b2e24fc9353255b8c682af6fbf SHA512 d97f7b44ebe9536ac7be593e872cc6937e71c050235769a774fc2fdc681ab2ade2a716b98464f41e18ab9bb4f8c0d23f1c9d9f9cd8ddb08918075751ca284d92
-EBUILD dav-0.8.5-r2.ebuild 908 BLAKE2B b9c9ac48a570321892701333b18ff43a1f1f45cd58ca50c711925585841ab326a0d1bc5e47bfa64c9dd586362c41b4354599d6a2a80555c593385e2a37b2963e SHA512 3f3977945cd1fe80c9e862246cb1e9184e2d65eec63b7db912d2d32e298d7dc5dbb13c99ab0dad37e3cb2d2ce7fe8f5ad3cef3ac2eee152acc7bf2201973c139
+EBUILD dav-0.8.5-r2.ebuild 904 BLAKE2B add9b28fc27f558271af8ff4466f0fbfb2bf00286a095115764a5f844f2fd7edfc5988ffbd471180ea50f5a80697ca312849f0c20b586afa0c53f26e71f8276b SHA512 d96fbb74b3cdaf91dd2e9639c46212511f5812efd7eb0bdeeefb3c54b3ba25f70370a4b33e4eaca7458e569b5743c114e0daafebb745e5ddb7d877ae92f794d5
 MISC metadata.xml 245 BLAKE2B 0994c9d498383d2c458a3135ca07a8637acc6a2a89547ca1e245bf6354e61cc761e17d1eb33beaaab8c0c30997bbfc5772565212d7f58faf6cbfdaaf082025e8 SHA512 c42813db6849d65a3316be196bafc9fb991f6d78eb75f07e4202ba512c11ba1c6ea4082742df51fc83a06a520bd3297bd6f7404a48fbfee969937d10cd777a18
diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild
index 01ee84f4222c..8b531ff8b3a0 100644
--- a/app-editors/dav/dav-0.8.5-r2.ebuild
+++ b/app-editors/dav/dav-0.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 3a4695e7fd75..48bfb69c8918 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -9,5 +9,5 @@ DIST fte-20051115-src.zip 549216 BLAKE2B 0ec3eeea813380cb0c2cac55dc42beaeecb10ec
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089
 EBUILD fte-20051115-r3.ebuild 2780 BLAKE2B 39ee917eca7bbf6172a1c550d900eaf9d8aef5db4cc325dc11c734560e2679cc0e2522bfeb8f5afcaae92042d3ee73505f89e7b76796dde5550932a58e5ffa2b SHA512 106f6eda464bb37d35d549e8c3a56c53a3571e259e748bf7f975d1e6fce4a4e1fa32ea85f8cc26f38ac5181cdd64af32012a8332594a74c09d4e064779a9778a
-EBUILD fte-20110708-r1.ebuild 2656 BLAKE2B f5894a82e98aaa1b9610bdf3320436de60d1a0cfa5f1d5e6f4a204082dfea885decb30f8835a83017fee9b5a34fc2156a55ba17c2d8dbbb211b85f05241b86fc SHA512 989ddf33022f0bd8b8d0e1d79bb1dcad111f8fbe3d7de329512feedbd4751a6790d5c08657ec83f110bf86547e05be5795fcfdbf2597ed172b11664a47bb38a0
+EBUILD fte-20110708-r1.ebuild 2652 BLAKE2B d34bf5ebceccb98c779143b0aa2d63be524855071a99c81ac5094eede5f67c0e21ad74ebf24a33378922403f80464ae56bef960327c77eeb389ec6fd3ad47fea SHA512 a07e6508dbe4dc1e9d4cca7b06935655154dcb5ea936e6fe8d3660cd8fa587200fedc9816317e4a0d1a346b6c2e54a65f465f4846acf7ccc43befc95fb0f1f82
 MISC metadata.xml 312 BLAKE2B 0092b7eaef6d8c1e8f1bd490c8d4e9f43909d86097fbf06692b2e92e7496332bac289bb40fc3cb9a7dc1d32a63ca19db01cc75e0a9014f1d2e8074816ed26a8b SHA512 3946924797105501c1388f172caf774488ebb480ff13664fffd75fb30ebdfba27d52c3e7d534e7dcad5204b6074ba28ee25a4724ed117748059fceeff9d23b60
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index e32fb0fe8861..af1ba1a960e6 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 60c4a5c26302..89a99d415d12 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,3 @@
-DIST ne-3.0.1.tar.gz 1193311 BLAKE2B a58afd00660a7266a37fb0626ddd326fa3366eede6d44cfdd3a002fa3c90db3cbfd852a414c9e8f091e1eac0786cb4d296d1b26144d8afd1d5118da29823603f SHA512 3750140a49c7424e92e509137d5f31d305b81d41939a2578f6a26065216ebd1aa444b0e8d7e79dd09cc525e1055cda4d756f21ec810f860063d2eec861ea8273
 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
-EBUILD ne-3.0.1-r1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
 EBUILD ne-3.1.1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
 MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/ne-3.0.1-r1.ebuild b/app-editors/ne/ne-3.0.1-r1.ebuild
deleted file mode 100644
index 9d68adc0f1a0..000000000000
--- a/app-editors/ne/ne-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
index 9c09cb1f8f31..56ed013a8944 100644
--- a/app-editors/wily/Manifest
+++ b/app-editors/wily/Manifest
@@ -1,4 +1,4 @@
 DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
 EBUILD wily-1.0-r1.ebuild 809 BLAKE2B d78d084be0cda1dfa32453974846d2721ab700ed6b476e440d8f0d2b3a5401b2d8a2c084666db0267f7517dd10e6bac8c36506967844fd914948a9532d1607a0 SHA512 fb05e0ad34abf3b1a0a7a6949016da6ec0da8e8f52a2947bedc282f5499a70ba4b44e5dd5fe3ffb57941522035d40281aa7889246cb186278e9b48f4d9fc5336
-EBUILD wily-1.0-r2.ebuild 690 BLAKE2B 6fcb5dd31dc24b7e98c561b0c4aeaa82b9ab9c4ac52086605544188ca5229512ac1d25f0ad7742f510d651d09a94581dbc167b32ec1a5541e9e82cf07d6e0028 SHA512 57c61443e2ba44a649a384eaf240d6443fd40732515182cd33300476356a738edb36e091d13e025b9854d56f1f86c5357b0a496da2da715b2fb0383ad687c5d7
+EBUILD wily-1.0-r2.ebuild 694 BLAKE2B 0bd4505f79254267a4082fc8a369b2ca0280b4f9d00ffead5c2639fa28dc461f0d88a9d6c8b5654c882c4ddbc7faee04c02b39f3c7a6b71afce59a50c8a03fd5 SHA512 d257b0491aeb8d4d815a560856fba1986233c12d20366a86d094b7ff7a892cea957c211bf48d65af85bacea09aebac44546c3510ffed90f8e12c36759ea62949
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild
index 0266f79b98e6..2b2d12f280df 100644
--- a/app-editors/wily/wily-1.0-r2.ebuild
+++ b/app-editors/wily/wily-1.0-r2.ebuild
@@ -12,10 +12,10 @@ SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/9libs[X]
+	dev-libs/9libs
 "
 RDEPEND="
 	${DEPEND}