Merge updates from master

24 files changed, 12 insertions, 259 deletions

diff --git a/app-crypt/kali-archive-keyring/metadata.xml b/app-crypt/kali-archive-keyring/metadata.xml
index 7b40a4a52cfc..097975e3adc2 100644
--- a/app-crypt/kali-archive-keyring/metadata.xml
+++ b/app-crypt/kali-archive-keyring/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>steev@gentoo.org</email>
-    <name>Steev Klimaszewski</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-office/gtg/metadata.xml b/app-office/gtg/metadata.xml
index d77d06fea088..7d791919d833 100644
--- a/app-office/gtg/metadata.xml
+++ b/app-office/gtg/metadata.xml
@@ -5,9 +5,6 @@
 		<email>eva@gentoo.org</email>
 	</maintainer>
 	<maintainer type="person">
-		<email>steev@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>leio@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index 24d0b785d584..e7411c45f7bb 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>steev@gentoo.org</email>
-    <name>Steev Klimaszewski</name>
-  </maintainer>
   <maintainer type="project">
     <email>shell-tools@gentoo.org</email>
     <name>Gentoo Shell Tools Project</name>
diff --git a/dev-python/liblarch/metadata.xml b/dev-python/liblarch/metadata.xml
index c2ca3019dd88..2597e15fa79f 100644
--- a/dev-python/liblarch/metadata.xml
+++ b/dev-python/liblarch/metadata.xml
@@ -7,9 +7,6 @@
 	<maintainer type="person">
 		<email>leio@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>steev@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Liblarch is a python library built to easily handle data structure such are lists, trees and directed acyclic graphs (tree where nodes can have multiple parents). There's also a liblarch-gtk binding that will allow you to use your data structure in a Gtk.Treeview.
 
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b9f69a824b14..3a5a1f24cedb 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -516,6 +516,7 @@ cmake-utils_src_configure() {
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
@@ -531,6 +532,7 @@ cmake-utils_src_configure() {
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
 		SET (CMAKE_C_COMPILER "${myCC/ /;}")
 		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
 		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -602,6 +604,8 @@ cmake-utils_src_configure() {
 		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
 		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
 		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		set (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		set (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
 	_EOF_
 	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
 
@@ -609,6 +613,7 @@ cmake-utils_src_configure() {
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
diff --git a/net-dialup/moserial/metadata.xml b/net-dialup/moserial/metadata.xml
index f5067519d0b5..c925342f04ff 100644
--- a/net-dialup/moserial/metadata.xml
+++ b/net-dialup/moserial/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>steev@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
deleted file mode 100644
index d8c3b6555b58..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	>=net-vpn/openconnect-3.02:=
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=x11-libs/gtk+-3.4:3 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--without-libnm-glib \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 93e37f831a7f..eb282e66c177 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,2 +1 @@
-DIST NetworkManager-openswan-1.0.6.tar.xz 306648 BLAKE2B a21f415bceab5edd9932e887e3aaa5da0819f025babccfd58fcefb207d2c222aa4630b145d78e9befc09409f7f74aa596bce779c4034b9c3a5cf0765bc71c57f SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce
 DIST NetworkManager-openswan-1.0.8.tar.xz 318672 BLAKE2B f0a277de4bf58c9d15f329ce8e0ba00ff80dde205fde19d9cd0b6feea4796cd0d84da6934713ee9b958c286c96a565f53d430b4105e6a963ab1ae8f7755e202f SHA512 66a3948493dd51def3d0afd57ccbb2e38a2f1b3c37df85b47059a0c06457093d574aed4165710080b9cfcc914e4459a60d6946170199dd3f75482c6350e9ed6a
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
deleted file mode 100644
index dcd10236ee5c..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	|| ( net-misc/openswan net-vpn/libreswan )
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.10
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index f398720b5f9b..8bd1580d4590 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,2 +1 @@
-DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 BLAKE2B 956b9e32028e2b0b3dc2cf20b25a737f240c002b6271f4d64f23fa8f4a8c72f37fb32069daa8f5fdb77947a2b81a0a42d5656747c048096dd98c3c895893d79c SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521
 DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
deleted file mode 100644
index 2d450d056704..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.2.0:=
-	>=net-vpn/openvpn-2.1_rc9
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
deleted file mode 100644
index 0f52e0906d8e..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index 72b63d50c887..3e3c9a3551a7 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -5,10 +5,6 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Steev Klimaszewski</name>
-	</maintainer>
 	<use>
 		<flag name="client">Build the ncurses-based user interface</flag>
 		<flag name="suid">
diff --git a/net-wireless/orinoco-fwutils/metadata.xml b/net-wireless/orinoco-fwutils/metadata.xml
index 703b7bb93a7e..7c72526b6752 100644
--- a/net-wireless/orinoco-fwutils/metadata.xml
+++ b/net-wireless/orinoco-fwutils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>steev@gentoo.org</email>
-    <name>Stephen Klimaszweski</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">orinoco</remote-id>
   </upstream>
diff --git a/net-wireless/spectools/metadata.xml b/net-wireless/spectools/metadata.xml
index 07e520680d51..409847ae38f5 100644
--- a/net-wireless/spectools/metadata.xml
+++ b/net-wireless/spectools/metadata.xml
@@ -7,10 +7,6 @@
 		<description>maintainer, has access to all hardware as needed</description>
 	</maintainer>
 	<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Steev Klimaszewski</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 		<description>Maintainer, has 1st gen WiSpy hardware for testing</description>
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 950582fe768a..80b1f5d6b1e4 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,7 +8,7 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.55.xz 1935212 BLAKE2B 0f954866032b5486e2b0cb1d043323b2604638538bb15e56293244473ac15fcd5a65d0c0bc96a78aab2dc5ee3e79e9043fe16519b096595c3156cb677082372f SHA512 a80745b271cbb2dbcee3f696a73238fcef3fefc8bcb4b49f4c1de234cbd78f6b75995b48c13b2687e8bbffad3c14114a036bdafdd68c535d5691fbe45a4c899f
 DIST patch-3.2.100.xz 1910332 BLAKE2B 16ff861ced5a622e424798bb2df220636c3f930913a7d6af28042be68ec50010b615a9779b6ecc9216c5b866a8e05e33dc1af2f872504f485add430abcbe2d26 SHA512 cb78568ce2da2322b90033a9ac6ad55ddb5c8b72031f2f1b4d178a5f3c2b82c915faf35b9a99669f5e794a07e639a9b838b14550cfec4679b88d979d99caba0d
 DIST patch-4.1.50.xz 1442376 BLAKE2B ed2f792b8cfa815d75725d115c48734107ba5bad749f10e916caaacd208e16224dfc3c538f91856397ec4edb66a8f75a80e8f4c9f3df03b2c86ddf9038810df0 SHA512 bdb52743f06aae307f1d475c42f8c75f483f246b8f2f4edb406dadee43920aa21576fca400a42d35c677a54837217578fd8aaaa07e970f84e6d4cfb481fb11ab
-DIST patch-4.14.24.xz 750320 BLAKE2B 48bb32db9a73c8b42f6b376f8823e0873777682dad0bd47f5fdca3ac57ee0fc80d91fb3d36b5647988b51372a5f0b849a16f01bd727b648ad2fcac6fa09abfd1 SHA512 e1979dc36fcad133980a438685bbb0f02f369fba37b1c8d4e47c3ca3274f4bf9eba0af795a7625f04d5f1e1279c28f27882b80aa7ac7f1a82bd244c2b8db1600
-DIST patch-4.15.7.xz 202364 BLAKE2B 984aee45063ede9a40d61de73c7d6eeb17c879605a7194fd83afc28eddcce9f31986a8d49e1e21061708bb7ea2e187a1762cd900be9eb2373dcb0d90d480e2dd SHA512 4215a356a61c3af20352fd60f3ec4e4a74a3d4d6223c7bd5c1b8283bc4d786a5e1c29a770518cb6a136f42841c637648835a54a46f11e552d1aa7b867999ef1a
+DIST patch-4.14.25.xz 776144 BLAKE2B cfb697e473b2ed245fc6a0b23f2e828ce5ea9219e6114843882ca3599b5e420c16c17b1da94580b728dc37d18d443bcba11c177e0771c0c5993758b03d31a224 SHA512 d15875cd3063c6bac5f8e94ba8dd7349b138241c67912ed0723b728a5f302ac9213729171b98664871d14b38670c7868ff64b8f45d0488fe26528935a641b678
+DIST patch-4.15.8.xz 236596 BLAKE2B 4bf6c3d576b8eec30133a2ba90115329ed9b5d5f9da9cf4589084681080d60637c725e48c3ff99a00a1c3aaffb800a7c7b5b3e69a40a72f9a24dcd5522a0b0d0 SHA512 0e070a05b2caccfa8dc41ae0c826b50cf6e9e02894213972745f609e5cda9aeb04c6ebf480d34c12bb649ad0f4b8a07b3c67e562ce1cae7a086d1e30da280458
 DIST patch-4.4.120.xz 1718956 BLAKE2B 06df2a0f9ce7ec7d813e6101a5fe5704adf6303c516193d8f53f5f3486a4f9b16c3842797ffa99d9e8daa5f3c1b20366ef2971c8f22aed1de443f4958946de6c SHA512 dd879f449840f380287bda06fe27453768b65493edee8f162cf17d3268f838acbbea375633412f1c0f8bc24b41fe153d610cbbca205cd7c8891bfe8f398f3ec2
 DIST patch-4.9.86.xz 1530748 BLAKE2B f23d5321758057fd0d2e08f8326c83392dac2714f87b917c4a56ca12619da2fe5c963e8802f0886aa4db337a79e4003313861f95ad4f77538406870182e8325e SHA512 64db94862faa4217ce0d815f6cb7274c9ee0c45703cec1374eea08e657bd8a3d7db88ea9435939c49f22a2d4fd9a773b052401f97d5ebb55e116f99f7520476f
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.24.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.25.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.24.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.25.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.15.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.15.8.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.15.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.15.8.ebuild
diff --git a/x11-terms/tilda/metadata.xml b/x11-terms/tilda/metadata.xml
index cf71538580b8..31619dab2778 100644
--- a/x11-terms/tilda/metadata.xml
+++ b/x11-terms/tilda/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>steev@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">tilda</remote-id>
   </upstream>