gentoo resync : 21.12.2017

23 files changed, 17 insertions, 387 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a3e16a2efbf7..ee8078bc9864 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 242b880854b8..7e896f9f3da4 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -6,5 +6,5 @@ EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 49e63ad8ed9196041efbe06952b08b527cc2d13
 EBUILD aruba-0.6.2-r1.ebuild 978 BLAKE2B 6873292d76d109f6c6c64b8578c68e0a304d2f5244918569e57d6267f4c9e03cc3422c9a691c8583c266d45ffc7aebce11050faa71ee27e193d1e3883c49668c SHA512 ef8e84a7e91a8e9ef31fe46bc2ca5226c605b8a1ffc30ead3de0a4eaae19710c85cb21ba1b7fa8aa49bf813e8f5aa635b292e0959df760dfa6f6773931a60395
 EBUILD aruba-0.6.2.ebuild 992 BLAKE2B cc346c563facc83dfe092932401ac736c44b45a1cb35a58c256808a9487c667e05c4bd451c5c10e6eff1a254e0a9c110d0156e6509e4a62ad5e0d91bd2add6e2 SHA512 859b7b7a1da19ad4687c8362a4fbc0964063f1d5b2fae8b209604add856e974e3b8c6f17627d98a2307c79bf526876223cf2f90f984ea7983352922d0c3529a5
 EBUILD aruba-0.7.4.ebuild 1305 BLAKE2B 8b0a11f7586caf45f615b06fe75f546e04724f15588098ab32d177debb4cbf1a409bdfae016a865963fe2d920e6e8d5a32e7f2dd6a1c41507facd33d88833148 SHA512 a3922e5b3550e7b93582b5fea463f68a0064a9e4e2e56950d9f52720a019f663e0163c8acea68ea5fbe0c48ef615e1124cda8c566affce80e122fc7551f9f694
-EBUILD aruba-0.8.1.ebuild 1659 BLAKE2B a4ad83d744fa128a2f5a3067632c0fe2f801bf355fde1430c0e0fdf3055e1dbb581bdb44cbe17c4f3e45447e9b6a4fce38655ed85820b61373d11acbc393cb3c SHA512 457e86c23cee35f46f5ce106c974a9e7c35624fbc2ec4992b303c255a7c6fdd27a329f50fec96a5e2eff9ff5cc10dc018af50221d45f54ba4c5aff4a38ad5911
+EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B bb7465c5483d989737a710dd8f5d357ddbcbff4b4fcf034c9011374df56d7af85c7407308084136719d6402bb9446c1b8e69d425a18556d024cac0dc95e9666c SHA512 d91882d6e4629d2e8e686e5f6393065e19d8bba990baac4e40234350779037689e3bbee8dccfe189520f5697e1879e07f4fd2d4e5d0fd8dd976c962875a9cfcd
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index de515fb11f5a..1110c6b99139 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 59eb7d9ed2b2..8eef84257374 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,7 +1,3 @@
-DIST d-feet-0.3.10.tar.xz 179500 BLAKE2B 6f22d8556a44899ea6f0a09a21bf8ff52f9e40c2655863133060b049989d14ed7d7a822efbdb8ba304cccbb9ea2dde3737816eec7b98cb1e7ccffb8d9af3fcbe SHA512 7a6832367b32eae204c456598ac4ad38ead585e916e2d2179203f63f4e87f2e9d9afbc8448324660552ebe4aaf2bd394f73e48f325513c3b0f5fa33f91fce40b
-DIST d-feet-0.3.11.tar.xz 183128 BLAKE2B 8c6d8d00869d3bda6bfc0572f36a562936d9dd35b8460b5ea49602519f152a5e3ca3d115f54fae165cf2b6009a51a5df594a1a964aeca470003af2d5506185bc SHA512 a7b72e8f01661d28f4c0a33e20f32c50206d133c1f0ccf22cc3696978f7b7410bdcba29f68d58ccd9ab132cc7ea8fdee99ffe8ca09e8ad992b61df48aeb444ea
 DIST d-feet-0.3.12.tar.xz 184308 BLAKE2B 1e0bb31c768cff357db735ed924cd0d768cb0412ccb6b722569c906671fd4929f67d62cbc09d37b1176755dff228c659013c1ec27d785c4175e534a4458c3fd3 SHA512 ef7a8aa57893cc210327420e954d39d256733839e6a171b8e035f15089fdf963c708a39c3b931b8a85d9faf78a1be324576c5fa2440db8305c1bfc8a8d9e991e
