gentoo resync : 21.05.2019

26 files changed, 62 insertions, 303 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8854aa5ca7ef..307f1902de24 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/btail/Manifest b/app-misc/btail/Manifest
index adc1ad7159c9..4e5bae54b717 100644
--- a/app-misc/btail/Manifest
+++ b/app-misc/btail/Manifest
@@ -1,3 +1,4 @@
 DIST btail-0.3.tgz 7402 BLAKE2B 4d7fb1ce1e89aca6e4ff9b45866296b40f960fad751ff211b551655fd62ef125b3c5397c165f221feaa7070530930d65c5af1a90536faea2b112664b823c19fc SHA512 1b27b6fff41b5e69119526115d5c3d239d106303923796121829729617765354cbd3f769b95c8fd32cd5a181475c3cde0ffe2accaae44ae461966df46bb990ee
-EBUILD btail-0.3.ebuild 738 BLAKE2B 7d421da8fddc845cc900911ba3595ae876e2019e3ee7ff65deb4c21c3922335515cd0d6cce89253afca13aa161acbc4a755b14a6595e422bc922c4821bebfaa8 SHA512 ad817a50faca01ffbc851511ea91558b87c571182aab2f8efdf683c5cb6e64b4bde5acecd6ab14f34262adeece7aae872c621f713bc6c3b32d1d8b976d9b48b4
+EBUILD btail-0.3-r1.ebuild 735 BLAKE2B 78c7d8080011982cd700ac4286cf26bc06bf6d01c62e093cfd52c4dbe9661d5811381cfac5e24fd897207e5117ea1aea20ad89fc7266872a39df8c88d2f688a2 SHA512 762dfac27c90b72eb733148403d25641fb93f4e1132490f03c83621fbf742fb559161e50d5f642b62b467f8619a49320fb86238412e6e4f59b00df18e72d9384
+EBUILD btail-0.3.ebuild 736 BLAKE2B b1e809a7e506d46a23c793c6e0d4e3e4f32aca04c8da26db0c5f7e9b7149c59d94cc266e0f1521f1e03c000fd3822df94c4461b0c230d9efd37118c0b09d4026 SHA512 46cd12dc7381b377ecc650648b3b119396d9daa87d77eaab85a91c24915bb6d3f4e54f291480cef94cb04a785c36af99f5272a47d9239fab4e08b63c8a0cfea2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/btail/btail-0.3-r1.ebuild b/app-misc/btail/btail-0.3-r1.ebuild
new file mode 100644
index 000000000000..b434b22da8da
--- /dev/null
+++ b/app-misc/btail/btail-0.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bayesian logfile filter"
+HOMEPAGE="https://www.vanheusden.com/btail/"
+SRC_URI="${HOMEPAGE}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="sys-libs/gdbm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i Makefile \
+		-e '/^LDFLAGS/s:=:+=:g' \
+		-e '/$(CC)/s:-Wall:$(CFLAGS) &:g' \
+		|| die
+	sed -i conf.cpp \
+		-e '/Configline/s:):, line):g' \
+		|| die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin blearn btail
+	dodoc readme.txt btail.conf license.txt
+}
diff --git a/app-misc/btail/btail-0.3.ebuild b/app-misc/btail/btail-0.3.ebuild
index 7a7acc3d203f..b0235a0d999b 100644
--- a/app-misc/btail/btail-0.3.ebuild
+++ b/app-misc/btail/btail-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -6,7 +6,7 @@ EAPI="4"
 inherit toolchain-funcs
 
 DESCRIPTION="Bayesian logfile filter"
