gentoo resync : 21.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
commit: 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree: f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-util
parent: 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)
66 files changed, 578 insertions, 521 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5fcbe0b775c9..0eeeccee0240 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index f67e08029d5c..25bca8f456dc 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,6 @@
+AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
 DIST android-studio-ide-173.4819257-linux.zip 894877040 BLAKE2B 159d57c0c0d6d6958d1a08e7ff4ff0314c0cb2b15c5126dd3d357e1dc696d32dfee78ae6b2d35a628cbf000bc014d61c20ad48acce12c10356b0db8183c27318 SHA512 c399897bc85ce1399ac8ce1df4749d7f1bff4501cb90b13efbd61a56173ab1f6f9b0c7c1f852dceb7a76bc631d83ca4efab9b39c4d3c76e3b4454f4803611251
 EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
-EBUILD android-studio-3.1.3.0.173.4819257.ebuild 2946 BLAKE2B 8c832ef656ab9e82c5e48613724674fb48086b04faa1a856b1f1b8874ae775a874c74ebf695a9b27298cb4f6a1e60c354940be8ed57f85f037ce8d161175c331 SHA512 419443ce002b2bb60105681a5fb622265eb47e19dc6e9a9cf23488eaa33350abe95aee15707c5c989f938ae94d7b785fca32963f28b624ec21392f374970c65a
+EBUILD android-studio-3.1.3.0.173.4819257-r1.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild
index 1ac8561ea03c..2659a27fd7b7 100644
--- a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild
+++ b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild
@@ -62,11 +62,14 @@ RDEPEND=">=virtual/jdk-1.7
 	>=x11-libs/libxcb-1.9.1
 	>=x11-libs/libxshmfence-1.1"
 S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
 
 src_prepare() {
+	eapply "${PATCHES[@]}"
 	eapply_user
+
 	# This is really a bundled jdk not a jre
-	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+	rm -rf "${S}/jre" || die "Could not remove bundled jdk"
 
 	# Replace bundled jars with system
 	# has problems with newer jdom:0 not updated to jdom:2
@@ -98,6 +101,7 @@ src_install() {
 	doins -r *
 
 	rm -rf "${D}${dir}/jre" || die
+	dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
 
 	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
 	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
diff --git a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
new file mode 100644
index 000000000000..6f97c7d3f925
--- /dev/null
+++ b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
@@ -0,0 +1,39 @@
+Use JAVA_HOME before bundled jre
+
+Must keep bundled jre symlink around in case "Use Embedded JDK" is selected
+
+https://bugs.gentoo.org/613868
+https://bugs.gentoo.org/660404
+
+--- android-studio/bin/studio.sh	2018-07-20 13:43:12.339049033 +0800
++++ android-studio/bin/studio.sh	2018-07-20 13:43:38.494932028 +0800
+@@ -73,6 +73,14 @@
+   fi
+ fi
+ 
++if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
++  JDK="$JDK_HOME"
++fi
++
++if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
++  JDK="$JAVA_HOME"
++fi
++
+ if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then
+   BUNDLED_JRE="$IDE_HOME/jre64"
+   if [ ! -d "$BUNDLED_JRE" ]; then
+@@ -83,14 +91,6 @@
+   fi
+ fi
+ 
+-if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
+-  JDK="$JDK_HOME"
+-fi
+-
+-if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
+-  JDK="$JAVA_HOME"
+-fi
+-
+ if [ -z "$JDK" ]; then
+   JDK_PATH=`which java`
+ 
diff --git a/dev-util/appinventor/Manifest b/dev-util/appinventor/Manifest
index 8ffb8c3d070c..5d230a58c67d 100644
--- a/dev-util/appinventor/Manifest
+++ b/dev-util/appinventor/Manifest
@@ -1,3 +1,3 @@
 DIST appinventor-setup_1.1.tar.gz 85941449 BLAKE2B 35369899c93b9df1f594e9bb34883707e99685392578d46001b30857a368c0661fc48eff3877adaa169361063323239012e0b9305386df08bf5048782977f767 SHA512 fb04e6dda57e55602cc1f1a556062b7468ce9386c35710f3e84394500077c50bb7969b909cff785c100c46620794daa943c80f5feef22756a6ef8f809cf383e7
 EBUILD appinventor-1.1.ebuild 852 BLAKE2B 7ea24546f9c02628cc234841d3ad2a93a6be431baf18713ce3822c425493a903a0a2faac39fbeafee8c64c45221a6e6810ee922fd12389bbaa35e2d9a5c925b5 SHA512 670fe6d12b830f964d33510c95b1055a166e16e935cc9066d098c66d5149bdb97bb512faabc49cc1b8a22257db13f87731875eaa09d74443c4e4f1e92513d70d
-MISC metadata.xml 467 BLAKE2B aa23438d2e3d170a0e105ea60ab8ea153fb0d332aefc5d4f0da32d928d4a0a45ab8bba9f2312d7379893707161829cb13ec3d3682005752be52305643a4417b3 SHA512 299434ef32fc681ffa14021b39524deefd1f21d454b446b57693876feb6addee47c966aecf3111119ff1cb65437e5a12e3ca14ab92acb609ab08675aecfc796e
+MISC metadata.xml 360 BLAKE2B a3f001a8ada9ad893348d39ea6d7003d1550bc34df0b4e4d5faa18b927824a1eb270f01e33a206491b9ea0e86bd1897ffc306d0a2b5388f53b5b1e5820b3db26 SHA512 b119dabacd1c80be435e61576233e8c0dbc64eccf2c6155a0aa769c576e9a29764ea7ed0639740f1c9784d980fcb51ca41cb3fa0cd3d3781b6926f850e4c7168
diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index b20d56f2f1c4..20e656c4650e 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -5,10 +5,6 @@
 	<email>gentoo.power@gmail.com</email>
 	<name>Iván Atienza</name>
 </maintainer>
-<maintainer type="person">
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index 6dc0a9f83fd5..ba693c309ae8 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -1,3 +1,5 @@
 DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
+DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
 EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
-MISC metadata.xml 1068 BLAKE2B 998f8032d11dfb6271d2fa37e6b56b66c3cbde70690a4eaac731e4cfd3a17c91bb0a3787f6001ad8fd8f213edfdca433ef9ab1d577257bd8fe490dacbe9fd4d3 SHA512 f5ab34d1cf7d68f1b79f379e6edf08533d0621ad06144d906160ad223df351713077dd1d26751fbb1995d4561f90862ce1104be279348079d2e01294c9ba716e
+EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
+MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
diff --git a/dev-util/bitrise/bitrise-1.19.0.ebuild b/dev-util/bitrise/bitrise-1.19.0.ebuild
new file mode 100644
index 000000000000..2cb6e23d9810
--- /dev/null
+++ b/dev-util/bitrise/bitrise-1.19.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-util/envman-1.2.0
+>=dev-util/stepman-0.10.0"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
+}
+
+src_test() {
+	export PULL_REQUEST_ID=""
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/bitrise
+	dodoc README.md
+	use doc && dodoc -r _docs
+}
diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml
index d00260bae974..c4961be108e0 100644
--- a/dev-util/bitrise/metadata.xml
+++ b/dev-util/bitrise/metadata.xml
@@ -14,6 +14,6 @@
 		<bugs-to>https://github.com/bitrise-io/bitrise/issues</bugs-to>
 		<changelog>https://github.com/bitrise-io/bitrise/blob/master/CHANGELOG.md</changelog>
 		<doc>https://github.com/bitrise-io/bitrise/blob/master/README.md</doc>
-		<remote-id type="github">bitriseio/bitrise</remote-id>
+		<remote-id type="github">bitrise-io/bitrise</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 969fe48cec64..e6c07db2f004 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-console-view-0.9.13.ebuild 1143 BLAKE2B 97ebe285e528c2ba2123f343
 EBUILD buildbot-console-view-0.9.15_p1.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 EBUILD buildbot-console-view-1.1.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 EBUILD buildbot-console-view-1.1.2.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
-MISC metadata.xml 771 BLAKE2B ad890754ce96954df2723ffe6302a5eee847230b91df1dd3658ada80aea2d6bd92fdfe65cf21d5aff257d8e736635410642deb48fe7769a5651a5073f6ac42e4 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f
+MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/metadata.xml b/dev-util/buildbot-console-view/metadata.xml
index a12007494aec..0ac5c019b302 100644
--- a/dev-util/buildbot-console-view/metadata.xml
+++ b/dev-util/buildbot-console-view/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 		The buildbot-console-view plugin is the user interface code used to
 		display information about the builds to the console.
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 67a5f6649c28..127274072eb7 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-grid-view-0.9.13.ebuild 1108 BLAKE2B 702acb9e8edca38ee219e85bfcc
 EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 EBUILD buildbot-grid-view-1.1.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 EBUILD buildbot-grid-view-1.1.2.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
-MISC metadata.xml 750 BLAKE2B 8f279073c8c3a1f6a12ab347198a6ed24692d1ab0271bfdbe479da28aaee5c51843218a93b18ab901bbf78a2c36af5940cd2bef9273c9402076b88bb46a5a104 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3
+MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/metadata.xml b/dev-util/buildbot-grid-view/metadata.xml
index c5790cf414b4..876330a1b4c0 100644
--- a/dev-util/buildbot-grid-view/metadata.xml
+++ b/dev-util/buildbot-grid-view/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 		The buildbot-grid-view plugin is the user interface code used to
 		display information about the builds.
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 5102455cc105..04829ad8d76b 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -9,4 +9,4 @@ EBUILD buildbot-pkg-0.9.13.ebuild 1070 BLAKE2B 1d580c2f59c4f9540d69a1a4fb9eac94a
 EBUILD buildbot-pkg-0.9.15_p1.ebuild 1149 BLAKE2B 21ae9a3d626a5ffe3fa8b74411a91108f1b8b13b16d6894c6d2394809f45b5007bc084bf0c47740f5723500695e8673a00734156df91bd1ae69f22862d7ddada SHA512 eaec282d3963e29742e7f71a84593d0bd5f70314e0095631f0066bb75a898997917e97b3ae070f231e911711ed66533020ffbdaa75887a5109ebc0e1c90c983f
 EBUILD buildbot-pkg-1.1.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
 EBUILD buildbot-pkg-1.1.2.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
-MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
+MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/metadata.xml b/dev-util/buildbot-pkg/metadata.xml
index 0661cac6ea60..f15869d650cd 100644
--- a/dev-util/buildbot-pkg/metadata.xml
+++ b/dev-util/buildbot-pkg/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index e50f3d398ef7..8b55da3f23d5 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -3,4 +3,4 @@ AUX buildslave.initd 1140 BLAKE2B 45de77ef9400a19b98ebac2ebd7f438354466ef4a2fce4
 AUX buildslave.service 386 BLAKE2B e50acd31037a91f439330f09e74321e7b8eff67711357c28d661b124fbc36e434a1707629d4ffe151dbf53a7a5600004c3928b511c0aeda672be66e9e492fe18 SHA512 53d9ac95006fb4e43e0bfa82c935e17c577cd292c8fea373247e4cd9bb21843f2f82971ffd37f50aa16fe258139c22adbe24570e3017fa529f2258a1d395d8dd
 DIST buildbot-slave-0.8.12.tar.gz 118339 BLAKE2B e516a8fd212d92e1cb1ed9bc11d70aa4baaea70fd1aa7f4fa239ed1160da51b96391d252643a13a72786d0b676e0e1780d31f998da7b3f90f1b73b32adb6b6c2 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc
 EBUILD buildbot-slave-0.8.12.ebuild 1564 BLAKE2B 17ac47bee796bc8f105cbd47eaf6f781190fe3eacac607f8affb9b690c00bd70733218d4661a8ed611824dcb3c085537ed6e535a607da83f08ecf153bce375d6 SHA512 e888c3fc0525d406778e51507bffb09f63f8ce553b615bf146a24cf1d91c981e56eee6c4e60ee144d6c30089f58ec1e5559873ae35f9e02dd9bfb23224a09f72
-MISC metadata.xml 384 BLAKE2B 90622968905729ec77151f4afd2ffc7b0561ef1eecc45f1986fccaa0281ae547d3fb88a9d9a63502935070dabd9a0109aa5af76b35132d70b60455d1db8f3864 SHA512 339c2747b1d392528c2b53934ed652574db095407cba130d0c8deac06570dce89e01f5fafb1e9ebe585c88ee3cdcc9f16747c08cdeace6ad47ebdff7f9d5302a
+MISC metadata.xml 301 BLAKE2B 122bc8d64dedeaf54418cbcf52e271379fb281900ec2bd0a4dac3aca8ba73b1d6ac46449e785cdfb0002bad8616b9d1c1792bd4fd591d094acd870605250ab3e SHA512 c343471dc7c2e104e7af1d713055d56bdf813796f6a488e51c1d4a3c732593660383f73735647015e780409839caa2ec0724cf961ab28f76d668b1568781319d
diff --git a/dev-util/buildbot-slave/metadata.xml b/dev-util/buildbot-slave/metadata.xml
index 87ac9774fee6..e2d85b41a414 100644
--- a/dev-util/buildbot-slave/metadata.xml
+++ b/dev-util/buildbot-slave/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>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">buildbot-slave</remote-id>
 		<remote-id type="github">buildbot/buildbot</remote-id>
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 684752202c84..56a844a28f08 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-waterfall-view-0.9.13.ebuild 1147 BLAKE2B 0d51cace1706245d4d0ae4
 EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 EBUILD buildbot-waterfall-view-1.1.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 EBUILD buildbot-waterfall-view-1.1.2.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
-MISC metadata.xml 791 BLAKE2B 4e469a57580b4fda1bcbbde4580bdfd8e19769784a1760ddbd08b9c79ebdacab273be9871d87afe32f21f12efc2697f53f02367672660932faddb230fb8981de SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13
+MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/metadata.xml b/dev-util/buildbot-waterfall-view/metadata.xml
index fbcb11072aa4..d5c5ab57b9a9 100644
--- a/dev-util/buildbot-waterfall-view/metadata.xml
+++ b/dev-util/buildbot-waterfall-view/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 		The buildbot-waterfall-view plugin is the user interface code used to
 		generate the web pages used to display information about the builds.
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 45cbff5d027b..300cf04881fc 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -12,4 +12,4 @@ EBUILD buildbot-worker-0.9.15_p1.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a6
 EBUILD buildbot-worker-1.1.0.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 EBUILD buildbot-worker-1.1.2.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 EBUILD buildbot-worker-9999.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
-MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
+MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 113a011b29b3..04061719612a 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -1,11 +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>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index faf791e2e21c..f97f86a7f6d2 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1152 BLAKE2B 6154f9831fe307b66f29f
 EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
 EBUILD buildbot-wsgi-dashboards-1.1.0.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
 EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
-MISC metadata.xml 790 BLAKE2B 5441af355527235e9e12079b22918db4beca4cb79b2d479436ba050039e9d9de6971ccca8365b4fb7010408b00601b1a8095b3d8c23639cf0612a9baacd89dec SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b
+MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/metadata.xml b/dev-util/buildbot-wsgi-dashboards/metadata.xml
index 5635b23b831e..b97bf609846d 100644
--- a/dev-util/buildbot-wsgi-dashboards/metadata.xml
+++ b/dev-util/buildbot-wsgi-dashboards/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 		The buildbot-wsgi-dashboards plugin is the user interface code used to
 		integrate flask or bottle dashboards to buildbot's web interface.
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 84096fa13c5e..fbd042988d20 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-www-0.9.13.ebuild 1184 BLAKE2B b9347644e9be3d66a84c455da583ed296
 EBUILD buildbot-www-0.9.15_p1.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 EBUILD buildbot-www-1.1.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 EBUILD buildbot-www-1.1.2.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
-MISC metadata.xml 777 BLAKE2B 07ead3ebaabaa62d3d09fbe84329649742eb92d194eff89c94f422f14934e92130401daa97799e038152943e0055a3a4bef74815175a533d2821a07645c64bb4 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6
+MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/metadata.xml b/dev-util/buildbot-www/metadata.xml
index 55b76e0cd4dd..1f4ae627be1c 100644
--- a/dev-util/buildbot-www/metadata.xml
+++ b/dev-util/buildbot-www/metadata.xml
@@ -1,11 +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>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index beb6cab3853b..7e0b9d59b850 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -20,4 +20,4 @@ EBUILD buildbot-0.9.15_p1.ebuild 7238 BLAKE2B f5e70ab74c1e116335aa48bbe5349f3449
 EBUILD buildbot-1.1.0.ebuild 7352 BLAKE2B 4565a431c481ffb3681e3fb47c54daaaf5f2c34476f41e696df012a77960b920942014aaeec8220d59ff75f481986777c0a57304f953dfbab1f5e01616334cee SHA512 6fee92726755e6c0fb6f3f55277669518c2da4435b0dbd2d09fd656613269822c80740d06b5486f6dea8e40d6731176fd61ee5cbafdfc64b10e0eb7872168997
 EBUILD buildbot-1.1.2.ebuild 6550 BLAKE2B 88e1fb4d2acc8f6876629ad933c54e0574ba179788f33416ca00c40ada8f0d355d49f5675d19ba47003090ad5f8f556568b3b65354925df95a9be39655148328 SHA512 1db8c11e0622f7ccf0c7237e7404736c40d55233d2b56778a2b85b30dd9e26843d9ab2e3c9fe2c63467dfe54f28141323688eed1ee43e3a0f7e483fda71a3254
 EBUILD buildbot-9999.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
-MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
+MISC metadata.xml 1505 BLAKE2B d07e69e8ef573b7cf2a5575a19f3bd875058903e1fc59c4100a4300e72825c1fb137eb4b804a505a7ec1877b7fae91621e35e611964abea4062fad37a9c6cc29 SHA512 795f29b373d7fa6190fa61f2ffe986e1e1857b11cf68a787a09c7d5ea485c1e55cc7f745d2bf84de3c431e8e29f6176d094df92f760432e808ba2abe12c065bf
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index a40eac4867f1..924d82319f5d 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -1,14 +1,10 @@
-<?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>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2b3102fb1bbf..cc4deb0c7c6f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -10,5 +10,5 @@ EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e51
 EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23
 EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
-EBUILD catalyst-9999.ebuild 2017 BLAKE2B 6585dd0701822408252aa509890495d61051ddfc5ef8be2536c90c4bc66a363f7182794b2f49bb83712b958376ba33f9afb0f002513b78d91fa8315a5bb5c022 SHA512 33f88adf2a3e1bf9d5bd5fb45dc2e13d39d51214051d5a119044ab118cbafe955bd4237b2639fd407e774e76e7be03db75141a95401451d6f083de900e0f7ecf
+EBUILD catalyst-9999.ebuild 1993 BLAKE2B 055a409cbb3ac2c82f776c5613b0d9e09aee320fc6a9ad445f0738f10fb5334b2f49f975606203b6005370c568d5e1648aa9b286663439c34247c4eebce32081 SHA512 3e526426383b71b906be666f5cba15f8a9dbddf0836313acbd3ccadc08dad5bae445db81560a7e47bd23b1f2f6e7b885f6c677ce124a2782af4928a5263578bc
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 32ee71fab198..bc08ecaef51f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
 	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
@@ -18,7 +17,7 @@ fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit distutils-r1 multilib ${SRC_ECLASS}
+inherit distutils-r1 ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index e8e8597c7f15..3413cd10a53c 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,5 @@
 DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
+DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
 EBUILD catfish-1.2.2.ebuild 1500 BLAKE2B a2128982cf591a4c427620d61ba7d466f811dd617afba0358cee3248e934c8850d2c40f6dd63f6c742d6daec9bb2ec029beb489325538348f5bc5eeb904e1d64 SHA512 3166f58ed1488a8c58a60d9200160586dfeded3b3e1e19aa342330d9d7e58f9a5e094be49e82a6b1ca021614ab7e3897ea7606af33a00ee50fad3d32189ffbbd
-MISC metadata.xml 358 BLAKE2B 02912763b2bf6cc947760df34bdb4008dee9b3a049352cfda0d26b60a32810cd8d13016cb4fb89059741a3bd97fa3955c53d6770bfaa4c1a7b3feec05a86e393 SHA512 8fef7910e221beb2e0f0a83767feda119a1a3f27b36d6093d336813edfe954c4d08c99c4352ab5efec39de8b1c5185c39514bf31ebf1e6489110d8165e32b3f2
+EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 57b8baac3ba1aebd7aa7ca6abf50251e677beaa2fc9fadc405f358b33c24b32c8b4c4b28e25ad4ee96e802de815b0ea7a20a5b5c5f6a14525f664c117d0f7568 SHA512 29436a35dbd60cc9db378d5399be658b4d83773cad25594cdf4bb6b54c013bb66e1b1bc9dcdf01261cb99635e08e0c8d16e3ee0f4f34e3cf1e35f98ccf820e65
+MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.6.ebuild b/dev-util/catfish/catfish-1.4.6.ebuild
new file mode 100644
index 000000000000..034f5d1e4621
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index 0118196dd398..bbf3b7c2464b 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+		<email>xfce@gentoo.org</email>
 	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">catfish-search</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 08ca65b78523..053718eb5f05 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,5 +1,7 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
 DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
+DIST clair-2.0.4.tar.gz 5194393 BLAKE2B 631ab14acfcf516a5dd65753fe2088dbabf1c7d13a6b079cb09f0c6a3000b346da948d9c6edd16c999753342d67b9bb2165a1b38956ee8957b48953d10490430 SHA512 fee3b9fe2865c0e352b454767383bf47d67bd14f7d08171197350c20f32bc80eb318db10c9fd4bd9da0024dac97ae287cb8dcc7605c3094f4d567122bfe3f7ed
 EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
+EBUILD clair-2.0.4.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.4.ebuild b/dev-util/clair/clair-2.0.4.ebuild
new file mode 100644
index 000000000000..1cb27791309a
--- /dev/null
+++ b/dev-util/clair/clair-2.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/coreos/clair"
+EGIT_COMMIT="v${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Vulnerability Static Analysis for Containers"
+HOMEPAGE="https://github.com/coreos/clair"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/rpm
+	app-arch/xz-utils
+	dev-vcs/git
+	!!sci-visualization/xd3d" # File collision (Bug #621044)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc {README,ROADMAP,CONTRIBUTING}.md
+	insinto /etc/${PN}
+	doins config.example.yaml
+	popd || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e931436e979d..1eecbbd0bc7b 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -4,6 +4,7 @@ AUX cmake-3.0.0-FindBLAS.patch 1581 BLAKE2B 62493ac0ed23748be1913a919d88937c929e
 AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577
 AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad
 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
+AUX cmake-3.11.4-fix-boost-detection.patch 996 BLAKE2B 195ade40e279ca85ee55b1d46353f8809f68e405a6c914c34340825f7f77ec5cb78ebee3f7aa12cc6f026a802db4bc893ac8570a03b76af708ea2df7a3ecadb1 SHA512 66da91fb39286d1745af733a806f60db313ddb0a506b29509aba66259a57cf8abf65fcc871114c5a2cff91eb8c27ca346dd75fbd29f773fb2d31cfead827f250
 AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba040703958db0bc57cfc3a5359b2aa71beb8600b2d4232225612036d00bcb9b9cbbdbb5f357f4fae492b6ed960c1a2a59bac SHA512 ea9ec5fcebd5a5988f5588b20cbf7e547065db6616476500c1d2d89c8585cf2276f7ba4fb06e85aa85ed435f81ca276c44518ce8f9f0efb6fc363f82f3b1aba4
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
@@ -13,13 +14,11 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
-DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-DIST cmake-3.12.0-rc3.tar.gz 8089991 BLAKE2B 306faa1f3ef03fe4e9c35f9f131ad0de9c47cae12fa918647fb52dd3a9b80346b199ce0cb432beb5a79c1789214a0573c4bd6a0a7844c5797c82635c087a2586 SHA512 ef106fd3afaa118bca4d0cd62e348d02eafa17ba0ac04360572123e1e4e65c8ba7a83e0be0e56c8b600b693f4f0dd9aaa8a1ce9311a58fe65f10a2a599895591
+DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b SHA512 e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
 EBUILD cmake-3.11.4.ebuild 5974 BLAKE2B 833e3a47fcdad582c6d46eea9c3bea63ef4542f7ec7e5a75eb9ad62f340ce17a80e00e4375541da2a014746aeeef238999e9073dbe21edfa5915bafc91997073 SHA512 e1b1feb91dc95811783600e3a571b028ece865ee0f91f6b82b3e6fd190d350bff646292bb7b1082a65e769a8faa03d430271806102dd6d0731369cdfc8fcfd2c
-EBUILD cmake-3.12.0_rc3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.12.0.ebuild 5989 BLAKE2B 03f23bb64dad0671acd2c783417ace7c0606bfabbef079b69986d5ee2bf9401918f60c39250807d9f291b1aea9a0c93b74a6192b6d291fb12cd97ce07b2e8274 SHA512 e774802f962d6eb9717e1f99af8e5b23c9ed6ca46bd619d1305da0f745bb2b0ab231f0c90ba1155346bef3088bc3ff36391865abac32418f4ec9abcdd8f34dd2
 EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.3.ebuild b/dev-util/cmake/cmake-3.12.0.ebuild
index 050883851f5e..08668397d3fb 100644
--- a/dev-util/cmake/cmake-3.11.3.ebuild
+++ b/dev-util/cmake/cmake-3.12.0.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
 SLOT="0"
@@ -59,6 +59,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
+	# boost (#660980)
+	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
 	# upstream fixes (can usually be removed with a version bump)
 )
 
