gentoo resync : 15.09.2019

29 files changed, 174 insertions, 443 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5ebae9587bca..fd1e76935cc2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 41fb8fe89d8d..de351e8d223b 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -7,9 +7,12 @@ AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 487 BLAKE2B 6b01c71e
 AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8fb041cbdf47dd5cb5eb33829166f98ac7f189cf70a73ae0d4835c6914a0041bc628be8b948eddb36ef74c98476088f4c3 SHA512 a320bfb744667312230cf601d034217f72e3a78fe06851678c5810bb47c8239007aaeffb5719513696922ffc2d4c2200e60e140b34e3992dc353ad0fc69177fe
 AUX boost-build-1.62.0-sparc-no-default-flags.patch 2646 BLAKE2B 65a3a5018fed0197fe2bd1f93e5de4e799a201274f7320f4417edd4978a338a800eef1aa911ec7729f4f3b02c9cf85106dc25d466eab0e0c87d7625c4b652936 SHA512 1767c0b72f18ddf7bf4dc9d51c911ce0fe3c775e60cc960f913b218850cae9361728fad192194589929808c6c89c63110810e668fc7f75c79a04cbab1e59834f
 AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a
+AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
+DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 EBUILD boost-build-1.65.0.ebuild 3913 BLAKE2B c809eedd69ea76b6a80347281be4448b2aa15ce8e8bb4ec4ba451b0d9cb9f24eb31635dc9c186f11a0a9ce40d1920f5d476daccb7a2b990966b48dec596a90cc SHA512 c396c03fc690189243d9883a8419f13de4f771acbf0a6294051d4b84211d2c9a45ac8021003dcd6ea43cee762ec722481f7cc265c8aba6d7729c4a4b716872e2
 EBUILD boost-build-1.70.0.ebuild 3887 BLAKE2B 753d36197c3e7552c82a86ccb10f441108a31b3b963fc17e3749aab68d8794dbbd020cb3d9a8037199727c338c22654c32e81cb5d1d8cbc4903a122abc30eee0 SHA512 1116d687410cd78fd720c6a7b2a2bcb562d9cbd560439cc40ddfc31bffc0bbffd612154f139334459817c6f2d245d883387d9fdb369158b995460c022f7ef222