-HOMEPAGE="http://www.vanheusden.com/btail/"
+HOMEPAGE="https://www.vanheusden.com/btail/"
 SRC_URI="${HOMEPAGE}/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 73c2c001174d..f371c5e9bd7f 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,6 +1,6 @@
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
-EBUILD geoclue-2.4.13.ebuild 1680 BLAKE2B fc4061d14d801ee9159f8de3410beb9605c2890fd0e452bb671f0eb0bcd0afbbc44314625aa4cdab7fc81c3313339305c319cf3f4b3a51bb30c1581783c8f934 SHA512 9b91396080a9f842322d2f7d803f46a7505db21cbd47aa55ea69ea5443f54711b1e2366dc0cd9b7a887ec18486148c2d1b33c98b38f1ac97a32bfd1f3ea73c70
+EBUILD geoclue-2.4.13.ebuild 1679 BLAKE2B e474c73cfaf8a2af3edb0cc1f8fe059b98650160cc7a1a6c953fd50c95f78b0905740cb33d63d59f7832e494f391c55339b42cfa735715fa8aee0775e4291ca2 SHA512 8154326d2c76eef796d3037ce2855ee08e6c0870d1a2ad802e84f3befd42983f5763a4003ab63ba6c1440123789294d207f752f1ed196fc14f82df442910201a
 EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index ec4cdcdc95dd..0d9c96fb366a 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index ba5ca69625ec..225396720633 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,3 @@
-DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
-EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
 EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.24.1.ebuild b/app-misc/gnote/gnote-3.24.1.ebuild
deleted file mode 100644
index efeb2abea8e1..000000000000
--- a/app-misc/gnote/gnote-3.24.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.18:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index f42c5a1ea82d..2dffc56d5272 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,9 +1,5 @@
 AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
 AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
-DIST golly-2.7-src.tar.gz 3881882 BLAKE2B 1989ff56049b7a182cbca35e33ac287c279ebac69acc5d07ac5122e8ccffef978a2e063c0587813d177a6311c854c6d52c2e80a5919107f9c6b17947a5e5f1ab SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
-DIST golly-2.8-src.tar.gz 4087191 BLAKE2B 4029b9bd30624cf2253dc5524c998f7e50648d39bc8dccf23b5c6b586989a641dde17b9fe35f16043d0f0d4a60da46729b31a9715b5d07950d610ea41a93a7a5 SHA512 bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
 DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