diff --git a/dev-util/cmake/cmake-3.12.0_rc3.ebuild b/dev-util/cmake/cmake-3.12.0_rc3.ebuild
deleted file mode 100644
index 050883851f5e..000000000000
--- a/dev-util/cmake/cmake-3.12.0_rc3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
new file mode 100644
index 000000000000..bcf229ad398c
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/660980
+
+--- cmake-3.11.4/Modules/FindBoost.cmake
++++ cmake-3.11.4/Modules/FindBoost.cmake
+@@ -1680,7 +1680,7 @@
+     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
+     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
+     # Gentoo
+-    list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
++    list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}")
+     # RPMs
+     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
+   endif()
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 8d1347b77d81..5f545f5a2414 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
+DIST cucumber-core-3.2.0.tar.gz 49868 BLAKE2B 511a1c12881ff6bbe9d1977e23c9ebb6bd6146e54de1f211f81f89fd8c4b71962ebb8c9784fb14910536ebec5b4e8d557c6dc69a356d92e034aaad7753ebfa5c SHA512 dcdbf8197b8945e165de3d32d440ca57c722a232b2c689778624e18e61f9be25d77f39d99b27b25645a37a4e72e1a774dec4cd9663f5e1e3eb1d0965c88dadec
 EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
 EBUILD cucumber-core-3.0.0.ebuild 802 BLAKE2B d969e10078b0127a60683db02e4124458cd9ee666a0143e7c484efcf3ee8e0dac3dd0465f07f3fd78e1b0a6348497769ea8b4a6e738dd5b0d90f143631e4d960 SHA512 48c3ba8925b5b7b09fcd2cddadddccbfc2749ce2bad8724d23006e37a8f0280b0d7d7aa4d4e0f41f41b54e429f12e993262a6bf85518cd212f9784ab689ef6ca
 EBUILD cucumber-core-3.1.0-r1.ebuild 976 BLAKE2B 35f0b120baf995712a7e2c21d2b1fe0c69a067466ca91795a5da3deed20991c4323b8e71cadf25b00b3cf4e543036bd24f59ce289de4dc5c800fb5bb86fd32e0 SHA512 890710ba3a5a91f996c1da8c9e6e0a11a539891db63155c98a2de0f54a66a201a06fb71070667282876d11c1e6e6866553ef3e8dbcb458323505fd5ef6c691e5