-EBUILD d-feet-0.3.10.ebuild 1320 BLAKE2B bf4b90b1c3944b670cca12ae3b3fa5b921d5e0c24ba0046af6562bdf43d26a86739a7d26d0890a43c920f90247d06613f0476fc67498c612bd7992f0d380d50a SHA512 99bb54dcb697adebc79c0ad0176605e7138f08c2e0b582112eae3176973f0f36c4858f879cb0b66724a7b7ba30396396f1a52a8cfe2224f9b932b1aa1e7dd512
-EBUILD d-feet-0.3.11.ebuild 1309 BLAKE2B 2a0f1fb674b6e32210a98d822d9cb4b9dc0af719d43cdf1b3089c866a6401d740e1eee471736f54d0898ba8aae87695ddeb1c46543311bf07d05e64b322eb581 SHA512 cce6d699e762ff0ef449f696c25dd3d8ded8821dabeb6685128d08c286e45d9dd86239143a19a9b15fc3d12ab4b249f7110006433a08efb815799d549b589517
 EBUILD d-feet-0.3.12.ebuild 1371 BLAKE2B 4d4ec516e42720b5953b57803139b9abb87bd4f648a7e7cbaedb76c7672059f2a1a225d2078ddd9e2fc44b2a26adc7d2e7668d3e16aea050fd767ecfc6922ae6 SHA512 ca9ee296ba275e6404d8ec6534fbe408f34c54b14bcd34d0e93d545feccaa364fa43d76fe883b17d83aa06f318be9b5ff1ff0282b59974660038915430fe7c64
 MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.10.ebuild b/dev-util/d-feet/d-feet-0.3.10.ebuild