-EBUILD golly-2.7-r1.ebuild 1016 BLAKE2B f4d11a14b186a071c7c4e3d22fed0f86ba01b60cf05594e5fa5d36b92efbdb88791130cca30b5b53509357521cac6c8e38714e6ce7eb29892dacf23d948abcc0 SHA512 28c118e5bd8542699bd89517e301a169dcb0961920fe66958329bf4570c3e6a53446069850d24553ac6f9ab69b99445a51888281edcb34d83a54f79497428216
-EBUILD golly-2.8-r1.ebuild 1132 BLAKE2B d7e03271c35d155f163fa54f2c0264cd4ad651248cd80f64b93ab832f2e647371134783ff77f543d80b8dabf3e05aab781777051e13ebe625370df3a5290efb3 SHA512 3f162769d8940a0eed7d227fca60675fc430ee285beae0c5f6dfb19c94414f4eec61f758b506c107ca79f45981bdbfdfc7ee51889c7e8859c0307f451ef4035f
-EBUILD golly-3.2.ebuild 1150 BLAKE2B 353b5ed9260c8b8b594cf3fa4804b62eb3207aafa90d71892b240ab658d9adc625cba8e5b9e80cc484d349d1d8644ef2da67075b530f5eeefa72f4fffee04fb4 SHA512 560377816c32ced370653be76cba7c18855803e348733e94476ca0ee367af62412ac4021d6a583b7576f93486171cbd6ef3c4b43076745210a071281dd185a72
+EBUILD golly-3.2.ebuild 1148 BLAKE2B a753b5b303d6d59ea2cb9f596367c473896328947b64214cecb53d59082292c9f38e553127142b25ca6e0f52ab379f25a52ccd95d54c258ccdbe6a831877f4ac SHA512 5192b0c80ea964422fb49e607af8e0ac68a8dced02182a38cea1c0fea5583a07784ff8ffc6f47f56c5b9f41d217717e9dab776920c1872b0b137f8c3fb07bc43
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-2.7-r1.ebuild b/app-misc/golly/golly-2.7-r1.ebuild
deleted file mode 100644
index b07bc8262aab..000000000000
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-src_configure() {
-	econf --with-perl-shlib="libperl.so"
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/golly/golly-2.8-r1.ebuild b/app-misc/golly/golly-2.8-r1.ebuild
deleted file mode 100644
index 0dda2847e7e9..000000000000
--- a/app-misc/golly/golly-2.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-	virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_configure() {
-	append-libs -lGL -ldl
-	econf \
-		--with-perl-shlib="libperl.so" \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
index 6000a64174e4..733fce4ccb93 100644
--- a/app-misc/golly/golly-3.2.ebuild
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index ac4066d7ee9f..3f1383617665 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -9,4 +9,4 @@ AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
 EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
-MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
+MISC metadata.xml 410 BLAKE2B 70c580020aa70cdd8014ec30006a34222d0a09397eeba4e09ecaee3a3ce14c65a5990d401334a06e54adcaab4898b1b4d6526c2a628f9d50610f331ffe2990bf SHA512 90b168683db981176423d73dc4454cd216b5985e6100793462d28bbdbf8e08951a400502e8835c11c230a8f37db0e67a2911738875ac22fa3c5824ced3c8aab2
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index 8848712a8765..28aea643562f 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>nimiux@gentoo.org</email>
-  <name>Chema Alonso</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
   A utility that displays an ANSI/ASCII logo and some system information
 </longdescription>
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index ad085342d8d7..199440cab6c5 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -7,6 +7,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3778 BLAKE2B dbc9eed9df7d5244b371d9e6126cc5ae2cde41b2b061b3aa4b02a5268896bb5fb2109987bba0e8931f3dae4114bc01420e70bf5297c575dd2905cf8139054177 SHA512 2198cc38a1a99ef124603cb9a007143f706a69a5e96fd183d44d301631e199868c2cfc9b18a0f9e7c6054a6bfad6e13a10b85d3041d98a6b850cb46e7541d927
+EBUILD lirc-0.10.1-r1.ebuild 3776 BLAKE2B ad69f84d9d4b7f2a016714a5c66dbe9afe9e1a12a648ce99b6974d0eeaaaa96f4fffbaa2a49e3286c6b9448237b1d3824811b5b8cc6f2bcc9789cdca62006f97 SHA512 488cc6c639db5fa28d6ecfebd44d818eb5fd463ae094325268c2a6c696166db3d6fa292ab43e384a03f5c7368ac68124b07752771f18fb4e19a30d61f3ee9264
 EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index b3bd462cb514..e69687a9d3b4 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-misc/muttprint/Manifest b/app-misc/muttprint/Manifest
index 285bd7977e2d..701a32b2ada9 100644
--- a/app-misc/muttprint/Manifest
+++ b/app-misc/muttprint/Manifest
@@ -4,4 +4,4 @@ AUX muttprint-0.73-pod-encoding.patch 1305 BLAKE2B 4a53284c3531cf71e9a86b6de10f2
 AUX muttprint-0.73-warning.patch 404 BLAKE2B 23f0dbcae883aecbe2f9a26567ca432309e3345a8791930ea7c961c71d7fa452ba2b810715dba56825c972be0b65503c9351a2c3a077eebc8f460cb99bca0fea SHA512 4f39fb455c0f99a68b2c004556377c5c385ecf136ae5a317fc1418497bfa28d0965e8b4572897a74da651b75c17cbebe0e12cb37950f8a45cb3b2c4205f65bd5
 DIST muttprint-0.73.tar.gz 361268 BLAKE2B 0d7a84056df8550368783acec52693dbb68f5be547394cbba8701619ab7e73ce69d68f2d531cfa45b56321db89565d5be4e7b72e0c58bfac977c3143ca7b895f SHA512 607bdbee769e6d3a954979f15f017875a70078462bdbd747ff65dc3ac61fda3a0c32b261430faab8e457d6781b03d9f266ae2d21cdbdd058a7635ba9ddd27834
 EBUILD muttprint-0.73-r4.ebuild 1749 BLAKE2B 7c6777010a6f30df0a00822f7633fac2753386de478b902be59573ccb32b225cba7e15621f9f6f27838322d101673ca367ab2b5ceb5c88cadb0f835fda60ca5e SHA512 9cc56828a72af4684403853f88dd28c59d78173135500f4d52e8009aa9d49f81382db6bf73b5f569c71ccb0e655b7ac05fa4b9070610ebe3907dfdf54b61bd9e
-MISC metadata.xml 553 BLAKE2B b8bb28840ef76e2df2d70d3315c16abf01a49eb6901bc407fec2ac35cebedd86aee15bc40b704689adad9742a8313f2068ff1acbc5d5721c04c48917ec3500ab SHA512 48239b719aa371cfaee986200e9d19c5950824c6f760c2cceec4df741fe19e2cb143e3e93bbb0fe3aa5ba9a65690d312d37c6819d2ef55a07d0c89880b9b3f0a
+MISC metadata.xml 475 BLAKE2B ea3b25e47a492d7445f598c459130b89bc95a5c710dd3a90be5ea8cf031299e8e5009d05bd43491ce957b7582bb9da7c29ecf4e3f53a09049b0099ce2aaa7e2e SHA512 087e4806bfeeddf8abd777cf75038e80ec754205808d3a595b76bcb91be592e25ff09e9a1a4510b61ff404002746d46e64eef65fc2a67cc3324c1c337b748082
diff --git a/app-misc/muttprint/metadata.xml b/app-misc/muttprint/metadata.xml
index acd6628e6977..adfa2f1f4a12 100644
--- a/app-misc/muttprint/metadata.xml
+++ b/app-misc/muttprint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Pretty printing of your mails
 	</longdescription>
diff --git a/app-misc/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
index fc3bcd810367..0e40057141d9 100644
--- a/app-misc/mx5000tools/Manifest
+++ b/app-misc/mx5000tools/Manifest
@@ -1,4 +1,4 @@
 AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
 DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
-EBUILD mx5000tools-0.1.2.ebuild 758 BLAKE2B 617501a533181cd985085b0bcb39364c4bb78d7d5302211e640fc61ccb38edda3cf1ab00e98fc67c0a59fd2bf58c5480c8c9c039ac9f338e3b2df434fc1b1c91 SHA512 d812ebde94df8415c6fe4380f4fa342fda0003f756fd33e270e257a141e4f29833fc216fa7917b9636e5a9a65cdfb58931ec3ffdba7f85b22d4500b5d2d29ee0
+EBUILD mx5000tools-0.1.2.ebuild 757 BLAKE2B 6dab8e6640b1f6a657cc915ff411f631163309e2a7311829d3b1bfeab94ccb7bba362e3d3a6b79cd1b6ee1d6df81630baac812e83bdf1265e5a89bd27e1fcca4 SHA512 9f95ebc428b64a6171bd63ecf648b3cdac0e89419e24aa1f03eb0a9a890f6574180668ff56f41fc9121a34804d9ce9c18ee529fc1106208cb3c781a42ef92412
 MISC metadata.xml 739 BLAKE2B f242204a9d3f27f2c68cc7771be37cb329cbf57725ddb0ae823191fb62ec23050dc530b20fb22115fd2582a919375404322a8b3192734975d6eb6b187a02c618 SHA512 19a17587727e544f9c3c7dcb5a58693aa294c6e86807a610d484fb568b0a83472abc155609e5fe66e33a07d165ebd1b5968cea18b474ad5a934e99cd7318743f
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
index e081f20ebcf7..71ca5f515e94 100644
--- a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
+++ b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://web.archive.org/web/20170225160711/http://download.gna.org/${PN
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="media-libs/netpbm:="
 DEPEND="${RDEPEND}"
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
index b388acd94094..05a6d4e19022 100644
--- a/app-misc/pip3line/Manifest
+++ b/app-misc/pip3line/Manifest
@@ -1,6 +1,4 @@
-DIST pip3line-3.5.5.tar.gz 733385 BLAKE2B e9577fb02d778b689d1c3f5849f714b7d27a5ad49a7a68e412a19cb8251e7ca1d76d0a046bfe10db2257593ccba4f1aa5fff0f34c317975f75ef347f50172088 SHA512 95cbc567f1a7f2bcbc07fe7d560829d9538c126a2748b762fcf505bad47926376abea9d8eaba8670f4c3826b988ea1ea1338faf625a6cdf8db17f457af4edbbb
 DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
-EBUILD pip3line-3.5.5.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
 EBUILD pip3line-3.6.0.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
 EBUILD pip3line-9999.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
 MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
diff --git a/app-misc/pip3line/pip3line-3.5.5.ebuild b/app-misc/pip3line/pip3line-3.5.5.ebuild
deleted file mode 100644
index 8506a3ba9967..000000000000
--- a/app-misc/pip3line/pip3line-3.5.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
-HOMEPAGE="https://github.com/metrodango/pip3line"
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-# A few comments
-# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
-# It has nothing to do with the SSL/TLS protocol itself.
-
-IUSE="distorm python qscintilla ssl"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	qscintilla? ( x11-libs/qscintilla )
-	ssl? ( dev-libs/openssl:0= )"
-
-DEPEND="${RDEPEND}
-	distorm? ( dev-vcs/git )"
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DBASIC=yes
-		-DWITH_DISTORM=$(usex distorm)
-		-DWITH_OPENSSL=$(usex ssl)
-		-DWITH_SCINTILLA=$(usex qscintilla)
-	)
-
-	# distorm is statically linked, due to insufficiencies
-	# in the current distorm64 package 
-
-	if use distorm; then
-		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
-	fi
-
-	if use python; then
-		local targets=( ${PYTHON_TARGETS} )
-		for target in ${targets[@]}; do
-			if python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON3=ON
-					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-		for target in ${targets[@]}; do
-			if ! python_is_python3 ${target}; then
-				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
-				mycmakeargs+=(-DWITH_PYTHON27=ON
-					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
-					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
-				)
-				break
-			fi
-		done
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index d619d5e27700..fcbda0210f8d 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -9,5 +9,5 @@ EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882
 EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367
 EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
 EBUILD tmux-2.9a.ebuild 2334 BLAKE2B 513cb9cfacf185cd0d95aeaef70c781200e4031d4a6d0b64e3e22606804d079b85ac12fa2fe093b8f4da671c11d279fecb1760fe5c45a8d158c707c61f8f916b SHA512 149720b87a688dc11f5f48249b22fbd2498b893feb89bb03771567674716e38bdc5abf4c8ef7e472e8a5ad448b0968780c96c1d87ceebd14319abbb6e368671f
-EBUILD tmux-9999.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
+EBUILD tmux-9999.ebuild 2338 BLAKE2B b69396cad7f3e80f248ebcf1e25e96ae5d6f785aab57a8c8c3879ce3646cad3b4a1038631a9c94e5cff1379b7832832f45e4bd18e3d2fe87263c0323a90ddb9a SHA512 739f8a9ef385410fffd0fa9ec3fbb9c6277a37890e3f3cc2e3fa5e314b03d0303673d8778aa34546c08e12ea271b6fe83b763b3d8aa2835b860049c0df561698
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 4615e5f5979c..f4e930c58362 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-screen )
 	vim-syntax? ( app-vim/vim-tmux )"
 
-DOCS=( CHANGES README TODO )
+DOCS=( CHANGES README )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4-flags.patch"
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 229ca92c1dd8..bffd77e93edf 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -3,4 +3,4 @@ DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da6509
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
-MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
+MISC metadata.xml 1237 BLAKE2B 690f9f340aa6a71d70ad8f39a71d1f4a65539a7e9a9ef1698aafc97cab2387a0d9af18333f3b259bb79b7d2427a76ed79be9196bfcd060d551abefc1ec92493d SHA512 b7dd2ee856bf79c8355a9c9ae2a4ebe076d285d01cc8201b4166a4ed295eeb27d3f054f29d3becdf9c91665ad5757f3c9f97801eba7088f79a66db3c3ea16e01
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 564dc1b9462e..4395156e1f28 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nimiux@gentoo.org</email>
-		<name>Chema Alonso</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	Vifm is a ncurses based file manager with vi like keybindings. If you
 	use vi, vifm gives you complete keyboard control over your files without