+EBUILD cucumber-core-3.2.0.ebuild 997 BLAKE2B 7cb250895e6702adeabccfcf9d453d6051f263fbcc5ee6bf246ed5724cb9e32530bcdfd821600342b749f86aa719d74141cd8d5b28e7f8e0df191f77fe19e598 SHA512 a1dcb11e157ce8fb4e1e7388dfb977b3b6eeb0f432d68b37395e03aa22e1a2a2159a036c815ac3a9caed97d11d4ecdf8d2306a572d73b26f2e7118fe3febff26
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild
new file mode 100644
index 000000000000..420d5a558337
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="$(ver_cut 1-2)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/backports-3.8.0
+	>=dev-util/cucumber-tag_expressions-1.1.0
+	>=dev-ruby/gherkin-5.0.0
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 85f2170f440a..03d612376078 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,9 +2,11 @@ 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.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
+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.ebuild 2647 BLAKE2B 6169a30d1088099f1f60fdd7f69511ee274aeef666e5a8191bdec4401339daaded672057d33e786110a2fed547cfb6b541a4a3be5a2ac81b9d7cd3b8951db2bd SHA512 f2aed1372c838cebdeba0cfb62040051a72b3d18e675b946c124e3c0ec803a41eb428504df63c0a4ae8c6a52dfb5a191ec71cedba8abe4a1a005eb3bb5ba8bd3
 EBUILD cucumber-3.1.0-r1.ebuild 2647 BLAKE2B d878d4265ac2bea4b53ffb3289a49e222a4e0a54543d196dd7461d770264f98637a47b0ddb1e52f2475af2ba7087959f427927eed82782fb6e43acc7f67901aa SHA512 7d4cf3e6c816ba46c831087919ac26145a69b2b65b24c1f76adf928de4be92f3a10f903e59018b733ac5dafebb03faded26c110591de424648eabebaae1c2178
 EBUILD cucumber-3.1.0.ebuild 2647 BLAKE2B a39172067580737b00f0e45119003068fd91fca2263b9d1078363b0eff8104d2c89d961c41af86b666f7dd904cea297f9e4600c2d636834ffce169602d823228 SHA512 d8421261bbfe1701356e5fc567e07d76980ecc23f96bdac3864c13b493082f7486b4653d99b182bfa2c1ae51e6ceefcabdd5b3466c086650799d98ff5980bda2
 EBUILD cucumber-3.1.1.ebuild 2655 BLAKE2B 96e9220a6868f3e8d06bc85d4fe9bf92ca9ceaa6d0c7628498c075f22cf80fd558ae271954a4007f8d8d382ef261b2d6fe4390421caabd1055d52a47da098952 SHA512 69f323164545f975dde2b2e2b05c16977291e02e3682fa4e474219266f28f6cb70a3f33b56a5515d63324291339e04c21b69d0bd361bf521191ace23882b07ec