+EBUILD boost-build-1.71.0.ebuild 3138 BLAKE2B 316afeebb9f3c2a307c2c3d541462567a220a6672c97446867ccc6062907d5a941981d147cfbc28fd33a951474ef82024cf4091d6a6fdf1ebe713bff15b15d9a SHA512 69f60daa3394cdcd49afc2d1f461db11e6a250b3ef3837980b23f2aec6f5cb87f5c5132b34641921e8c98895710eaacbaf2298d34a011168d97ebe2d82c1b3bc
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
new file mode 100644
index 000000000000..d41c9ef2006a
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.71.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic prefix python-single-r1 toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://boostorg.github.io/build/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+RESTRICT="test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.35.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.48.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.49.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.62.0-sparc-no-default-flags.patch
+	"${FILESDIR}"/${PN}-1.66.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
+)
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd .. >/dev/null || die
+	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd >/dev/null || die
+
+	# remove default -march/-mcpu definitions
+	# bjam is trying to be clever and injects -march= in order to
+	# optimize code for you. This breaks on 32-bit builds, because
+	# -march=i686 will not work on an i486 CHOST.
+	# https://bugs.gentoo.org/624616
+	sed -e '/^cpu-flags\s*gcc\s*OPTIONS/d' \
+		-e '/toolset\.flags\s*gcc\s*OPTIONS/d' \
+		-e "/cpu_flags('gcc',\s*'OPTIONS'/d" \
+		-i tools/gcc.{jam,py} || die "Failed removing -march/-mcpu"
+}
+
+src_configure() {
+	hprefixify engine/Jambase
+	tc-export CXX
+}
+
+src_compile() {
+	cd engine || die
+	./build.sh cxx -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed"
+}
+
+src_test() {
+	cd ../test || die
+
+	local -x TMP="${T}"
+
+	DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
+
+src_install() {
+	dobin engine/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	if ! use python; then
+		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch
new file mode 100644
index 000000000000..f51abea61f87
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.71.0-respect-c_ld-flags.patch
@@ -0,0 +1,9 @@
+--- a/engine/build.sh
++++ b/engine/build.sh
+@@ -439,5 +439,5 @@
+ if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
+ else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
+ fi
+-echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
++echo_run ${B2_CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
+ echo_run cp b2 bjam
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 69730b235062..911b055cfc73 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -115,5 +115,5 @@ EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
 EBUILD cbindgen-0.9.0.ebuild 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
-EBUILD cbindgen-0.9.1.ebuild 1102 BLAKE2B 659d5fa81fa177835ed60db3085acfb3684da659825989ceaf0803237a4e693114ec379023a1dd3952f84fc95c866bdcbb291e3179a0db44759204a0de229db5 SHA512 6929eba2688f2bf93b43e2dbfec5d0df95400cda8342287a17aace196e8dc47cf4743566297161fdbe47331f2ff8c9bd8fc402fe89319c8578731f3ac353c634
+EBUILD cbindgen-0.9.1.ebuild 1101 BLAKE2B 1d231b294240977a06ee362ce8b030fa6fdd734c1d548d83f2b34422b73be5f1eef730f84abb86e5f91a09daf4406c19eb7adc0419ef59098ba370f0922ab1d3 SHA512 95a262545f94dbd1b7724a910065922926de8bfb568e179788eacdfa449393b444494d556b55abe3ff44474caf57b6de1ce7ecb0e22c2634f2fa22e9b5aae0c5
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.1.ebuild b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
index 3ac0d32c5db0..bab975edbd9e 100644
--- a/dev-util/cbindgen/cbindgen-0.9.1.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
@@ -58,6 +58,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 04c3a97fc06f..b158d86d432a 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -3,6 +3,6 @@ DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb9972506
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.114.ebuild 1198 BLAKE2B bae17c6b5280b0980acec1796b4d3974f7dc8b4be709642379cb53eeea1d9dc98de059109ab30501ab0510e617af9c2d467a1aef01114af1b71be1134e06b868 SHA512 1f9a40f3fd3a275da0184488833e3161fc017eaf439aed8a50b2c6a14ffa8218e0ab1ad90d0094fbec5f46f712a0b150a26abfbe774e3a2905ccab025af9f1c0
-EBUILD debootstrap-1.0.115.ebuild 1171 BLAKE2B 4e13c7d15f3aa36735f50211a86ee1d53994891ff7dde8111fa3500cc691a4aa270fe8273dc1bae67f2850e524f51ae2e0d244cb92c57f434598f7da45399f22 SHA512 304eb1e43b484866d020374ed58121b7115eda3250600517e785109934ae66c139ee15dd0f05a30b2b61979d1c8419ad8506779fd5953aef751df471b794336a
+EBUILD debootstrap-1.0.115.ebuild 1170 BLAKE2B 8ce1a0ce29d8a1a930348fa5ec8fb078868514eb478398c4dc7197f3d6b78f7682963783da86b3e2f5fd74a81534b72783c9ae3e7287a1a512c378e43aba3731 SHA512 a08ccf79356784effd1b02369dbd582369fb05c3dbb1b0ec932ebd38295dd3aafd2d65b88fb1997c60d40833aa34b7d84f02258737582968b98c2d3975d21957
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 5ce11a6bce2e..505958f8b627 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/deskzilla/Manifest b/dev-util/deskzilla/Manifest
deleted file mode 100644
index a9a05c9a1bbd..000000000000
--- a/dev-util/deskzilla/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST deskzilla-1_7_1_without_jre.tar.gz 9248721 BLAKE2B 64ca45e97e99fdcb4c3514573357503ba82ce67a8e67d46206542999912190dc75d1c2cff7b36f6b6337a53b19402d196fb8df9e193aa3042c820539efe39f01 SHA512 86997ebed6b01b39408e8c27ee0c560e506368cc9b12dfc82134addd47c1be746e74cdf908c9e9ee794d6337bb32971f2a07ce7c283b81e4f506027894edbac7
-DIST deskzilla_gentoo.license 1584 BLAKE2B 54e34962f65695111783df55ad22de39051127d907435dce7f30ff829d34d40376a70c7e8522f3733afe6da3dc6dc92c0a7e9f2c2fc4f2436c52b629a8d1eb8a SHA512 60437ba4ed872abc37d41974717a10fb290dcdf8bde31b3bc493fd71d8abbcdec63e236148720558f1867b773b804bc49d4cce6ea5f1b002c39eca5f074e5e9a
-EBUILD deskzilla-1.7.1-r1.ebuild 2797 BLAKE2B 6e0e01e44867c428b995c88ca7a5138e06bc6782156e9043648462744db223bba56e13d87d6c1bd46220dad5574447c9ec5a64b864a501386f62c5e140f1db67 SHA512 154dd3acb983673aabd7ade188d93f8ec1db15f113547107eb8b8b14c966f100aec68e2b9364dd85a5ea9a68fdccbd0c2e20b589e76dfc47d84c1b6d14c4753d
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild b/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
deleted file mode 100644
index 66b5d1cf350c..000000000000
--- a/dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2 versionator
-
-DESCRIPTION="A desktop client for Mozilla's Bugzilla bug tracking system"
-HOMEPAGE="http://almworks.com/deskzilla"
-
-MY_PV=$(replace_all_version_separators '_') #${PV/beta/b})
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://d1.almworks.com/.files/${MY_P}_without_jre.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/deskzilla_gentoo.license"
-LICENSE="ALMWorks-1.2"
-# license does not allow redistributing, and they seem to silently update
-# distfiles...
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5
-	dev-java/picocontainer:1
-	dev-java/javolution:4
-	>=dev-java/commons-codec-1.3
-	>=dev-java/jgoodies-forms-1.0.7
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/xmlrpc-2.0.1
-	dev-java/xerces:2
-	dev-java/itext:0
-	dev-java/jazzy:0"
-
-src_unpack() {
-	unpack ${A}
-	# Remove external unaltered bundled jars
-	local lib="${S}/lib"
-	local liborig="${S}/lib.orig"
-	mv ${lib} ${liborig} || die
-	mkdir ${lib} || die
-	# They've patched commons-httpclient (was version 3.0)
-	mv ${liborig}/commons-httpclient.jar ${lib} || die
-	# They've patched nekohtml (was version 0.9.5)
-	mv ${liborig}/nekohtml.jar ${lib} || die
-	# Also jdom (was 1.0), soon they will patch everything and we will just unpack, yay
-	mv ${liborig}/pjdom.jar ${lib} || die
-	# Almworks proprietary lib
-	mv ${liborig}/almworks-tracker-api.jar ${lib} || die
-	# IntelliJ IDEA proprietary lib
-	mv ${liborig}/forms_rt.jar ${lib} || die
-	# God knows what's this. Anyway, proprietary.
-	mv ${liborig}/twocents.jar ${lib} || die
-	rm -rf ${liborig} || die
-}
-
-src_install () {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r components etc license lib log deskzilla.url
-	insinto "${dir}/license"
-	doins "${DISTDIR}"/deskzilla_gentoo.license
-
-	java-pkg_jarinto "${dir}"
-	java-pkg_dojar ${PN}.jar
-	local dep="xerces-2,picocontainer-1,commons-logging,commons-codec"
-	dep+=",jgoodies-forms,javolution-4,xmlrpc,itext,jazzy"
-	java-pkg_register-dependency ${dep}
-	java-pkg_dolauncher ${PN} --main "com.almworks.launcher.Launcher" --java_args "-Xmx256M"
-
-	newdoc README.txt README || die
-	newdoc RELEASE.txt RELEASE || die
-
-	doicon deskzilla.png
-	make_desktop_entry deskzilla "Deskzilla" deskzilla "Development"
-}
-
-pkg_postinst() {
-	elog "The default, evaluation license allows usage for one month."
-	elog "You may switch (per-user) to the license we obtained for Gentoo,"
-	elog "located in /opt/${PN}/license/${PN}_gentoo.license"
-	elog "It is locked to Gentoo, ALM Works and Mozilla bugzilla only."
-	elog "Note that you need to use 1.5 VM to run deskzilla when setting"
-	elog "license or it won't get set due to bug in 1.6+ VMs."
-}
diff --git a/dev-util/deskzilla/metadata.xml b/dev-util/deskzilla/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-util/deskzilla/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 1b6457f9109c..532648e7268e 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2047 BLAKE2B 8735748fb0c72ec01750e343f3bde9bc46a9da51dd26a2f50caae5e271091a4d3e2e693894440a63c39ad60ca13322b64aeec52ea8391760ab791d1654a9fda8 SHA512 581cb8941547c80b792565de4db486bdfe02f830471977e11408eab13006ffa8e71d319a51e4bae011c04a32e6f3d05d0601eb58594e137a1e95695dc57268ab
+EBUILD gdbus-codegen-2.60.6.ebuild 2046 BLAKE2B 54504fa0837d4d59ca081e9b6c84a8e984468ebd26a5477729e2067636d121f35a0fa746a28d00ef4779c8eb53029aa2d56c5c555a909824052398959415dcd4 SHA512 926ec928384e4513bacfb4da63ff1d57bbe5e8e042d62ff532c7980237f2033efcff7ce773e45fb863eb3b033afe32fc8e863b80afe5311b41d0ea63910103a7
 EBUILD gdbus-codegen-2.60.7.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index 0f4c4cd28673..e02e3364e5df 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5ac858c9d35e..0bc470d10af3 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2328 BLAKE2B d000831404e21ed73ae1619776bf8357ae17f0c11c0de43d898234f2fe8c168d9c308c4f53fa912d29e47983f0e283313b337100aad5b58107e609e8a8e3d9c5 SHA512 2194a5479c5bdcc8094743e0aae4c2aa29420b70b5df9121927171d734802c90cd7cdbc7ca615318b5bb81d601ae382d03a216ffbf649ce4b5eaa3e8a3d0af5a
+EBUILD glade-3.22.1.ebuild 2327 BLAKE2B fa1d8630fb343b82b008bf36d879d216a03cd70a38abaee1669246130343cfeb24e04e51a97d94a70a4a38678c99c756c0ff81c6135014d071e18ac607700e98 SHA512 a3dcd76d6bd6f4109089f1ec251465d4fbe18c661cb7265832f24c31c78b2c97e92306f9a932f1dc8862250e103fbaab36a632b9d31a753eb6775ad63885e058
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 68c852cb93e0..776b0dd5da56 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index b0081bd6b1c1..3243204085a1 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2422 BLAKE2B 305e6170b340fcb4ec66008b5be054391f3bbb9aa88fbafa61e662f32a041a70d25f62aaa0f7e02c638dd74fea103c7972bc0a74b080010cabbce36e7de004cd SHA512 7fd710acc86f4e75f0762e0a3469f11261bd14af3f964c542c77461f9db9b4dc0b14ef50e5baadfcc7e0a3a66837d406afeb7295300357aa837fdda8cc15b414
+EBUILD glib-utils-2.60.6.ebuild 2421 BLAKE2B 77ee7f51feb66d60a6be63e5d640a8c7360a9c8ebb7d872071a8853abb09e87ece37e6ee0f290de9a0999791a38a1143ac5cdec25af4db84622de4b8d34a385a SHA512 8505199c52fec11dabc66fc74d1b7dbb88871e134c1f40f13c398484143a38c153aa90fdcc122d32f6223be769fc37a04218919055dc2fe91c5aa57d36882f15
 EBUILD glib-utils-2.60.7.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index b40aa0f9de23..122bb56cd487 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
deleted file mode 100644
index 444103244058..000000000000
--- a/dev-util/netbeans/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 BLAKE2B b87fc120d6dbb1207d70bbc3324c60c41c2ac8cae8af014ba47bc15c383f7fb821924d3337b25a0b59d0ef2ad641444ed5f85e46d02cd19b07b8913d9ddaf10d SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3
-EBUILD netbeans-8.2.ebuild 6155 BLAKE2B 2f8b34973c6edb42fa41cb0933c1c40a5584ae54e2f77355b40fffdead9b7427d8a0a326b11da45b8c3588314f13da7669822ad9e82d69abc3454971aad97648 SHA512 5591a6f66af08b14c4b44ae0e311c32fb4b70184a72e73ea6ef8c93e124d78e5380ba334345255404651662a3e40e415b551d0d6264601f0a8f6c4ec83c6455b
-MISC metadata.xml 1290 BLAKE2B 6244d6034061869e8129c8edc442fae9035749f0660204b0e3cdfc4a667643b370b26ad6d34c4a6e713fa060cfca5fbfcaa1ea87da7d451204e5de758e945c66 SHA512 10b6897bd10823d399937aaf3e09c1231a6c67072723cea8a9aff002b275b76d74a62260f8416e17cc53bc6a87fa0c19d00cb428ecff4052c1c8e278211ebe70
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
deleted file mode 100644
index 8834161921f2..000000000000
--- a/dev-util/netbeans/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
-of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
-where people from just about any country you can think of, have the ability ask questions, give advice, make a wide variety of
-contributions and ultimately share in the success of our products. You will find students on our mailing list, developers from top
-companies and individuals looking to sharpen their skills.
-
-In June of 2000 NetBeans was made Open Source by Sun Microsystems who remains the project sponsor. Today two products exist: the
-NetBeans IDE and NetBeans Platform. Both products are free for commercial and noncommercial use. The source code to both are available
-to anyone, to reuse as they see fit, under the terms of use.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
deleted file mode 100644
index 1fc9f826f55d..000000000000
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="https://netbeans.org/"
-SLOT="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.2-20160920.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		if use ${lingua} ; then
-			local lang=${lingua/l10n_/}
-			lang=${lang/-/_}
-
-			case ${lang} in
-				ar)  lang="ar_EG,ar_SA" ;;
-				es)  lang="es,es_CO"    ;;
-				fil) lang="fil_PH"	;;
-				gl)  lang="gl_ES"	;;
-				hi)  lang="hi_IN"	;;
-				id)  lang="in_ID"	;;
-				nl)  lang="nl_BE,nl_NL" ;;
-				ta)  lang="ta_IN"	;;
-			esac
-
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-8.2-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		eapply netbeans-8.2-build.xml.patch
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-
-		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
-
-		for lingua in ${IUSE_L10N}; do
-			if use ${lingua} ; then
-				local locales=${lingua/l10n_/}
-				locales=${locales/-/:}
-
-				case ${locales} in
-					ar)  lang="ar:EG ar:SA" ;;
-					es)  lang="es es:CO"    ;;
-					fil) lang="fil:PH"	;;
-					gl)  lang="gl:ES"	;;
-					hi)  lang="hi:IN"	;;
-					id)  lang="in:ID"	;;
-					nl)  lang="nl:BE nl:NL" ;;
-					ta)  lang="ta:IN"	;;
-				esac
-
-				for locale in ${locales}; do
-					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
-				done
-			fi
-		done
-	fi
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 668c820ce682..404ff472f552 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.6.2.tar.gz 169107 BLAKE2B cd7570924b6b115aae467275bc4e1b26a7c20454860d614c23f96c45f5856d6cc8874aa4ba6d250591eae2f5ef0da8102124a924dfdeba5ca75a17fc1005eaaf SHA512 8684fd40694f4348150bd10e4ad4cfb99cf4978595ccd77e117b50abb54060ef1f9d2a9889279ce139b95c39b6b755ccb8c9604a84ea62892e519552e27ca5af
-DIST pkgcheck-0.6.3.tar.gz 171317 BLAKE2B 76e74cb7b7ce093aec6eff210b4984b195adfa615bdfa9937d47725246a8f0f4074a5d7fe0537e9b556df08906cb738f109eb0bcd980966b1baba4f754888285 SHA512 888bcbe66603de97f92f0bd9a35de6b177724b752e70f55a04cb1ae17c32a476986b9d5165cbf92819c1945bf481529943ef6fe3cfd72739749149760c9809c3
-EBUILD pkgcheck-0.6.2.ebuild 1344 BLAKE2B a84d785972b55a4dfe414c9afbfcb66a436dfa3f1f05b5ac5937e3296dadd315587de3becf3c789bb1cfe2321583272923cdadf0e71490457256ca44d8627699 SHA512 17df39ba1a46e6efeab2fcc6b8188591b837e29c18a128d9b7489fcf19ba12512fbc080f93004b2f9922f520fbf51fbff24961fc35b9bd708f317ada8296e53f
-EBUILD pkgcheck-0.6.3.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
-EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
+DIST pkgcheck-0.6.4.tar.gz 174315 BLAKE2B 147745f8dc7df3c47302b2b48a1ed0bbeec348cafbe4c7ca247c688db25b248a6d079c73e4ffc28fead4a06fc2f09aa57e8dbffffcbc765602e8d433141eaeaa SHA512 94cceccd5b184c5b810c298faa1071ec77b8ca2a618e7620dec933ea5da7beda3cb5f96a4efaf7ceb2f2059040e9ef0cbd974613011b816c10f28e59c5d32a00
+EBUILD pkgcheck-0.6.4.ebuild 1344 BLAKE2B 6cd5445b9bf9d28887160bce64cc69903401d6b4ac0478a1615ef127c84f9e18e6037c328da85f758c7f2587851d956b8a7313ae9a8a8abe44da0bf5603e3977 SHA512 670d9e8f4ac92d47853046741c63f3fa1888b6539203dc1d38bec7e990e57d3318be3d7476016b3a01b46416607599058df16b9e7fe3a300a0266ff891480fc7
+EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6cd5445b9bf9d28887160bce64cc69903401d6b4ac0478a1615ef127c84f9e18e6037c328da85f758c7f2587851d956b8a7313ae9a8a8abe44da0bf5603e3977 SHA512 670d9e8f4ac92d47853046741c63f3fa1888b6539203dc1d38bec7e990e57d3318be3d7476016b3a01b46416607599058df16b9e7fe3a300a0266ff891480fc7
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
deleted file mode 100644
index 1a07b1b270b2..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.4.ebuild
index f244fafd53a3..3d30a06c6c24 100644
--- a/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.6.4.ebuild
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.1[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.3[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 1a07b1b270b2..3d30a06c6c24 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.3[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 0341bcec102c..2f2237f50239 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -18,5 +18,5 @@ DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc
 EBUILD scons-3.0.5-r1.ebuild 2934 BLAKE2B da024a78f8779bb9acd0def27c39285145745553902af6df29ee0b88e9d70b164fc129cb548bab7ef0f6bad1b832c037bf26866f0af36941071756626e7a1d8d SHA512 09364d9f64c8003c7b363859f0bd99c1f1d084ba3c2b96ce6d973017f5b9a9e77c07529c66d5aaa29027bf4ae990a3c2451b5df3453923a3df0f05f063c24415
 EBUILD scons-3.0.5.ebuild 2112 BLAKE2B 17dc37551614e235adbf199ea6a7a1400f2fb2e5b6f0597598c898aab63d03ec45ca30d30d2efd163819c6d9f4f7dda7c0a9414752c7711728a47f4ada631c3f SHA512 e47023c29074d2dc3f3cd028be53a5e579274d607aceb6fd1060b5a4d9f595f662b2369d794763077025f2d69832c3fadd3f4bb348bb5fa01b5185ba50459fb0
 EBUILD scons-3.1.0.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
-EBUILD scons-3.1.1.ebuild 2658 BLAKE2B c6a1862049b329d9124166eb6bd3f1c521842b4d367010274fa78b0cad6feca7882e8aa77df67685f63d194aa22d5ccc98a028e7a6d5e6a6680800bccae024f9 SHA512 d4613f388316c0f9244990b7863405ffd34af2259e5e63290a40def24ebb7beddd4ba2cc2af6306bfb0329ae0a470688108ecb14ea76e868911aa78f2c840c47
+EBUILD scons-3.1.1.ebuild 2657 BLAKE2B 74a9c3a477252dfe2ad38f43e18334265146c107d9a9679b9bc6b45bfa1b1846c27d629542f797717c536d8a715015ea33a48f49474a6575425b4cc9a0572e15 SHA512 3a784694f57156d2a101371883a836610ad33f3bca64e6b4ef2ed5f9c4358cc953261c4f63fd59030c0986c7ce47ea5035c7b30f990e4a1c1cd8db695ee66acd
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 742084aa3701..c8d9266f84c0 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 47de6e1b334f..633f0b6db0f0 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-mock-0.34.1.tar.gz 340357 BLAKE2B 127d39b01bbd883141c75e63dc5e0b8834dbc86f375058768072b3de75d3f9e3fabebdfdd9d872c51ad52fec3e2057ae342887c25b496b987d64652c93b204bd SHA512 c9e35867c44bd7d127f91d0f668d39ff67ca9bb2937428f808122555360a77b91f9f5d5648478dc2c4fc04a7b9195fed0a927868fdd22b852022ae2fe0f1e695
 DIST stripe-mock-0.47.0.tar.gz 371383 BLAKE2B 0d619e62c9d071cd0706f0deeab5cb659d994f02df87fc638e319b346cda83548bec9a6068814b7c17a8f62e8f9c2206003bd62f66f844e8f38ee96b10f099fe SHA512 b387556526eea8b02fb3df74b345f5447bc81d7cc9e7f9fe9cd59dfdef7895bd31c882bc3c96c6815c69cc1e1fc3bed8390beb107ecfeb79e69aba4bc115a17e
+DIST stripe-mock-0.63.0.tar.gz 453992 BLAKE2B ece5c4b4141fedd4dc896e5505047c1138a27cea63b4df1ce96b12a41e6e4ddb636ec181bcd1063819a0aa0247302171181d86bd962d0a2063289339c35105c2 SHA512 0e23493808643326e91599620c481130df3b2c50f1d39c64f9f404c54708f71a61a48630f0e3cf4c924e53d29f21d442be5323925fa0096c3bea3e1582676578
 EBUILD stripe-mock-0.34.1.ebuild 579 BLAKE2B bee1b559fd7bd252da8bc9cf95b221c3359841d9653d83add51098699e2a5e44cee1f16d30278270ca6dd5a0a1721b1757be88ce498bfe09622d8c81ac39047e SHA512 c94a200b1976687bf500a5f9a11ab0dc21eaf06aaec2a3d469f2275f3fc20779677c7d679ea220a6f7a8b72061734d215cdfe6bf2f39f6cd79a7b28b10b011aa
 EBUILD stripe-mock-0.47.0.ebuild 579 BLAKE2B f34d8724d7b65618e078fc5dc038619fe5b7c911993bb4699819aeb815689c5dde30f7cd143f2005d393549632e3635482d279ad1d469ac795ed9298c08c4327 SHA512 4ba06e10f94e1923fba546f1963d4c4e6c6d29d2c7f039e8bb529b1b749aa69befc338a79a5e4a2e7b7df258fbce4174ea683209216b0110925901520c0230f3
-MISC metadata.xml 478 BLAKE2B d9507af9f6fb1e2aefb92dd06000d1043d1f3e022c3c1538cb59da9e8ae79afbcc9485bc7ccb3f607704c9db9cd927a944e85f96a8fb8603491f7e464345fc0f SHA512 9f8e49eaebacbc8dcde06ca7650654f95e33e3bef44e7eb6106e128accb4a809a364c0c3aa6cf93be2ea0e8510774c8f5bcde4cc72af269e6644dde44f21b5b8
+EBUILD stripe-mock-0.63.0.ebuild 576 BLAKE2B 51ef90927184d70398224fd7415b9019134e401f5f71697476eb280b16a73484cff8be0f232105bcf975d326303602c6890acd0e84b25e72a9274aa2947b37fd SHA512 c56d9a6ed78b63fafab0a31f744bdda57fd2e111d18204b8f464d6cd9ad8c0ad4cd4e58363aa129664c39e7e4583c26fbc85886c107ab70b1dcd70dd32436284
+MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml
index afb8d27c3fa7..f552f2aeb9a6 100644
--- a/dev-util/stripe-mock/metadata.xml
+++ b/dev-util/stripe-mock/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
+     <email>cedk@gentoo.org</email>
+     <name>Cédric Krier</name>
+  </maintainer>
+  <maintainer type="person">
     <email>m.seifert@digitalernachschub.de</email>
     <name>Michael Seifert</name>
   </maintainer>
diff --git a/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild
new file mode 100644
index 000000000000..1261b354014f
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.63.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D%/}$(get_golibdir_gopath)" || die
+}