Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

41 files changed, 420 insertions, 555 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b2780ed4b79e..e3d0631b32e5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index ea19c136e2b6..eab0d171ad46 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,6 +1,5 @@
 DIST anjuta-3.22.0.tar.xz 6363016 BLAKE2B 8b02f3dc0f97d0e195039cfd462bb6db64199c92d689fbf751e8a88141f65a4dc604bbf848342d73e398ba755e89b3d934df375aad50c9cee12c38df8a8c2d9e SHA512 64689392bfe6102698ef8a1ce62aac37bffd793b917ef6ffc53cb5b8aa9eb5b8961a999c32db559e9e348bcf46a7ec0ca9448100910b52885ddff898a62f3295
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 EBUILD anjuta-3.22.0.ebuild 3520 BLAKE2B a537f055c2f8fc5f5411512ad248abcc3f5af309617d09f3d0191481ddea3802a60ab27b06a3e2ff1c6e93879692d3ea2f43ffcfe132d6b2d1cc1dd3f4fbc1ba SHA512 5e19000cbe233a2688ebc24afd74f761b6395576b5ed3bf83f3870cfa7a855d10650e447853250a93ee2c9c1b366291a1240998401b7c7f613ab5816befa7530
-EBUILD anjuta-3.28.0-r1.ebuild 3921 BLAKE2B 45dd639268fd99033de9e5e053ebd5dbf000c0f2cbf0c80262ac8513b1ccbfcc3ee615555856fdf91464bfca5faa89525288cf2816af4c76c65fe6942fe46527 SHA512 4076ad9d2bcca1bef611a3167c33874962a0ef42f87551d85ac633532f2d8e1afde2227691ee349807bf764e2b41a85e0a46dc162ed4bf30fd4a1154405a3621
 EBUILD anjuta-3.28.0.ebuild 3572 BLAKE2B d69d7ee46afa8a95980c795824090afa96f4d5b3778fe7a9d597be41001b8c8ea8e68dfd63d8aade4ca8c5b467d93a22f32e495fc5979d6e5cd29a86e5626f5e SHA512 d1668c8f3b3b5f9bf2b1fa056a470cef0c68e74fa3287a40348e1b84705c52f6718f02e2db9e3058832939f306e2e1d3efe38b8b81fc254cdb7990242fc7171d
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
deleted file mode 100644
index dfbb2816fbc2..000000000000
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-# We inherit autotools explicitly because GNOME2_EAUTORECONF is set only conditionally later, so gnome2.eclass doesn't do it for us
-inherit autotools gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: automagically uses libgda:6 if available
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	subversion? (
-		>=dev-vcs/subversion-1.8:=
-		>=net-libs/serf-1.2:1=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!dev-libs/gnome-build
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-
-		sed -i -e "s/\[0.40\], \[0.38\], \[0.36\], \[0.34\], \[0.32\], \[0.30\], \[0.28\], \[0.26\], \[0.24\], \[0.22\], \[0.20\], \[0.18\]/[${VALA_MAX_API_VERSION}]/" configure.ac || die
-		GNOME2_EAUTORECONF="yes"
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# Do not build benchmarks, they are not installed and for dev purpose only
-	sed -e '/SUBDIRS =/ s/benchmark//' \
-		-i plugins/symbol-db/Makefile.{am,in} || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-neon \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable subversion serf) \
-		$(use_enable terminal plugin-terminal) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index d32fa5a78a3f..d0120253ffbf 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,7 +1,6 @@
-AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b04e1ee5c14db76c62490f6b487ddb06465be16df4fda7cc92e2cfa1d97129e7e1e852a26468e24f8059314f13a6 SHA512 4067aee17715312cf49dc3510754d6aaaa4dba25dfb802dc434d068bf5f35135aca2c107b2463044e5f88890ac20c1ba97eff604616913f5246c57eda3aed7ee
 AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9.ebuild 1231 BLAKE2B 9cee4e900b811cb8f312ee95b90d9603057a69a19d8b5024a5bc83846cc5f97667a1858c7631451c8f865e1a95e291a3cdaeb7b1ff6839e31dca6cc01e7ba9a2 SHA512 f32957973c87b54120af5b1a7c9eb4e921d3d262e9fb5b2d675f5f46af6bc55327e48d31bcdbd214027afa0073c2fc36c722948f820e0a0968ca6f1303d05759
+EBUILD bpftrace-0.9.ebuild 1190 BLAKE2B 54b1634249e4594ea5115c87047e74e4f73c1b48e24f51292ed8dbb5f554cae84c8d18f70e1cd1c73b9f3120c670ecc94833f7d7f62c3efd4a43fa8c8b6bb783 SHA512 6a36f394710b5c027b0ae6b040c956e4891c17294cbb1e913152a592d46b1b694fa3dbf102ab8e555486b165764e0c7cf30fad79f8663be9b1d7cd3b1040ca3c
 EBUILD bpftrace-9999.ebuild 1233 BLAKE2B 493490aea8b690eb3d86ad875462602b40552a9ef4713ffcf733550bf30fd6b16f33b8847f670e26c3c2245b2a5f10d888bcfaa7869b868cb126d428994f6e88 SHA512 355f550827610fce8cf8a51561bdce9b56e5b00f5d49c5b0d31dabe93307be754011d93d1ad9cbe2f140950d51d9f9ec77a44ab9fa8130c863b598eb98e00e9b
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild b/dev-util/bpftrace/bpftrace-0.9.ebuild
index 1f481b0f3e2f..b483aed0116a 100644
--- a/dev-util/bpftrace/bpftrace-0.9.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.ebuild
@@ -38,7 +38,6 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 PATCHES=(
 	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
-	"${FILESDIR}/bpftrace-0.9-llvm-8.patch"
 )
 
 # lots of fixing needed
diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
deleted file mode 100644
index 14d6a167a863..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/bpforc.h b/src/bpforc.h
-index a6ee583..8d0e579 100644
---- a/src/bpforc.h
-+++ b/src/bpforc.h
-@@ -80,8 +80,13 @@ class BpfOrc
-   ExecutionSession ES;
-   std::unique_ptr<TargetMachine> TM;
-   std::shared_ptr<SymbolResolver> Resolver;
-+#if LLVM_VERSION_MAJOR >= 8
-+  LegacyRTDyldObjectLinkingLayer ObjectLayer;
-+  LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#else
-   RTDyldObjectLinkingLayer ObjectLayer;
-   IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#endif
-
- public:
-   std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_;
-@@ -91,7 +96,11 @@ class BpfOrc
-       Resolver(createLegacyLookupResolver(ES,
-         [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; },
-         [](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
-+#if LLVM_VERSION_MAJOR >= 8
-+      ObjectLayer(ES, [this](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#else
-       ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#endif
-       CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}
-
-   void compileModule(std::unique_ptr<Module> M) {
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 214880bab25e..0a8f040c453d 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,3 +1,3 @@
 DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
-EBUILD clazy-1.5.ebuild 865 BLAKE2B 43f896c2e097695685340bb5b9d707bf882f66bba63fd17cf0f1948b222acbcd4d1e773e54d6f0dfea5ea7102c5048a9d5fba1d683eca0c4ccba1b2b75ad4d9f SHA512 9d2b56b4453527e1562e104439271720db5f376e8f474b7082350688b6cbd2565bac4c672b2f239d8b8a770bec9cb9f362d107eec54ff9a21875006769dd8fda
+EBUILD clazy-1.5.ebuild 866 BLAKE2B 2cb1ae38c156c3ada0852a031c3d1c68d82e085409691f5a326b9f90c34ee448591392c03496ea063d18814ed181839d45e2c8fee3e1503e58c1c095c5aee1b0 SHA512 6cdb84f1bcddd90b03d55865eca2648531d6d2e995ed4d0de8b3c5d7147b2ff96fe0096ac7a4cd5152f47f7a4db1102a138e536f7d3382cc6d0f376f47b03165
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.5.ebuild
index 7bf24b0ba071..d5bead0c2f23 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 82e72ebf84d4..7cd1cadc4164 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc5
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2-r1.ebuild 2673 BLAKE2B 718c85f7f4df14fca77c5667a0b25ba696255518a91c0fb5edb0140530f052ac9ebd419595ebb9505cb4389acb5ec872aad48e9496ba115c3a2887b8f0c49c15 SHA512 a4ec7c01e2f0ffd630763c2dafef49d9989644321fa8c4dfb30b4c906e48afe3191c4ae6babaecee4163a46f3b4fdbc474721350915077f0386982b68f3e72a0
-EBUILD cucumber-3.1.2.ebuild 2703 BLAKE2B 2c06ae7c702f4cc6d50f53c45d2d0844272c95b7bed0a026f0b8275771027d786bfd4e416abe3ebe5980b5f77e212b736a2c3838a93268d78aebe9bf34aab9d3 SHA512 dd508671e0d6c9a4fca9d551db85837c0f2ebbf7053273bb9c15fc43d768ab398193e2d1cb13c655cc061394fb7b608280378aa28b04d4940b7e97faf8650c8b
+EBUILD cucumber-3.0.2-r1.ebuild 2667 BLAKE2B 6caa8fcc64b5ed621e5a3eac0b9f660b2dfb4fcabf7c5d29a9e62e0c86e6762c4f2b741d0569c947c57ec729c266795c7cba5e54957f0ef07df71d784233a4d2 SHA512 232ba5dce6b04745d8e9b4262b80aa6831053b0f7bfb91492c312e1ec0cfcd3feb221b734cd33afd2dd44678e21c0b454b13303dd96136a2d74a71cfa37c537f
+EBUILD cucumber-3.1.2.ebuild 2697 BLAKE2B 44d2a186a11d9f46c5eba4669a59a13598e496694840f35dffee9020d7811ec5bd17a6cbe6394b6f750032cd827d3a2edb607780cc134d2a13d22d5d736ca6e9 SHA512 b611da21f9e0bcc6df392abe44f47b8fcb4c9f9b74197ab2997dca44f0a9d3ab21ad4ea3e18517184ddd9b417863af0b4011e3a1881f51aeb21af3f65ad57ea6
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
index ef62db8a64fb..ad857d32c3e7 100644
--- a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index f608147f4b66..319f0e1ad439 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 96c589cb5055..4b41ee5ae0c0 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,11 +1,7 @@
-AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
-AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 DIST devhelp-3.26.1.tar.xz 613508 BLAKE2B a84d6bb55a81f0beda0603f343022b997e263934fc48ccc95503e156a0ee0984e1c945af785971c45f197865147c63be354ace72582d3575692dd5eed7e1e724 SHA512 76beec8846703004202229853a7a208b31bf56e2f10c102a3bb6e88fb9e54aded027e6ab9620706629dcb02cf5973f1d4fe88d217a7b3b8cb0efc948b02ca660
 DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02 SHA512 a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
-DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
 EBUILD devhelp-3.26.1.ebuild 1720 BLAKE2B a3f309bbee7533f0f4e2f9002578a6f311ab5ed8cb134b5b73a5c7639068a4479479b64c1ec8b0b43cc0b7468cd9d8c6549cac84d97c2b9b79a6986b7cf7af81 SHA512 fb626b2203dd6dac9257eb135cecfa98a315094c5ef2c3faa0604f4d0cdd57571783ad1e7f54a72d33bbbab2398d1e85f029ae3049453a2bbc2399159cd6ad28
 EBUILD devhelp-3.28.1.ebuild 1783 BLAKE2B 06084e4718a94e83d7a8a005f37a021ae7c7d918ef05d531e7f5b01f05d2dc5c3c7dc67262a4e2057ea22a46521c6323fc67d200f21756a5b910f52f3a155a7a SHA512 3e2489ccda475a4c95b0f4f95445036ff88693ca43d11e67b142ccd899064eecac45ef391ce892aeaa11909e94ba962abffa316e4536f41f06bf795680977466
-EBUILD devhelp-3.30.1.ebuild 1837 BLAKE2B e414768769e8a2a1c6780bd72c8ec8af03368c57ec1f1d1189c8dab9af80dad55d7d0afd6dc312cf5550ad45924b824194586e9bbedf583ed487821e04b4b6ab SHA512 691f6f9ce31523f9cf048dbdbcbabead5bdbc252e8cf555b8c1cb031dd1db7e165f7b391739310f244d5a291fc26024dbf3be52309b0879b467135715123b866
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
deleted file mode 100644
index bc0417dc517f..000000000000
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~amd64 ~sparc"
-IUSE="gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.20:4[introspection?]
-	>=gui-libs/amtk-5.0:5
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-	"${FILESDIR}"/${PV}-optional-gedit.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gedit gedit_plugin)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
deleted file mode 100644
index 09e4405a50e0..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-gedit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:47:49 +0200
-Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
-
----
- meson.build       | 4 +++-
- meson_options.txt | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a0def09c..2d1d3e0a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
- ##### end CFLAGS
- 
- subdir('data')
--subdir('plugins/gedit-plugin')
-+if get_option('gedit_plugin')
-+  subdir('plugins/gedit-plugin')
-+endif
- subdir('po')
- subdir('help')
- subdir('devhelp')
-diff --git a/meson_options.txt b/meson_options.txt
-index 2eaa7ff9..8fdb5a89 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
-+option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
- option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
deleted file mode 100644
index b5afa8a2b874..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-introspection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:44:40 +0200
-Subject: [PATCH 1/2] build: Add optionality for introspection build
-
----
- devhelp/meson.build | 2 ++
- meson_options.txt   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/devhelp/meson.build b/devhelp/meson.build
-index ea217895..f88fcb07 100644
---- a/devhelp/meson.build
-+++ b/devhelp/meson.build
-@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
-         requires : LIBDEVHELP_DEPS_STR
- )
- 
-+if get_option('introspection')
- GNOME.generate_gir(
-         libdevhelp,
-         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-@@ -139,3 +140,4 @@ GNOME.generate_gir(
-         include_directories : ROOT_INCLUDE_DIR,
-         install : true
- )
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index a10fc603..2eaa7ff9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,2 +1,3 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
-+option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 585c26aea9d3..a6dcc1d161dc 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,11 @@
+AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
-AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5
+AUX gn-gen-r2.patch 2410 BLAKE2B baec5c55e7fbcb2f98128ec8f43bcbc154b0cd8c5348ccbb964020d8ff36117d83078630ba6b952e6860e7dd7d99a0563a8eb7db39f9fea2b30b11a782c10029 SHA512 ca43a150c8f1902b4ae777a8b015403f2cddd63aa9597dc5f9c527928b6820264e4f9cce9179fedc739e12171e47076b05a8ea686107e7c7c9bf2eab4458bb04
+AUX gn-numerics-arm.patch 7056 BLAKE2B c14f25fa03b5d31aa057d0992ff408176168afef0acc4867f345b4f52b513fc726afb458e0a3e9b45340892e497c03cce1d9bf8da10c90c83d8f6a9cbb9aa031 SHA512 051508e5917775a6ae11d03c69cb4b5260b4eae35a805715204e121cc112f888ff6026a041a942fe49feb59b21a5c7e31cb1a07de63a3d365f7ca13cb13cffdd
+DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
-DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
+DIST gn-0.1479.tar.gz 909494 BLAKE2B 5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f SHA512 2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a
+EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1544.ebuild 1195 BLAKE2B a8476c5c8a3c0cde6dc09e87635764327e95f550977a98d46e1bcfa21255775a95ae999390cb0bcebd60e801c7252fac48d64daf4ca0ea134d68a3cc1db1f457 SHA512 999dc0bc2ee0559259649e19a26372f858e7fb32ce2e3acbff486e890076864d702a3bf203f1e92e5dab54ad0a59895e2b13d691ccba47888d7c9f1c626a2ea4
+EBUILD gn-0.1479.ebuild 1230 BLAKE2B b3207bdea28d83aef19a657017d8715d6ed8b730e479c3155b0f5b93f7e799f34841195f72b773292006197525cc33fe48b6fe5e08db169327d1f4a126dc2f96 SHA512 27f0e899a344f5ba7c30a84d229044632c86372c8308179bf6f6ecc66dca2a846c76c0b5e6d07440ac1d64db429097a0c8dd0cce3c33d0701eae35f547d3e21b
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r0.patch b/dev-util/gn/files/gn-gen-r0.patch
new file mode 100644
index 000000000000..d30af3ab4ac6
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r0.patch
@@ -0,0 +1,51 @@
+diff --git a/build/gen.py b/build/gen.py
+index fce8fb18..2927da5f 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -260,17 +260,12 @@ def WriteGNNinja(path, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+       cflags.extend(['-fdata-sections', '-ffunction-sections'])
+       ldflags.extend(['-fdata-sections', '-ffunction-sections'])
+       ldflags.append('-Wl,-dead_strip' if is_mac else '-Wl,--gc-sections')
+-      # Omit all symbol information from the output file.
+-      ldflags.append('-Wl,-S' if is_mac else '-Wl,-strip-all')
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.append('-pthread')
+ 
+     if is_linux:
+       if linux_sysroot:
+@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot):
+         # probably resolve this and (re-)add a way to build against libc++.
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+-      cflags.append('-stdlib=libstdc++')
+-      ldflags.extend(['-static-libstdc++',
+-                      '-stdlib=libstdc++',
+-                      '-Wl,--as-needed',
+-                     ])
+-      libs.extend([
+-          '-lgcc_s',
+-          '-lpthread',
+-      ])
+     elif is_mac:
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/files/gn-gen-r2.patch b/dev-util/gn/files/gn-gen-r2.patch
new file mode 100644
index 000000000000..701a317bf023
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r2.patch
@@ -0,0 +1,70 @@
+From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Oct 2018 20:34:07 -0400
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index 11c92460..b186e3b0 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         # Garbage collection is done by default on aix.
+         ldflags.append('-Wl,--gc-sections')
+ 
+-      # Omit all symbol information from the output file.
+-      if platform.is_darwin():
+-        ldflags.append('-Wl,-S')
+-      elif platform.is_aix():
+-        ldflags.append('-Wl,-s')
+-      else:
+-        ldflags.append('-Wl,-strip-all')
+-
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.extend(['-pthread'])
+ 
+     if platform.is_linux():
+       if linux_sysroot:
+@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+       ldflags.extend([
+-          '-static-libstdc++',
+           '-Wl,--as-needed',
+       ])
+-      libs.extend([
+-          # These are needed by libc++.
+-          '-ldl',
+-          '-lpthread',
+-      ])
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.19.1
+
diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r3.patch
deleted file mode 100644
index 362a6854a264..000000000000
--- a/dev-util/gn/files/gn-gen-r3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
-Subject: [PATCH] Remove unwanted cflags/ldflags parameters
-
----
- build/gen.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/build/gen.py b/build/gen.py
-index a7142fab..06d5e2b3 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      if options.no_strip:
--        cflags.append('-g')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-         '-fdiagnostics-color',
-@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options):
- 
-     if platform.is_linux():
-       ldflags.extend([
--          '-static-libstdc++',
-           '-Wl,--as-needed',
-       ])
--      # This is needed by libc++.
--      libs.append('-ldl')
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
--- 
-2.21.0
-
diff --git a/dev-util/gn/files/gn-numerics-arm.patch b/dev-util/gn/files/gn-numerics-arm.patch
new file mode 100644
index 000000000000..f822cdb40852
--- /dev/null
+++ b/dev-util/gn/files/gn-numerics-arm.patch
@@ -0,0 +1,201 @@
+From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Mon, 10 Dec 2018 10:27:20 -0500
+Subject: [PATCH] Add missing headers for ARM
+
+Bug: https://bugs.gentoo.org/672862
+---
+ base/numerics/safe_conversions_arm_impl.h |  51 +++++++++
+ base/numerics/safe_math_arm_impl.h        | 122 ++++++++++++++++++++++
+ 2 files changed, 173 insertions(+)
+ create mode 100644 base/numerics/safe_conversions_arm_impl.h
+ create mode 100644 base/numerics/safe_math_arm_impl.h
+
+diff --git a/base/numerics/safe_conversions_arm_impl.h b/base/numerics/safe_conversions_arm_impl.h
+new file mode 100644
+index 00000000..da5813f6
+--- /dev/null
++++ b/base/numerics/safe_conversions_arm_impl.h
+@@ -0,0 +1,51 @@
++// Copyright 2017 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
++#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
++
++#include <cassert>
++#include <limits>
++#include <type_traits>
++
++#include "base/numerics/safe_conversions_impl.h"
++
++namespace base {
++namespace internal {
++
++// Fast saturation to a destination type.
++template <typename Dst, typename Src>
++struct SaturateFastAsmOp {
++  static const bool is_supported =
++      std::is_signed<Src>::value && std::is_integral<Dst>::value &&
++      std::is_integral<Src>::value &&
++      IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value &&
++      IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value &&
++      !IsTypeInRangeForNumericType<Dst, Src>::value;
++
++  __attribute__((always_inline)) static Dst Do(Src value) {
++    int32_t src = value;
++    typename std::conditional<std::is_signed<Dst>::value, int32_t,
++                              uint32_t>::type result;
++    if (std::is_signed<Dst>::value) {
++      asm("ssat %[dst], %[shift], %[src]"
++          : [dst] "=r"(result)
++          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32
++                                            ? IntegerBitsPlusSign<Dst>::value
++                                            : 32));
++    } else {
++      asm("usat %[dst], %[shift], %[src]"
++          : [dst] "=r"(result)
++          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32
++                                            ? IntegerBitsPlusSign<Dst>::value
++                                            : 31));
++    }
++    return static_cast<Dst>(result);
++  }
++};
++
++}  // namespace internal
++}  // namespace base
++
++#endif  // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
+diff --git a/base/numerics/safe_math_arm_impl.h b/base/numerics/safe_math_arm_impl.h
+new file mode 100644
+index 00000000..a7cda1bb
+--- /dev/null
++++ b/base/numerics/safe_math_arm_impl.h
+@@ -0,0 +1,122 @@
++// Copyright 2017 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
++#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
++
++#include <cassert>
++#include <limits>
++#include <type_traits>
++
++#include "base/numerics/safe_conversions.h"
++
++namespace base {
++namespace internal {
++
++template <typename T, typename U>
++struct CheckedMulFastAsmOp {
++  static const bool is_supported =
++      FastIntegerArithmeticPromotion<T, U>::is_contained;
++
++  // The following is much more efficient than the Clang and GCC builtins for
++  // performing overflow-checked multiplication when a twice wider type is
++  // available. The below compiles down to 2-3 instructions, depending on the
++  // width of the types in use.
++  // As an example, an int32_t multiply compiles to:
++  //    smull   r0, r1, r0, r1
++  //    cmp     r1, r1, asr #31
++  // And an int16_t multiply compiles to:
++  //    smulbb  r1, r1, r0
++  //    asr     r2, r1, #16
++  //    cmp     r2, r1, asr #15
++  template <typename V>
++  __attribute__((always_inline)) static bool Do(T x, U y, V* result) {
++    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
++    Promotion presult;
++
++    presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
++    *result = static_cast<V>(presult);
++    return IsValueInRangeForNumericType<V>(presult);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedAddFastAsmOp {
++  static const bool is_supported =
++      BigEnoughPromotion<T, U>::is_contained &&
++      IsTypeInRangeForNumericType<
++          int32_t,
++          typename BigEnoughPromotion<T, U>::type>::value;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // This will get promoted to an int, so let the compiler do whatever is
++    // clever and rely on the saturated cast to bounds check.
++    if (IsIntegerArithmeticSafe<int, T, U>::value)
++      return saturated_cast<V>(x + y);
++
++    int32_t result;
++    int32_t x_i32 = x;
++    int32_t y_i32 = y;
++
++    asm("qadd %[result], %[first], %[second]"
++        : [result] "=r"(result)
++        : [first] "r"(x_i32), [second] "r"(y_i32));
++    return saturated_cast<V>(result);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedSubFastAsmOp {
++  static const bool is_supported =
++      BigEnoughPromotion<T, U>::is_contained &&
++      IsTypeInRangeForNumericType<
++          int32_t,
++          typename BigEnoughPromotion<T, U>::type>::value;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // This will get promoted to an int, so let the compiler do whatever is
++    // clever and rely on the saturated cast to bounds check.
++    if (IsIntegerArithmeticSafe<int, T, U>::value)
++      return saturated_cast<V>(x - y);
++
++    int32_t result;
++    int32_t x_i32 = x;
++    int32_t y_i32 = y;
++
++    asm("qsub %[result], %[first], %[second]"
++        : [result] "=r"(result)
++        : [first] "r"(x_i32), [second] "r"(y_i32));
++    return saturated_cast<V>(result);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedMulFastAsmOp {
++  static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // Use the CheckedMulFastAsmOp for full-width 32-bit values, because
++    // it's fewer instructions than promoting and then saturating.
++    if (!IsIntegerArithmeticSafe<int32_t, T, U>::value &&
++        !IsIntegerArithmeticSafe<uint32_t, T, U>::value) {
++      V result;
++      if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result))
++        return result;
++      return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
++    }
++
++    assert((FastIntegerArithmeticPromotion<T, U>::is_contained));
++    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
++    return saturated_cast<V>(static_cast<Promotion>(x) *
++                             static_cast<Promotion>(y));
++  }
++};
++
++}  // namespace internal
++}  // namespace base
++
++#endif  // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
+-- 
+2.20.0.rc2
+
diff --git a/dev-util/gn/gn-0.1445.ebuild b/dev-util/gn/gn-0.1445.ebuild
new file mode 100644
index 000000000000..8f8649a10435
--- /dev/null
+++ b/dev-util/gn/gn-0.1445.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r0.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+}
diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1479.ebuild
index 92d8f91252f3..89fd565c9595 100644
--- a/dev-util/gn/gn-0.1544.ebuild
+++ b/dev-util/gn/gn-0.1479.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r3.patch
+	"${FILESDIR}"/gn-gen-r2.patch
+	"${FILESDIR}"/gn-numerics-arm.patch
 )
 
 pkg_setup() {
@@ -32,8 +33,8 @@ src_configure() {
 	python_setup
 	tc-export AR CC CXX
 	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip
-	echo "$@" >&2
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
 	"$@" || die
 	cat >out/last_commit_position.h <<-EOF || die
 	#ifndef OUT_LAST_COMMIT_POSITION_H_
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 0400c19cddd2..0d7708168f60 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,4 +1,4 @@
 DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
-EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 518 BLAKE2B 43b71b02968c6c7d19318989deacd93cf1c321b826577d0aec62d7bdb85bb9e29fcf720d00bdfe9100f3c7168d4027fc2d311e84f799612f4984307610045169 SHA512 95fab76b6a205da4007c66ddef058ee56322d205e5b49591b2c083b3e4cbfaa832da16cd088034c5e0dc90e9e6cd0a6e16cdeed41c3c0e934017f978c265186f
+EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 519 BLAKE2B 5c576faa37c2eb4a79dc545ca1e7ee7161e620c8d2005b97cc0d7bb8accdb57e49d8bb0083e94849eba8e88b8602855f3fef8de23ef7dbe158e4cefdba6ceb70 SHA512 1f70c09b1cb788cb6ee42d9be9cf8eb81c9885345db6149d696df15c956aa3672861b981a77f0a810bb16909b0183df77e3d4f1b290c6440ab2e97c89db647fd
 EBUILD kdevelop-pg-qt-2.1.0.ebuild 489 BLAKE2B db137e6e9e0afca0484c28ddda0a309c31b7e3cc4a81a6307580001a755cd286ec183c6f87714c882d2d4fe4e1f5b5a385c6cb2b62909ba2288074e81f63e349 SHA512 2a715a11b24881f1829b717c46d4cdaf74a569f60056be30a7d8a6acb06f54ddddfbf72b2bed11daf6df93beff88999e300d17824030758b3a1fa1bbfedaf09e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
index d4ffaf98912f..48120d4e89e4 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 1db24f5e7eaa..28a6f4b7b9d1 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -2,5 +2,5 @@ AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a0
 DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
 DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
 EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
-EBUILD kdevelop-php-5.3.2.ebuild 1140 BLAKE2B 3b4e6ec59a99273e81cab99cc1c66545713cdf43b6c85cad2f68cea47d54f695ad42d4d8b05835f422f9286cd0b47b219e66f441a5bce0e8af4750d40fd12a34 SHA512 806f91ac484830cc1d806bb4798cd49a36d6757d6432406338b5c706c35933fa647a9480d3e5c179330d0ebc3073aea7c7e028fcbd355b715636ed0dfa806953
+EBUILD kdevelop-php-5.3.2.ebuild 1141 BLAKE2B 06962ec7c5dfee2c0eccf495e6caa2910ed030fa7ac0c6ebb5b9f41707ef7797706883bb643a36bf8b92b0af82ec171db6e316fe84394f4c1b3ad088329db225 SHA512 abcbf392fddb6b64b2d94a921fb488a93cfe6624c85f9e8082996d38498b6bd1df6118514f67b8392badeb730af46c7cbf7015e8636abe0da1fdcd811cee81c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
index 7b49bafddeef..730fe6342498 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index a008a2635fcc..b34db31bfbf1 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
 DIST kdev-python-5.3.2.tar.xz 1074980 BLAKE2B de19a603d9c0fbf870b271b16d98b676ad9246edbc62f926c63ec66f51806c52fdec0284b016b291599b80d68faeb7eef80f4b5efc7e8f12f6362948b1df05c2 SHA512 95d8e0e94bfad70fabad75e362f5483db897ba56980251a76af48df863c7277746704c826692a6cec854e60c97f3ea9791b1e162b7ea2f357d469715d0a74672
 EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
-EBUILD kdevelop-python-5.3.2.ebuild 1123 BLAKE2B cb7ccd001f86f71d9cd417128b698fd8ccb7597b815dd6dce1ca53c814a01a4cc91fe31612dbfb89b0b49569423eb31a9084122e7cd55caa1f0c03cba52aeecc SHA512 11b0a13faff2f08c6e6047ac687a1f9451e59a9f8130e5aa913021910795623d150df18bfa2c65202c6d26f1a439f95ccabed9beb95f45a438ba158de6d00b95
+EBUILD kdevelop-python-5.3.2.ebuild 1124 BLAKE2B e37cecd3a7173dc1b347413b6e71e37c9c6ed56b3e2d2f5a868f948853e8bca6210085d25b5d18dcdc19cfbf3b34aabed77c831cdff1e740390afbe485764a55 SHA512 5438d59b346a6ea75fbf5b8bd11ef00637c0356690678f600efd027f5bdacad6b505621937b7e2c6fe9f1e1ea2896ce69abfd8dc3398f1a63a7fbb9cc221b0f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
index fbcdbfea8f20..0a046b765fe7 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index b1e215e2cdfa..2d7b47067da1 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
 DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
 EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
-EBUILD kdevelop-5.3.2.ebuild 3830 BLAKE2B 6102ab1224f5cfb16884411ec5ec60d400d1ba2b18a188892152bdc62f7342bf3c82111b81d45e0fe7e0c1625b5ae9ed8cc5e39699e1abe6e08631fe32825bd7 SHA512 67f4c0e6c211e87cc0b75598bc34fe321d1d3d5913161f15ae18152cc55ff5413ee4d8f922ce5521445e612d9aef1fbc2d02ab0c24a6dac4841aba40efc917f2
+EBUILD kdevelop-5.3.2.ebuild 3831 BLAKE2B 6ddc23cf95ddf9fe4226e60ea5d462d3fe85fef6099f3687445acdb0d1ac4d02c9955e02fca0d1d771d7e9f6647d4bca3d006db1650413c6ceaec3c90e389e7b SHA512 cb55d0422b19db8d58efb22e55bcf3ed33bdcc1a7a1ea37ae122fcf91461c77ad68ea433cd4576d1ce1ff07c58af55c76b288841026955e0640957be5a0bdb00
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.3.2.ebuild b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
index c9380103bbc5..099fede3aacd 100644
--- a/dev-util/kdevelop/kdevelop-5.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4d649aefe9c9..968fc958048a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,10 +1,10 @@
 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
-DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
+DIST lldb-8.0.0rc5.src.tar.xz 19602752 BLAKE2B 4f861bf53b254d3b2496b954a566ae02fe043d938cc04b931c88237dbf593de42c1e51ace0f81280b9e646a2febe853f9be72bec8f91d351ba7f9fe3b4d46df9 SHA512 b10e57410b4414e9f373bb2486690108d6a83c8268c9fcc4e30af60f488bf0dec660c4556ff384cb12b0af29d3c9e5a05a9bf57a0bc9acd1d3c39cf071304440
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
-EBUILD lldb-8.0.0.ebuild 3010 BLAKE2B 3df47e43fda7564f0e86afe317e3489deba983ec81a349cba2886a13edf70e07e6367ecc85b06aa94a2044763db4357382cdad59ae720dac40c58d546c71391a SHA512 75974325d1a8883f8487725eb0144b5cf6f7e188abf9365dee2983c800cb508bd08e8aa8d017368c4805f87934c8df779aa6ec40e1b35a47c5bf226de7714a53
+EBUILD lldb-8.0.0_rc5.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
 EBUILD lldb-8.0.9999.ebuild 2960 BLAKE2B 39990504c70cab7761ae1e465bf257558488f3c90b5e07fcaa72e9b4c6e874e62e4d15ddadcb0fdb3924af3aaecec8f14b1747e1e3cf837c0b77b77b1b44f906 SHA512 68d1ff044126076e1962eb1a09eb0621a313ed92a7ba2fff6a9959f00f39b219ac6478113c641f0c55f3b687ea9ce7cf23ac7c6ebaad51788f162f639598fc94
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.0.ebuild b/dev-util/lldb/lldb-8.0.0_rc5.ebuild
index 1da6e6ba172b..cab280bed822 100644
--- a/dev-util/lldb/lldb-8.0.0.ebuild
+++ b/dev-util/lldb/lldb-8.0.0_rc5.ebuild
@@ -16,8 +16,8 @@ LLVM_P=llvm-${PV/_/}.src
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 4ad9c4dc4c6b..be19dea5b467 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,4 +1,3 @@
-AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0-r1.ebuild 1135 BLAKE2B ff8941c0feabd90eee02ef1ded88406a500332681aef34b2f3a244319ab7d0949e64b9c095dbd5380038cf30b7649ae98b4245c289ea7133d7ff8b8045b70018 SHA512 085d20a0f29457c9c103ef1f5ac9e4d7a391a1eed6c2d1f48901db2c0031b6749aac5b87f1cad73d684868ae5ece9b9c35cd20ef0f471f8496f976965581ecad
+EBUILD massif-visualizer-0.7.0.ebuild 1111 BLAKE2B 141c0f6ef1200c2968483a6a11f9f1cba5332889e34f1d90c3ef3889d34b82e6003a96d77251859b946b700448aff5d40905618e865479741fee7879be5a93eb SHA512 53302d3a613bc323845a7a18c5fb3f2368eff015b5e6f7ee59466ef5bd50c0dfdf8e5a40654f2f596b182bd2f03dd976d1b7761acd0f9fa6933deea446ff67cf
 MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch b/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
deleted file mode 100644
index 57e27fc9b26b..000000000000
--- a/dev-util/massif-visualizer/files/massif-visualizer-0.7.0-fix-window-icon.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 51788c6f295651fecd3bb498236bbcf3c263ee84 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Sun, 20 Jan 2019 09:37:43 +0100
-Subject: Fix window icon for non-desktopfile WM to own icon
- "massif-visualizer"
-
----
- app/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/main.cpp b/app/main.cpp
-index c4526ba..21865e0 100644
---- a/app/main.cpp
-+++ b/app/main.cpp
-@@ -50,7 +50,7 @@ int main( int argc, char *argv[] )
-     aboutData.setOrganizationDomain("kde.org");
- 
-     KAboutData::setApplicationData(aboutData);
--    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("office-chart-area")));
-+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("massif-visualizer")));
- 
-     QCommandLineParser parser;
-     parser.addVersionOption();
--- 
-cgit v1.1
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
index bf0964314b2a..3879dd8ec904 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 KDE_TEST="forceoptional"
 inherit kde5