+EBUILD cucumber-3.1.2.ebuild 2663 BLAKE2B 41c3fc62864bf37a0d3c6b2867269023b81c69bc5713eb0f0bba7138b9eec732b772f4b6607ea24bcf5d5d0250d9b9ab4a3f70fd93c3a85659df027b78e4918e SHA512 971f84ea474f6f52eb8de904f129884821f01e1f011ae80ccc932ca593343aaa12401bc68510ae9eb144a3b9731adddfb7a2c8533ecac01ee4ed611f17ac6dd9
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
new file mode 100644
index 000000000000..a6ce2c1b0135
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.2
+	>=dev-util/cucumber-expressions-6.0.1:6.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.3:0
+	>=dev-ruby/gherkin-5.1.0:5
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 07c249eb3687..98982495aba7 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,6 +1,9 @@
 AUX cutter-1.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
+AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
+DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
 EBUILD cutter-1.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
 EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
+EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
 MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
diff --git a/dev-util/cutter/cutter-1.6.ebuild b/dev-util/cutter/cutter-1.6.ebuild
new file mode 100644
index 000000000000..58addf198122
--- /dev/null
+++ b/dev-util/cutter/cutter-1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jupyter webengine"
+REQUIRED_USE="webengine? ( jupyter )"
+
+DEPEND="
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-util/radare2-2.7.0
+	jupyter? ( dev-python/jupyter )
+	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
+		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/dev-util/cutter/files/cutter-1.6-python3-config.patch b/dev-util/cutter/files/cutter-1.6-python3-config.patch
new file mode 100644
index 000000000000..51a811dbb33f
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.6-python3-config.patch
@@ -0,0 +1,20 @@
+--- a/src/Cutter.pro	2018-04-24 17:43:11.000000000 +0900
++++ b/src/Cutter.pro	2018-07-08 21:21:34.280748499 +0900
+@@ -74,11 +74,13 @@
+         LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+         DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+     } else {
+-        CONFIG += link_pkgconfig
+-        !packagesExist(python3) {
+-            error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
++        system(type python3-config) {
++            LIBS += $$system(python3-config --libs)
++            TMP = $$system(python3-config --includes)
++            INCLUDEPATH += $$replace(TMP, "-I", "")
++        } else {
++            error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+         }
+-        PKGCONFIG += python3
+     }
+ }
+
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
new file mode 100644
index 000000000000..1ba33a6f12f2
--- /dev/null
+++ b/dev-util/envman/Manifest
@@ -0,0 +1,3 @@
+DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
+EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
+MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
diff --git a/dev-util/envman/envman-1.2.0.ebuild b/dev-util/envman/envman-1.2.0.ebuild
new file mode 100644
index 000000000000..6713bc5a103a
--- /dev/null
+++ b/dev-util/envman/envman-1.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Environment variable manager for Bitrise CLI."
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
+}
+
+src_test() {
+	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
+}
+
+src_install() {
+	dobin bin/envman
+	dodoc README.md
+}
diff --git a/dev-util/envman/metadata.xml b/dev-util/envman/metadata.xml
new file mode 100644
index 000000000000..c93a133753ba
--- /dev/null
+++ b/dev-util/envman/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karol.wrotniak@droidsonroids.pl</email>
+		<name>Karol Wrótniak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Environment variable manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with stepman and bitrise. For a nice &amp; quick intro you should check: https://www.bitrise.io/cli</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bitrise-io/envman/issues</bugs-to>
+		<changelog>https://github.com/bitrise-io/envman/blob/master/CHANGELOG.md</changelog>
+		<doc>https://github.com/bitrise-io/envman/blob/master/README.md</doc>
+		<remote-id type="github">bitriseio/envman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 062d4b5805f1..6d4f547661ea 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,5 +1,5 @@
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1154 BLAKE2B 6f23d8b14d7b86023a5db01e36951d7fa222b690bf3d225f042254fd68e039995f0243a6edf085a2f83420be2204b35888e7eca81243f127b3bf8f167f230a61 SHA512 1b2d8ee90718a47e79b1063efe19e2ba35a4595a3f253a7d6061379b6fcecfdbbd1dd98cca2d08b5eddb1a52abc7a6002edb19398ce9e925aeb41775f828aa76
-EBUILD gtk-builder-convert-2.24.32.ebuild 1159 BLAKE2B 930dc6b5758e74c9f3a7396f25507c80f7f0c030f388a48d13e4549f45bec0c955d0e0b3f2cfc22c6444c14634d42e7d8c614d88efd5a072a318aeda3676d5bf SHA512 6e6a7108f689bdec90a867757437f162c0763a3b4728c16140249846878a403fa69240def9baae48b8bf0784b10db80f0078376f505b2a2eab6773bd344da0f7
+EBUILD gtk-builder-convert-2.24.32.ebuild 1156 BLAKE2B a16b6081216cfda17384802712b730639d882bee26f17f02023d99e2c89783367228e4e6a90be15b73d5ec4b7f5834909c02147365319746c09bd2740428e750 SHA512 1fe2f3dde5545da71fb33942e2d0b3658ae7d0df408217b4d62dd40df5aa2839960734d8c39ea36cda003c4711170d32958697d7f96393420bd49cfe4a615f32
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index c1e64dc5e034..1325db12a354 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d4a603fd70ab..38c484266405 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,14 +2,8 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.107.2.war 74568464 BLAKE2B b506199d2e56c3f88bdd295dd88b8644869c59e93689768376752b1bd54a5f5ccb8a56b32d9556a592b5567dc884cfa6d0049810f6a23304f5c1fa9026b31804 SHA512 c5abc515ac646904c44d06a31e253c5824096abb40af415357f47610354a793bd571310fed9e5596103c399a495a7b229a731509873a99795471459410db6411
-DIST jenkins-bin-2.107.3.war 74576216 BLAKE2B 2791f6fce3c6c331c47e55b72777c90c2323e6c53629ee92ccd6987c4557a713759f1a2fe2f6e882cec5536c6e1783c1fb9b740174e1ab3f89d56e97460ad4ef SHA512 29209b7359439f55c27127a946dbfcdc318407ee21de447b8f4864209e2076f0a16083dd501e3ead054b086af78f319e25979b7fd25847135d76deeb10a99fad
-DIST jenkins-bin-2.116.war 74606954 BLAKE2B 15d1a665eeb35694bc03bc54c8b5b623fc3ad40c492c5e8541a271396fb48fe9a67eefaa25665a2658dff0f3ce1bea51de23902a3f7297dc0621750c7c7d5f8f SHA512 ab2a41f848dae9bfcb3fc3a8dea2da4957cb919aa1cf0609bea238ef6670a973226e5da817f582e8d718700cd8e57c05384f6ef6cf9ad80e94c87813a5199373
-DIST jenkins-bin-2.121.1.war 74736772 BLAKE2B a5972bfd0a049065eec7f842482754de838e72db73eb846f4742273d356a0ad52adaf01dbf1c617d88d133502f78657488341b81aee42746b16e82a3250b143a SHA512 b87c8458a5db9e8a1b1a67cc8e36d224719d8460987a8b95f563619c5d662e6af8a3fc276d420f5520e541a0bee7211d2fe414caf11b4116c57ba214c687faa8
-DIST jenkins-bin-2.121.war 74737297 BLAKE2B 20d53c5869655331036ef5e18f94f71a0bda46f651b706bc61ae24083df72db285291478575662c52c661bc15c79e00e3f10e503f430aa5d23107f251f12d338 SHA512 4df05ad4abf0dd4fc40fbcb9dd8cdad985f6c3970ac4b777aeb5766a1ae45718b70929b71288e245f5e90541aa886c31c589dfdd006623759b7c6b5326e44118
-EBUILD jenkins-bin-2.107.2.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.107.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.116.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
-EBUILD jenkins-bin-2.121.1.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.121.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
+DIST jenkins-bin-2.121.2.war 74736956 BLAKE2B d63f49bad61bad216d06318c373951e99c46ff98bc0c9311fc123c9045d235131623436e3636db63bea0e95bf467040c755d0086612d69ea45b016e9dd39095a SHA512 b62b8cbb76997ded9442311204f7e43acfef57ed9949db19c05c382cb2171042ac41332d6372a45a7a5f46f295b21a6fd0533bd71e800fec7b0bf6b3e2998c8e
+DIST jenkins-bin-2.133.war 75341772 BLAKE2B 2e9ca1ba4cce14eb32157c0b3853b103b02d02c4ba7ab3cdc7308e1fe7b6210e70552ef52a1b92d107149d9c261de5ed8b74cbf044a6e8f09ca48b9ae7388d5c SHA512 f1fcbaa40e554d854efc59d8ebc03b9c9626ca065e79bb18fd671c0f25db5b0e1cf1e4341459eea1e4ece9f978da53f5b46425bd125453f8a7c7abc5551ad000
+EBUILD jenkins-bin-2.121.2.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
+EBUILD jenkins-bin-2.133.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.107.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.107.2.ebuild
deleted file mode 100644
index 95d08ad47b24..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.107.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.116.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.116.ebuild
deleted file mode 100644
index 4f30f3987712..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.116.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild
deleted file mode 100644
index 95d08ad47b24..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.107.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.2.ebuild
index 95d08ad47b24..3b701c29b1b9 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.107.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.121.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit user systemd
 
 DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