deleted file mode 100644
index 3b01d733dbe2..000000000000
--- a/dev-util/d-feet/d-feet-0.3.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/gobject-introspection-0.9.6
-	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
-	>=sys-apps/dbus-1
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	x11-libs/libwnck:3[introspection]
-"
-DEPEND="
-	${PYTHON_DEPS}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-"
-
-src_prepare() {
-	python_fix_shebang .
-
-	# Do not run update-desktop-database (sandbox violation)
-	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
-		-i data/Makefile.am data/Makefile.in || die
-
-	# disable pep8 - checking python whitespace style is not useful for us
-	sed -e 's/pep8 /# pep8 /' \
-		-i src/tests/Makefile.am src/tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# disable pep8 - checking python code style is not useful downstream
-	# (especially when that style check fails!)
-	gnome2_src_configure \
-		$(use_enable test tests) \
-		PEP8=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/dev-util/d-feet/d-feet-0.3.11.ebuild b/dev-util/d-feet/d-feet-0.3.11.ebuild
deleted file mode 100644
index 45c0789e57d1..000000000000
--- a/dev-util/d-feet/d-feet-0.3.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
-	>=sys-apps/dbus-1
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	x11-libs/libwnck:3[introspection]
-"
-DEPEND="
-	${PYTHON_DEPS}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-"
-
-src_prepare() {
-	python_fix_shebang .
-
-	# Do not run update-desktop-database (sandbox violation)
-	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
-		-i data/Makefile.am data/Makefile.in || die
-
-	# disable pep8 - checking python whitespace style is not useful for us
-	sed -e 's/pep8 /# pep8 /' \
-		-i src/tests/Makefile.am src/tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# disable pep8 - checking python code style is not useful downstream
-	# (especially when that style check fails!)
-	gnome2_src_configure \
-		$(use_enable test tests) \
-		PEP8=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 78ff450865ed..8a6f1b4c6f77 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,8 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
-AUX dogtail-0.9.9-gentoo-paths.patch 2465 BLAKE2B a0425208e0da057a67e4e8f8a24f1792a2d8af352225892ad2d152bdf412f92e2ee021e88a650d24a845795bf2d2a3739b2a0ff1960ef9c4685f6b7a748ba7ff SHA512 dbb5dd218959617b8481b59492bab26896d5ca150d74dcc3de30e747f5093618b492ba880ff1b0d08a765ba4d19c56f64abd4b43080e1149ff6a3b09ae18730a
-AUX dogtail-0.9.9-get-user.patch 1295 BLAKE2B 1b6d377f5ac6174e45bdccdc63d4c10fa3f987c6b245a85c206b241ea2e0b8288dc30f23c7386a9cf8543aa184b8f36e2ba194b0c20833ac5a6da9953caed176 SHA512 fa7f75c37897cb2cfaccf1e21eb2efad77601d28e3c8d298c066199a8dcc695d872d792ab7f0c3e372bef227051c9b37ab8592a8896d03b82b4ca34bbf9a7579
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-DIST dogtail-0.9.9.tar.gz 123884 BLAKE2B 7674617bf1aac04bbe6afd8ce8d304331fcf26a4f03be7d440ca13e147fa0147a013d258fb4c6a93fb7d0e26b26ebabb831bb686d2a8a0860a55fb02dc378d09 SHA512 5283dea40b8193e7380aeebab6c7ad149c232ac3d7360df477bed0e623bacc79fc895694d2aff788dd5f986591c1460c447428d8c2acf25ba240946323eabef8
 EBUILD dogtail-0.9.10.ebuild 1470 BLAKE2B 376e1801bccd63f12d11c2e6aae1c473f8e9a4ecfa2c8a19a453e65262591392703d2bdb9db7695a483f20c1466159105a84aa5a96aa10741e3e101638193cd2 SHA512 a4366cfe584d71cd369618ff38abf54bcfa3ec129d2f9691937979c60cbb43be936a14a7e8c8c32641eca9c7000235a4252deb66ca5bc47ba8adc5bd6bc7dbde
-EBUILD dogtail-0.9.9.ebuild 1578 BLAKE2B 40cd08fb7d28a83700eec7ccd07914853f8078128a25bebdb4b3a2e628e27a71042b31af09c41128bf193e9bb05ffd404e88c474a7d7ec6d88b841d7844a0c79 SHA512 480675b19dcbaf61a4f77951e68d20deceec31252c9c6dbac1e8f51b3ed5a7649d5234fc1db3e1f0abc041da442560b4127399a9d78540e419e9f8bf05d139e3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.9.ebuild b/dev-util/dogtail/dogtail-0.9.9.ebuild
deleted file mode 100644
index 4ec734068537..000000000000
--- a/dev-util/dogtail/dogtail-0.9.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils distutils-r1 gnome2-utils xdg
-
-DESCRIPTION="GUI test tool and automation framework using accessibility framework"
-HOMEPAGE="https://fedorahosted.org/dogtail/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-base/xorg-server[xvfb]
-	x11-apps/xinit
-"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# Install docs in one place
-	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
-
-	# Fix current user detection, upstream bug #46
-	# Also, respect TMPDIR
-	epatch "${FILESDIR}"/${PN}-0.9.9-get-user.patch
-
-	# Upstream loads resources relative to __file__, which doesn't work with
-	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
-	epatch "${FILESDIR}"/${PN}-0.9.9-gentoo-paths.patch
-	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
-
-	xdg_src_prepare
-	distutils-r1_src_prepare
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch b/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch
deleted file mode 100644
index 522249949228..000000000000
--- a/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 069a17e22a73ecff686b650ba158a292cc508cb5 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 5 Mar 2016 19:38:08 +0100
-Subject: [PATCH] Load resources from well-known location
-
-Using __file__ does not work with Gentoo's dev-python/python-exec
-wrapping. Better use hard-coded paths.
-
-Also adds support for prefix.
----
- sniff/sniff | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
-diff --git a/sniff/sniff b/sniff/sniff
-index a83a1c2..ff43f38 100755
---- a/sniff/sniff
-+++ b/sniff/sniff
-@@ -47,22 +47,18 @@ class SniffApp(object):
-         if os.path.exists('sniff.ui'):
-             self.builder.add_from_file('sniff.ui')
-         else:
--            import os
--            path = os.path.abspath(
--                os.path.join(__file__, os.path.pardir, os.path.pardir))
--            if path == '/':  # in case the path is /bin/sniff
--                path = '/usr'
--            self.builder.add_from_file(path + '/share/dogtail/glade/sniff.ui')
-+            self.builder.add_from_file(os.path.join(
-+                @EPREFIX_USR@,
-+                'share/dogtail/glade/sniff.ui')
-+            )
-         self.app = self.builder.get_object(self.appName)
-         try:
-             self.app.set_icon_from_file('../icons/dogtail-head.svg')
-         except Exception:
--            import os
--            path = os.path.abspath(
--                os.path.join(__file__, os.path.pardir, os.path.pardir))
--            if path is '/':
--                path = '/usr'
--            self.app.set_icon_from_file(os.path.join(path, 'share/icons/hicolor/scalable/apps/dogtail-head.svg'))
-+            self.app.set_icon_from_file(os.path.join(
-+                @EPREFIX_USR@,
-+                'share/icons/hicolor/scalable/apps/dogtail-head.svg')
-+            )
-         self.setUpWidgets()
-         self.connectSignals()
-         self.app.show_all()
-@@ -650,11 +646,7 @@ def loadIcon(iconName):
-         pixbuf = GdkPixbuf.Pixbuf.new_from_file('icons/' + iconName)
-     except GObject.GError:
-         import os
--        path = os.path.abspath(
--            os.path.join(__file__, os.path.pardir, os.path.pardir))
--        if path == '/':
--                path = '/usr'
--        iconName = os.path.join(path, 'share/dogtail/icons/', iconName)
-+        iconName = os.path.join(@EPREFIX_USR@, 'share/dogtail/icons/', iconName)
-         pixbuf = GdkPixbuf.Pixbuf.new_from_file(iconName)
-     return pixbuf
- 
--- 
-2.7.2
-
diff --git a/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch b/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch
deleted file mode 100644
index a3f7ef77230d..000000000000
--- a/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1ee93bf9d0d8a143f5faf9d1310d768d1de4ece4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 5 Mar 2016 20:32:17 +0100
-Subject: [PATCH] Do not use USER as it can be unset.
-
-Use LOGNAME first as recommended by python documentation, then try alternatives.
-
-Also, use tempfile to respect environment variables changing tmpdir.
-
-Upstream: https://fedorahosted.org/dogtail/ticket/46
-Debian: http://bugs.debian.org/743500
----
- dogtail/config.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dogtail/config.py b/dogtail/config.py
-index 80f08bf..1b6ac15 100644
---- a/dogtail/config.py
-+++ b/dogtail/config.py
-@@ -3,6 +3,8 @@ from __future__ import absolute_import, division, print_function, unicode_litera
- import locale
- import os
-+import pwd
- import sys
-+import tempfile
- 
- """
- The configuration module.
-@@ -12,7 +13,10 @@ __author__ = "Zack Cerza <zcerza@redhat.com>, David Malcolm <dmalcolm@redhat.com
- 
- def _userTmpDir(baseName):
-     # i.e. /tmp/dogtail-foo
--    return '-'.join(('/'.join(('/tmp', baseName)), os.environ['USER']))
-+    return '-'.join((
-+        '/'.join((tempfile.gettempdir(), baseName)),
-+        os.getenv('LOGNAME', os.getenv('USER', pwd.getpwuid(os.getuid())[0]))
-+    ))
- 
- 
- class _Config(object):
--- 
-2.7.2
-
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index cccb4a36512d..33ca9bbfa377 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,13 +2,13 @@ AUX 4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch 4415 B
 AUX 4.0.1/0002-Fix-bug-28898.patch 3526 BLAKE2B d13f4e866c00763061347bc24908306e4f7fb6d0701d10d272475556d4213dd19a13abefaa660199a9c1369264a84fa2da23c09095f4e3b6e30b356b99b90dea SHA512 8a9167ba1b17bb6d373fd41755ce4436b199fb48a47e303bff4020a79f90c547ae3ca86525345c55536bdc03b9c3853baaebdf914df04ae92901a073ae5658aa
 DIST lldb-4.0.1.src.tar.xz 19088212 BLAKE2B 0fcc76de5777c0724a207330bc5e027065fa55628506fe8cbd4f4e7ab397fc3802ae9580a8e41e14c1b3448453c1f735725100fb69c3048a44bd9e5748ab3cfa SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6
 DIST lldb-5.0.0.src.tar.xz 19203772 BLAKE2B fee83470d32a5325861da009df76bc64ccc0fabf390afb74630b53904fc11c74d309cdd016cc27c15d0a0ccd8390fc60b9799e6317d0fcf02557b3946e5689ea SHA512 bc70953c7f6b3f0bc797461fb53d9c60c5ab36c0b9aae815a3c37fc597a61c7220695ee3b60a9682486d2e4713c5f78ea85e853e13c587e356510a1c99a62ba9
-DIST lldb-5.0.1rc2.src.tar.xz 19182108 BLAKE2B 711b2eed319f8f9b170317c1d6b9f755e8ed8019bb14b551e20dd50f3a09d8cba7c9aca155ed173e9720e42d8058efa725f216eb037ca0a6754f4453a645f87e SHA512 428edfb0e882f41410fa789a3a96a10ae28e614e486e43160872adb92e61a0950d97e6347f9e78d931b74e7fadc826608a27edbd773dc0bfae338e0e07ebce85
+DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
-DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
+DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
 EBUILD lldb-5.0.0.ebuild 2811 BLAKE2B f8a5c12fe179486993f4ed0da5f4b6abb4e282c4c5702277af7853cb71b4cacd1fa998346d07373fdc0e5f051155c373e2c5cfc30131afbf08660a782ac7b81d SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4
-EBUILD lldb-5.0.1_rc2.ebuild 3053 BLAKE2B 1b5d38d7679aba5f0c4c12a007302967c77c53560165263f4fb893ba61869ca5bbc06c3e0560c71a3ddcc9aac8d939c383979fc7e20746c4a961ce4d31c2c718 SHA512 5755506b28fc5e48b57010789b1d562ec4f199cb77327c758f038a4adfdabb715f92428388ae233a8ed5b8a34130b87a3266224fac49579a655d4bef44259def
+EBUILD lldb-5.0.1.ebuild 3067 BLAKE2B 790a43c29244d006a3bf9ac3c8548f9348a2d18b96aecc156cef76d3145dbc34d22aa6534d8338d23e79113bf1a6d87c00464427aae5ee6b1c513d8fd2985e54 SHA512 41807a680175c6c836ef852b58f4306c32a21111da4b78c6584696a68e9424cb2de27bd2394164ac1cc91bcdf759a5fd0112d137bed9c9714ff60e66af9bd29d
 EBUILD lldb-5.0.9999.ebuild 3044 BLAKE2B c343b777d403ad764a840c05f69e39ab6bdde155e8d2755142a8063f59350db04e42372ef27c567f50a033ceb059e5edeada4948b66be082e8369f5ab68eee6f SHA512 dc67e796754dd67b716fe476156ca669da65d5bc1d8180f9ead6d563824619e625e5537cf314b99d59c955893bd7061b1488fa815a93c54a1dc2d9e083fd67fc
 EBUILD lldb-9999.ebuild 3061 BLAKE2B fc4cdb38222831d0e0f9fe93b44306160b56eeb1b23d1015dbfc5761fdfbd22f0deed91d420870469dc0e9fd777be8cf9ade79e3eb90f275a3e0e18205aa97f4 SHA512 facc16f2f3ab686f2247d833c9f4a12ab6c0ad2e70d72452d6d96234a5f6f66106ccd16175065dd6e6405ed014ef9e687494a877fe7eeaa3a64ac9cdaa292fb5
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.1_rc2.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild
index 5ddf9b76049c..3b256444479b 100644
--- a/dev-util/lldb/lldb-5.0.1_rc2.ebuild
+++ b/dev-util/lldb/lldb-5.0.1.ebuild
@@ -15,12 +15,12 @@ LLVM_P=llvm-${PV/_/}.src
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libedit ncurses python test"
 
 RDEPEND="
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index d543e12d0bd6..a980fa6f2dfe 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-DIST meld-3.16.4.tar.xz 537364 BLAKE2B c0f6c07ca4f717ed9ab135e1f3cbc469cb8d8847377832886740b1667757bc8b9459cb2e6450fa4811f0cdc62f94c6eb1f665a58f434c748a4fae2e1198db93c SHA512 58ebca17b9ed9d9357d6f36357085603c3643eedbd86630a9a911ec87fd3a29a97a8e7ffba605b8e8d054322452ebdc299a5d50601968cf7b97d41ce6458be8f
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409 SHA512 1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
-EBUILD meld-3.16.4.ebuild 895 BLAKE2B fd50c30f43a5c483aba3b955356ef5cbfb4503b4661d961df210cc15d552d5d024d5c8cf3c2d42fbc3b8ff3e3b80b5494cc0f932da8886e3ed6f79de0fba1b00 SHA512 1c746808f45549a8d4c6193b82f9870ff3959f6fe83e569661faacd61c638a7729f96b42f35f8fb2f64223ec62caa153a765376dbb7767eddee62b94c1e28d63
 EBUILD meld-3.18.0.ebuild 902 BLAKE2B 0436a714b7f6d678b53e033737c22ce1a84a8a750877ac8f579789f7d81cb8e99c3e469ffb7f16c2bc459ec12ab126072ca27710d974871d822142b524aee51d SHA512 3fb9ba1148b138eb3d0d9818b2f613cf1864a4c9add6a9f97ed507f0e736026223694cfa383a64b876ef58d3c0a3da584585b1738352f06b2ea37143c728e5c8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.16.4.ebuild b/dev-util/meld/meld-3.16.4.ebuild
deleted file mode 100644
index 98a3b175b5cc..000000000000
--- a/dev-util/meld/meld-3.16.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2[dbus]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.14:3[introspection]
-	>=x11-libs/gtksourceview-3.14:3.0[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3e88873e0e0e..6a3a6b4df15a 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -7,6 +7,6 @@ EBUILD meson-0.41.2.ebuild 791 BLAKE2B 22c49cae20ffc107eb013b7d5d35e94f4b9be84cc
 EBUILD meson-0.42.0.ebuild 799 BLAKE2B 4d4a448f0ba298d4cafc2e9c68dda13d3605ca9913901be2602600d2502f6b2dd316d03d2e4b5d9be3a7747414e79e939254d3469fe51e585769eaf1df743c6f SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53
 EBUILD meson-0.42.1.ebuild 799 BLAKE2B 4d4a448f0ba298d4cafc2e9c68dda13d3605ca9913901be2602600d2502f6b2dd316d03d2e4b5d9be3a7747414e79e939254d3469fe51e585769eaf1df743c6f SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53
 EBUILD meson-0.43.0.ebuild 792 BLAKE2B ca2b473813c312a96e69a0803b3366cfd9f89516637498e8feca999c240bce22213d1346d73a3f9156f99d3e8dcc9cf4e8d7ab5c487bf0ee2df12f36749d4f2d SHA512 177c4299767cde14463fdb4232b7e159b1d8b6aeb7738299cdf7c6d50573145daa750d89131bbd931c06c46e77bbf8330bb75348693159a89fff1586833596b9
-EBUILD meson-0.44.0.ebuild 878 BLAKE2B 571a5598ee737ad770d7cf323ffff08d1ecca23430d955ce880adba6bd43c9e0fd12ff8b1a97bab856503958710040d43f367694c5f25414675f6f684a80a975 SHA512 4ba45b24af6059169839c998947506d88ff5643a96c2835ae8a72101a71102d47dae69f8fb2b8b4688a89b1837220f824112774f71a3530b89bcdfd9ece0be7e
+EBUILD meson-0.44.0.ebuild 877 BLAKE2B 1eed9943bbad7912de4a3f22da51c39f6594fed035ff2f058e6ce3d121fb19d27dd23efac5a64f3fb730833aaeefc10e72523e4d6b92f717c5672b348b338c6d SHA512 b9e7196035c105064d667b89919343f2d8af203b404d299189710d96ea6dfd924a8aad00af1b0153e0f63ad44f3796c57502dcd75cc4dd260fb70b507b547522
 EBUILD meson-9999.ebuild 792 BLAKE2B 05d42a8f579b200ad6f230c6b02fa3c4ce0d216bc6e676f7873d179e69057e5d09f52f54402df6d8a8fa65de194259a0f1669cefda2d2b0e3df66dea1cce169c SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
index 7a5db9258bc7..30a68a1548ea 100644
--- a/dev-util/meson/meson-0.44.0.ebuild
+++ b/dev-util/meson/meson-0.44.0.ebuild
@@ -34,6 +34,6 @@ python_install_all() {
 
 	insinto /usr/share/vim/vimfiles
 	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions 
+	insinto /usr/share/zsh/site-functions
 	doins data/shell-completions/zsh/_meson
 }
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 265296748323..ab6351f3ee83 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -2,5 +2,5 @@ AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e3
 DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
 DIST patchelf-0.9.tar.bz2 159956 BLAKE2B 7e8543a98aa683eeafacfb836a02ad7cf2fb52409b0780edb614e30edc66f8f356a9bd19e133b185861fe9c6ae0e4868b0b307c174610eef80e3446610f76bcb SHA512 5bd3a1268b809f173debde5d34c3f736f38d7afb69decf609a422884c51eb1d5ccf62f2d454d4ef8b2c20e263ece49e3c2f801347ef1dfcceecd89c78a214790
 EBUILD patchelf-0.8.ebuild 795 BLAKE2B 92efb5ae34357cbdc5676b473e89b3411241c3f506ee6904b6f4b69c974370c3d9a69c66c9413f573aa9c736236b31c436b063b9dab1a24419f955dfcb8e2f4d SHA512 ab5ab9ce393c12b5439646cda2d25226a65a9f262481357dac7c4fd12133790b6623b4ca8fd939306b6fe31d10082597e1b28319f9cc26b66b23316443eff191
-EBUILD patchelf-0.9.ebuild 566 BLAKE2B 69e3d9b094e807a64bc76bb6be201f2ade026df1e7354b98467654dda97d2ec5ffe8c60458d4fbc3422c20e63bb6b37f0ceb23ada7949cb76bf077babe3b74ee SHA512 16c5341ace2673ffd4b8bbc6fe259ee53a1e4759c271a72a988274a39d40689ca666bc648d2a94033536eed41f64bbcfb93f4cd1089e17a15b64896b78c166fd
+EBUILD patchelf-0.9.ebuild 573 BLAKE2B 7fcfb6054e32622a2143ed2bcfef63ea35fd06e6eae1727e06a1ec852f49e4ea0562b160466db7ced028d0c2864a56e9e63f25819e1513d68aeb9e8cd64ecf01 SHA512 4ddfecee6bf2198234b8aadc4f7f058e778d83b030c4b9c8ce3334c4a1ea6c3918eb257f97401b0fb217b2bbcccfe00d111e3ca49b800998f0b29d9a88b29968
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.9.ebuild b/dev-util/patchelf/patchelf-0.9.ebuild
index 47264579ddde..334bfba21b47 100644
--- a/dev-util/patchelf/patchelf-0.9.ebuild
+++ b/dev-util/patchelf/patchelf-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="http://nixos.org/patchelf.html"
 SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index 681530ccf68c..49c59e384660 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,3 +1,3 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 EBUILD shflags-1.0.3.ebuild 631 BLAKE2B 157620c3114e257478721a5ed30158286022f2accc33e33fa3dda01f48949b510295133b6db28e31eec260bafd773ebea2ff92e7a173c8c4cf75a3b3525fbe96 SHA512 e9cc2545163784ea9d1c9a1d6cddb3a0988a339d15090ad668156c4c398f35c1f699f8f3b34a1db8b29d16511ca661160f07b5ed58d58397a29ccf9afcdf5793
-MISC metadata.xml 473 BLAKE2B 23ff7c0c4d8a598c09e624ed2615ae55da3b32294266886d792a21c4c6536f96fcd15ac55cef48795995927d7ec518722fde9b67141dbb999a732563758c0b13 SHA512 04b4fe8bd3c81abb5e11ec1171cfd8d28f2dc56912bd8fa28d4ea6bcbec7a69642b8d0c412ac88b34f21fdc20a0e63bcf73d8fc743f8f38e801f6c7f5e36ef91
+MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index 85002b3b83fe..f6f583e29409 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/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>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
index 028fa8374926..79d53a583b4c 100644
--- a/dev-util/stressapptest/Manifest
+++ b/dev-util/stressapptest/Manifest
@@ -1,5 +1,3 @@
-DIST stressapptest-1.0.7_p1.tar.xz 165876 BLAKE2B 4d475066549dff7abeaeaa361bbeb8aca67d3b68d3de04700383f9bf84feba4372a62df01983fd8f4f9a9f3ead9ad2ed045e01e11265c3eff9e952be7551bc1a SHA512 ac3c072eae6f13ba6608d2cee1ee33b5d27b078dbbcb9e7ae1e59507d4571e36a06dd0e19e4a1b705c916104e06be39aa93ebe607fe93d5669e8764c68904fc9
 DIST stressapptest-1.0.8.tar.gz 218485 BLAKE2B a843330dfbf16b324a13e4156c819e8b9139288bd316d560410aeb704ff4e24c47d86dd3b1d1a65d325b86110015c6e893cd38aea99d59b7c68989ba2228f376 SHA512 b5fde353d15958052219c3e505a22aa914e03a7fe96c3a0ac5025a4c730643f6fbdd5088a7cc0dd4618d4998151e2374507845110af8f2cdb43ccd4c87d48916
-EBUILD stressapptest-1.0.7_p1.ebuild 692 BLAKE2B 796117ff681be491af8ac4352af0f93db988bd0a20b6f84c3a7bcb4cf2bbd8ba2b9b35bbdc4ac2ff4d10ee50298e831a0c84b4b0eb4d87df165def7e8cebe697 SHA512 f5986c263db46433b1cf8d9af4e945ee6d2cc4ad777bd3015e81df96c642299abcd7a0e213250fcf85ae31f96a09f731735612f6d8bbf66cf0d3fc2359a2ead0
 EBUILD stressapptest-1.0.8.ebuild 610 BLAKE2B e2c5db27457525327788a29e1b50a6f9e661e1807822e3374d41af2dbd3bb55af337506018b4d72c7838f2b4c9b126dfc6682cef5e8c0d1aeab8fed8d1e69d09 SHA512 36404057a349a6a5e66525235960becaafa4ef7013937170cb04eafd8e7202b19fa5e17be018e5c8cb540407c4c757154b0e4cfe00a89d16fa891611398cd969
-MISC metadata.xml 350 BLAKE2B df1173fde6e4544cdf2bcfbfd063a73f23efdba41a7bd61344010653ba4ced56c059a1c25c1f5857017c135f87b58e20ade4ddeed7e06af2c6d528b3bcb695fb SHA512 7df2f6c1ebb8bd68cc4580dc1a63cc3709ebb3e1aeee869de8ae3be643739d1d62955f8975af2f9c56d037618f9480925698a9b101da187aef4af7d9b83624ed
+MISC metadata.xml 259 BLAKE2B bf2f588235ba1f20b67db1404be3652d18c003fc52012eca6ed8175524b805a9d168779856994a16cdd2fc049db4eb6c4f3a71b61b50806d53b654877a89d7db SHA512 13357765b1f978b966b3d556a606bda30467379b2c33bc24d2940af28906ca337e8da57e936ba55c26de06d39b48f6729b4d8d4193e178033ea1f2e13e50ad7e
diff --git a/dev-util/stressapptest/metadata.xml b/dev-util/stressapptest/metadata.xml
index 5c0e460d8a46..7037e8e08a5e 100644
--- a/dev-util/stressapptest/metadata.xml
+++ b/dev-util/stressapptest/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-		<description>do whatever</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">stressapptest/stressapptest</remote-id>
 	</upstream>
diff --git a/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild b/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
deleted file mode 100644
index d8a17384024e..000000000000
--- a/dev-util/stressapptest/stressapptest-1.0.7_p1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This is the 1.0.7 release:
-#  https://code.google.com/p/stressapptest/source/detail?r=44
-# With the one follow up fix applied (hence the p1).
-
-EAPI="4"
-
-inherit flag-o-matic
-
-DESCRIPTION="Stressful Application Test"
-HOMEPAGE="https://code.google.com/p/stressapptest/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Matches the configure & sat.cc logic
-	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
-	econf --disable-default-optimizations
-}