@@ -34,10 +34,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtxmlpatterns)
+	x11-misc/shared-mime-info
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 75033444216d..a7fdbc7b1522 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -2,5 +2,5 @@ AUX gentoo-helpers-r1.sh 299 BLAKE2B cac826ecdcf18d07b3bcc612f87090bcb26dc166f49
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 697 BLAKE2B 803dfa0b661778a40fc84e6e216503ea4b5dd3b7c28cc6d3812ac2ed8905a8b6c56bfbcd56d48cbea15bbb32c3fa09b3348fbe2db9142c13ab8f564288df39a0 SHA512 91dc40f9542b22d2a3fe3b61b5d1f5eb457b78d6c72f9ecb53d24872e90e5a299d5c5d79f07aa3bdf44a9f2748dd515f3dc3a4b5784d538988dd121946b7e00e
-EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
+EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B c63a2ab3ffe66b359b717f1572bc3788ed125a50797d2f5c7fd83938c136edd72584b67c9f8c4a7b7b16346e13e890d7f93d388254be52046c678814496441ae SHA512 41643f9b47b979a04140b3d200b6f9d0c65ea873093fff4f7eb2e90bd545554c21664a83cab83fc2ca601afb72bfbce86b99f3ccd20422812149186cd88b5a09
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index 96a869ef6d7b..98224af8242b 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 8a0f75d4d79d..b0c2f10f748d 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,4 @@
 AUX 3.28.1-fix-nosystemd-build.patch 1336 BLAKE2B f6292baad803ceca64be6a3b32793ecc4c1f99a946f247af7e79ef3ec421657230a7c473b219e9286a385c5ca25826aa192275ad1a3e1b78f2badb45a97e2c80 SHA512 d9a5c46b778835ba15c349e8458cb2dc6d950f1ad3008d0d089b5bb2235b15c4e461f9bbeb54a76085f59bf53873e671cdfcbf09c5f6f9c99251abef236b2aa1
-AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
 DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
 DIST sysprof-3.28.1.tar.xz 380720 BLAKE2B 0a3b93659e421b717230bff6e90d20b28f8abc8491fddb51bc3f106b6cd8b038254e1fd0260c6eee2c2b83d77765be43f394d49bd34c054c36d6427ef419fefa SHA512 ca75c279bcb8cb37bffdba51d5b3481c3ece104847b64c0b8cb534468c9350a96c7224bf261ef892817e53aff2cff90a2b808f5db5a9afd6230721664b83809b
@@ -7,6 +6,5 @@ DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95a
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
 EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
 EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
-EBUILD sysprof-3.30.2-r1.ebuild 2213 BLAKE2B 746f85bb79f993ef84c21c1e882fbc74ad2b0eced6c5b7e5a1ee1c495ae9ca49cc08ed2022638f4798bb8178ae0e6b87214993d5f7ba2b0f700c81db27e7ace5 SHA512 4ee7b8b74ba7f3a23f3020a3860e79b8078b80bc0fc4f9f995ecf760b3bbe12eed7a5bf71be82ddea97df79650e05c1187ef37203d4d3f70c2f980925280b620
 EBUILD sysprof-3.30.2.ebuild 2078 BLAKE2B 16e63e53f4669f64be0e1d1d9e1dafbc5d04f65962a3f3e4ddd3015cb87dde0c1f53ea78cea895ccbf222926c05620fd2650149c701e0743326f5d6a88ab5777 SHA512 376ade85ba12c517d755535c16c23181dbe4b8ecb383bdf511d94074b8c09809d791a90a96bd42cadd571af6dd96e3b3005c6c0a8dea8d6d6ece05ef26bf92fd
-MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
+MISC metadata.xml 729 BLAKE2B 06e0c5194be5a6241062ee78bad2d2b5d0c58643657b2626c644d9f4aa14880b97340e2c87480a3e23eb297c3c3d08bba74ad45cee4b15d248bd0bb647cc7bac SHA512 4aa6b8b04ba7f008bc5e4de81cfed88efe2714c4330ce3d02433fde3d253063f5a7e17e6384ba2213d0e6421f15875943133d670b6ba5effb739d81914b3f0de
diff --git a/dev-util/sysprof/files/3.30.2-elogind.patch b/dev-util/sysprof/files/3.30.2-elogind.patch
deleted file mode 100644
index 2a57fff3a9c6..000000000000
--- a/dev-util/sysprof/files/3.30.2-elogind.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b30057251d3f2b5860b36505fed440a6bebe0359 Mon Sep 17 00:00:00 2001
-From: Shiba <not@telling.you>
-Date: Wed, 19 Dec 2018 00:37:57 +0100
-Subject: [PATCH] elogind support
-
----
- daemon/meson.build | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index d0cf87c..c7f85d7 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -11,8 +11,17 @@ sysprofd_sources = [
- # NOTE: This is used in data/meson.build
- pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
- 
-+# Check for sd-bus support either by systemd or elogind
-+sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
-+if not sdbus_dep.found()
-+  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
-+  if not sdbus_dep.found()
-+    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
-+  endif
-+endif
-+
- sysprofd_deps = [
--  dependency('libsystemd', version: '>=222'),
-+  sdbus_dep,
-   dependency('glib-2.0'),
- ]
- 
--- 
-2.18.1
-
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 70135f654431..5ea946de4371 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -12,9 +12,7 @@
 	In fact they don't even have to be restarted.
 </longdescription>
 <use>
-	<flag name="elogind">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-auth/elogind</pkg> for sd-bus API.</flag>
 	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
-		Relies on <pkg>sys-apps/systemd</pkg> for sd-bus API.</flag>
+		Relies on <pkg>sys-apps/systemd</pkg> running as the init system.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild b/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
deleted file mode 100644
index 11bffd1beddd..000000000000
--- a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="elogind gtk systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	elogind? ( >=sys-auth/elogind-239.3 )
-	systemd? ( >=sys-apps/systemd-222:0= )
-"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-elogind.patch )
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "Without systemd or elogind, sysprof may not function when launched as a"
-		elog "regular user, thus suboptimal running from root account may be necessary."
-		if use gtk; then
-			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}