+HOMEPAGE="https://jenkins.io/"
 LICENSE="MIT"
 SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
 RESTRICT="mirror"
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.133.ebuild
index 4f30f3987712..bd24b8ebc145 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.133.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit user systemd
 
 DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
+HOMEPAGE="https://jenkins.io/"
 LICENSE="MIT"
 SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
 RESTRICT="mirror"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 025f0bc287da..64ac6f541e4a 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,11 +2,11 @@ DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a2
 DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72 SHA512 f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
-DIST meson-0.47.0.tar.gz 1246932 BLAKE2B 0191c383488132393fe3e3fb9e71ca0bb0906b8c856bfa72d6352b890246c14bacfe86f4f75c065b0d7197b30570dc63d53d0e7d6a0f25cafe0e85442e89c971 SHA512 02a9aa481c6cce011be9bd3ada523c45f503c70c1c6c8c826241c16a84c8ccbb06de2caced8c748850c24b7a696705c8c72847f935fd720edbd286235390fd94
+DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
 EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.46.0.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-0.46.1.ebuild 930 BLAKE2B 0a4fc99548ffbd679fff1f0f73ec2dafdc064193121530c35e4920a02028bce02bba87b98ae99dc00e80a22a9a42fba58921de504cb2e6492c32307fa2c89748 SHA512 7dac6a904163939d90b62f9c7f3664796612f20f078159b5c00900ada7c82db730f3cfeb01e31ef0f66d74eb96c0cf6c892cb408632116c4eab5a12fa5f1023f
-EBUILD meson-0.47.0.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
+EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-9999.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.47.0.ebuild b/dev-util/meson/meson-0.47.1.ebuild
index a02f93d684e4..a02f93d684e4 100644
--- a/dev-util/meson/meson-0.47.0.ebuild
+++ b/dev-util/meson/meson-0.47.1.ebuild
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 84dacb172d2e..83a43477b34b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,5 @@
-DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
-EBUILD qbs-1.10.1.ebuild 3011 BLAKE2B 6bfbb42ef28d3a0a74a6aaf1472e65e32639682c612d1e37a62340598883b1802e7c6717fe57e4340bbad4170a06ddcc1e2f22b35953b019ddc38bd77d3af042 SHA512 c947d0203b748ca2bfceb814322f1369497829a8c0506066cba15878fec019f2f81a566abdd87e2a3c2a828fbde8516e809db79dbcba5b235a087067fa8030c3
-EBUILD qbs-1.11.1.ebuild 3067 BLAKE2B c3e28908a89e224589cb89293c50df616cb5b20b733faf80b47ef2f25a7c7e9f676169d5cfa143de51dd85f5d103ac37dde40878899d992522b693eb548764d0 SHA512 4118b383ab47c790f2354667db16e4f1c689a411efa57dacdded76f42ba8f339485c04923d43fc6a15acb60c5e73640d8036a4ba86a88b8f36f849d79bec74a7
+DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804 SHA512 2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103
+EBUILD qbs-1.11.1.ebuild 3066 BLAKE2B 0f44337978b215817f91a6bb6d2bc278a8d7765ef0c7c8ff450a64d2c0324267ddf3a3a7f00ace808db44da440d91bd6949513e7aac56d7afc0387f4beedf3a4 SHA512 09f81791a84a2fd9905b9e7cf9a9271cb88221321be12f69c887215789763de7f77df65a0d37402262aaa0015f68128875b5c1c3ed7b36ceb7d750203d2840d2
+EBUILD qbs-1.12.0.ebuild 2867 BLAKE2B fc50c95d5c2cf7b4e198c3c1dd9c2da64cb7067ff3bd26ebcc771b9e9e1129691d1b32eed98fbbf9f2382febcb09f238764689354a1f3c8fc1035b57e386954c SHA512 1fb957e2c1d777315dee3f9dc705ebe6f9c5f24ea90ea8ef5ec8a8adda63f9df9242b605564c5867ee1a719e0d42d3ddbfee4be92c68c3091f74c4291a9d5cdf
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.11.1.ebuild b/dev-util/qbs/qbs-1.11.1.ebuild
index 4971aeed8202..9a19d31b66e5 100644
--- a/dev-util/qbs/qbs-1.11.1.ebuild
+++ b/dev-util/qbs/qbs-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND
diff --git a/dev-util/qbs/qbs-1.10.1.ebuild b/dev-util/qbs/qbs-1.12.0.ebuild
index 55632d81072a..87c294f41601 100644
--- a/dev-util/qbs/qbs-1.10.1.ebuild
+++ b/dev-util/qbs/qbs-1.12.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 # see bug 581874 for the qttest dep in RDEPEND
@@ -39,22 +39,15 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	default
 
-	# don't add /usr/include to INCLUDEPATH
-	# avoids a build failure in qt-creator with gcc-6 (bug 618424)
-	sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die
-
 	if ! use examples; then
 		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
 	fi
 
-	if use test; then
-		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
-	else
-		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
-	fi
+	# the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries
+	sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \
+		static-res.pro || die
 
-	# since 1.10, TestApi is either broken or requires more configuration
-	sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die
+	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
 
 	# skip several tests that fail and/or have additional deps
 	sed -i \
@@ -86,9 +79,10 @@ src_test() {
 
 	export HOME=${T}
 	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+	export QBS_AUTOTEST_PROFILE=autotests
 
-	"${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+	"${S}"/bin/qbs-setup-toolchains --detect || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
 
 	einfo "Running autotests"
 
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
new file mode 100644
index 000000000000..f2cd68e028e3
--- /dev/null
+++ b/dev-util/stepman/Manifest
@@ -0,0 +1,3 @@
+DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
+EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
+MISC metadata.xml 949 BLAKE2B 883da9ca0b0e0d8d86e6c4e863eea1f53a029c4d5ee517ca546a70ea34180055dd3500a7f85c4cf98571f9f487ac78cb86b48a772992a4461aa0342b12def494 SHA512 db268017d243e1e24b2ea28731e8286f731bbb73214f17828d4a86dba4fd2a7c4e259f8afb2698984569bcd20b06029cfb3be45fbf8e84934ca650ee842f2a17
diff --git a/dev-util/stepman/metadata.xml b/dev-util/stepman/metadata.xml
new file mode 100644
index 000000000000..a84ba4077979
--- /dev/null
+++ b/dev-util/stepman/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karol.wrotniak@droidsonroids.pl</email>
+		<name>Karol Wrótniak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+        <longdescription>Step collection manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with envman and bitrise. For a nice &amp; quick intro you 
+should check: https://www.bitrise.io/cli</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bitrise-io/stepman/issues</bugs-to>
+		<changelog>https://github.com/bitrise-io/stepman/blob/master/CHANGELOG.md</changelog>
+		<doc>https://github.com/bitrise-io/stepman/blob/master/README.md</doc>
+		<remote-id type="github">bitrise-io/stepman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/stepman/stepman-0.10.0.ebuild b/dev-util/stepman/stepman-0.10.0.ebuild
new file mode 100644
index 000000000000..4b0b891bc494
--- /dev/null
+++ b/dev-util/stepman/stepman-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Step collection manager for Bitrise CLI."
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
+}
+
+src_test() {
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/stepman
+	dodoc README.md
+}
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 717457158fc4..6a700504cc4d 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,6 +1,4 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
-DIST wxGlade-0.6.3.tar.gz 595243 BLAKE2B 748369ab08cb114c9fabf046a981dd955532b7752b176c616e9660fc74eade1db3b6bf08669f5373586880fe7798ff96a7ce588878ea129a7c9d7c76a8bc2e3e SHA512 7cb8cb99f2a3d97c2aa43a6ad5cbb8c1b6aafff0e5d120fca1760acbb44d2c8fb3bf8a4d5b42055e1b4bef061bfdbe8eee884f4e087b9d6572874b5b818a61f9
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.6.3-r3.ebuild 1127 BLAKE2B abd1d19ce4d1668354f3e1c4607efa6b446d5af0703ab60cdb583d0807596327a2bf68fcf15726a424b620148aa8032c2b8025f7a6abd42be6da1d9e32ffc743 SHA512 60d54c5d1d36570b65a0319f99bb0921ef1f35c5e742d0cf060871ed36a58a178e37858d087c4be14540a48564bbc1dd6f774cd6a5a0523928a8711057171c6c
 EBUILD wxglade-0.8.2.ebuild 1101 BLAKE2B 25326cd03c46e54954bf83618bf898439115977fcf191a135522acd3b8aaab437d483545bf53a507da067abaf24f0347055584c843b4e7b1b65256a4424ea71f SHA512 9609d6234b87d9f7c39bdfa24b9858fd538b3b1ea941e14875871384ff294339355dbd520abf6230b24320872896035ffe5e600b7bc1a684985d8e8a65493aec
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild b/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
deleted file mode 100644
index e307c940a1e8..000000000000
--- a/dev-util/wxglade/wxglade-0.6.3-r3.ebuild
+++ /dev/null
@@ -1,48 +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 eutils python-single-r1
-
-MY_P="wxGlade-${PV}"
-
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:2.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-wxversion.patch )
-
-src_compile() {
-	python_fix_shebang wxglade.py
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt TODO.txt
-	newicon icons/icon.xpm wxglade.xpm
-	doman debian/wxglade.1
-	dodoc -r docs
-	rm -r debian docs || die
-
-	python_moduleinto /usr/lib/wxglade
-	python_domodule .
-	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
-	fperms 775 /usr/lib/wxglade/wxglade.py
-	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
commit	520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree	f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-util
parent	3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)