gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /dev-util
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
73 files changed, 740 insertions, 442 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c19c94185b53..a7746192300f 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 f3cf84c6e4cc..d3bc21c1fdfd 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,7 @@
 DIST android-studio-ide-162.4069837-linux.zip 490782431 SHA256 1383cfd47441e5f820b6257a1bdd683e0e980bc76c7f2027ef84dc2e6ad2f17f SHA512 44f093ce4c97211913bb979fb28d5fe43163462ce6153c31c03576d872e11cbc11651f10397e14247ca41ea269a3cb0998e9e7d37fc63ac6782cc653037d925c WHIRLPOOL ed833816f48abba51d8142fda91175c07f019f40a3ed21ea026367870723016c17262c0eccb71d3d85a5f963ca0a84b0ee2111ae15f95ad92ac565f225d6c10a
-DIST android-studio-ide-171.4408382-linux.zip 771324214 SHA256 7991f95ea1b6c55645a3fc48f1534d4135501a07b9d92dd83672f936d9a9d7a2 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737 WHIRLPOOL b8b78d6838d960313d10bba98bf3deaf6e9e1defad0d6288c7108228210d8c3a6d9b92de38620f4c9ed43338d425605437d45f19e57c56eb369e10f046e9322d
+DIST android-studio-ide-171.4408382-linux.zip 771324214 BLAKE2B 4dbb194338a139d884d05acc60db65d2d85cb80cf28a44a50adf5dbb7390851d5d2640050f17a0048c926c7022794838f5ce6c259f5dd66b04dde47d7b237796 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737
+DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
 EBUILD android-studio-2.3.3.0.162.4069837.ebuild 2717 BLAKE2B f24a31196437f9fb953477e410e15fc66e9da92b27901329d14b94a19f23c1f9c10aa69773b8e2c583a1a9c19f95923e64b40dfb254081c01f3945ca701e7612 SHA512 2c6760fc2ed8879e65bf3ec17a5b7ca77e7f81850d2ec3a2fb9a7c97771361ccf401c58a30d9b0b686295e58eaa9d03573128ad709d7df97d2240da4efd1d3a5
-EBUILD android-studio-3.0.0.18.171.4408382.ebuild 3040 BLAKE2B a2407a4f495ecf80334f2346a5b3bd1f85e9d559655be1327843a9f1d42420996858132856778dae76b6eca75256e6d2aae48d28487a93fb035437ff5885337b SHA512 ffb0f2e69aca058afaa22caf2db59d0e6a59a94a815acd4c7326a6d0e0311be5a96c61059aff0267d04bf558a177ef1800809ca4983dc8b324e1f9b99c5f5322
+EBUILD android-studio-3.0.0.18.171.4408382.ebuild 3038 BLAKE2B 6d688375ee63521c546430bc262622714421f1cc981fece667b42eb3269dd319c80f5c892388d44609adfa5a10108ab7eb30cd1eabd4973e6b83e244d06eb544 SHA512 3ac33b4697c2012043e0c37d94d0ccabcd94b84cc5b83f755376f2a85286a43e3920f68b37aeb643f966d491e9ec27ed0f487e36a955f91c9c8a13d5d3af2b5e
+EBUILD android-studio-3.0.1.0.171.4443003.ebuild 3074 BLAKE2B 7d12080c52bed382f9c0d8d124fd18557b68c0b706b9e1fec6bf8bc64037e679cf0156acdbb9f7fa3510059eefa966294c22c37175989083a974f417b41c0e9a SHA512 567d68bd254c8a2e96e069d477315a851bd9088dc141dad4e0a47a1fc5f1486b5dabd682848149d01aadaf4ffe1ee9355bda9ee91de87020e845a2410607f120
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
index fbc7007c5f62..446c76a3456d 100644
--- a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
+++ b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/zip
 	dev-java/commons-logging:0
diff --git a/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
new file mode 100644
index 000000000000..2791da5ee994
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	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
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index a49dd59c1724..bbd068529f70 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -3,16 +3,20 @@ AUX confd 252 BLAKE2B 3c9999b9ee9ea39eda3f548bd0e0143d17e545de89efc7bf3a30aac163
 AUX initd-r2 5371 BLAKE2B 68f4ebafcada8002b7981a101e2b5f6323140469fbe7834a492adcf142dd210362e65d604d52bb3bd55a9a998c2bec8080ddb1595181aae5b92eacda6d4b5bc4 SHA512 c19994a2918cb317a074898b7de294193a8aae1b5ec37d407bd5b60971c40d7c808ead5376c6d48219f41b15b72b2dca85959db677e81052d224a73bfb39cbfb
 AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94c3002f3cc21bd88405fcf38ea2161f9efde0c2ea2dad67979713a1cd99fc78e790ff0bca93 SHA512 89ef20e27296318cf844130c09e17b16f63c27b3188e53400f8b1dcf170d0d6acfb5a56592eb8580b8fa1281c2fcaa7f2edc4cde43803eaf20ce345030ce3f98
 AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
-DIST artifactory-4.16.0.zip 41455447 SHA256 f5711536cdf0a597799e01c570bbd38e6f5f3ffb6935cde21d38119be6592f16 SHA512 e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14 WHIRLPOOL 01a60743fe85909d06f69ef4bda94a2cfb37e847ee481ee025075c0b586df11118566f7f99352a7808147eec51fc1bacb649853baa97a90253ab89d3b92279a5
-DIST artifactory-4.16.1.zip 41489457 SHA256 f3715397f7e792de76cfecfe2b41ebbf54541e0460ff14e82a69160e0f3f06fb SHA512 b8f5441f011966837861073c928512704961c7683fadac4603f2177df1c64861432f894c5fe0669c4842a4b7d008553169e88aaffdde6e3d6e6bbdff6adf9d78 WHIRLPOOL dc7dfc0044d3770fcfc1dc56da6ffe8bc8fb07892a2888d88f5a05640ac8144cb25afc2119340d820323046bbaa0aa718a98cda6863340297e3ced696ed3e3f7
-DIST artifactory-5.3.2.zip 45729254 SHA256 e086a067ad191859cd0a0c996313cf5c7386e6ee892b55697c27b0f42ae2bc14 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d WHIRLPOOL bf3b31f7a1989ddb90b03396172eeac37dc5230c4bbcc99b54c66326e5d52e26dbb83003824647c6e89926049c31b9644212aee183fa24db7475831dda0ceaec
-DIST artifactory-5.4.4.zip 76841935 SHA256 bf2198a0fefe818fe412579dd008f2a24dc065780da4c9657a923363c70a0a3d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8 WHIRLPOOL c0c27a0ce5b0035d9266b6af4316044cf1aed361dbe0f7aaf66844015a70678e92bb0c6a13330ffd8f5a05903f66a82b48995605c272ba3950a19aa47d1fc85d
-DIST artifactory-5.4.6.zip 76857888 SHA256 43fb4b14ad5350daa200e0282a36903495505ccb536b5f0ac7d7b5487dcdfca6 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe WHIRLPOOL dcc86f1326011bb89c3e65a420c9f9ad02afea3a144b4b5eac8b617bec7dbb72256a6ac1f67d2bae034897bd02801b24e59746d1543e957d8e595d7ea83a4964
-DIST artifactory-5.5.1.zip 77406287 SHA256 e4180ec0c6a4ed9bc8da1287ac1d661c421d59bc11e56d47dd106ead31d8a44f SHA512 7327135be0c2a08dd97c575b05be1c3e4be99b38354864313d201334d3276912bcff0c6b0743fb83a2433a82fc8fcf4ec43e98f4183287fc34f1807342abedf8 WHIRLPOOL fcd3c368eafbd956eba15ae1c5cd7362d423acb0e6a0b529c8b7088ff2ec1437e02dd5b5b277c71d7bbba788db11963c2eed784ce95ba1dcb550fd41a0224722
+DIST artifactory-4.16.0.zip 41455447 BLAKE2B 0f9f575d5ce3ba983c905e70c8e3545946065ff458f9a1c0f0e346bebeffe002bbea4214b7a23829e3a11d8ccf6aec4548f6ba5abd405d30165d3c07e2372e98 SHA512 e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14
+DIST artifactory-4.16.1.zip 41489457 BLAKE2B 7854710a5cf4dd52d7c92581a030259df6b0b8038f9843e528b0c57211eafd405a114b709ba5407a9c83e4d693f1ecb8eafe3d5e98bb22542d5c48e15bc3cf6f SHA512 b8f5441f011966837861073c928512704961c7683fadac4603f2177df1c64861432f894c5fe0669c4842a4b7d008553169e88aaffdde6e3d6e6bbdff6adf9d78
+DIST artifactory-5.3.2.zip 45729254 BLAKE2B 1fe6ec8a5a33d8735bd92d480e8fb7b035af2b27bf9034791f1bdca3c3d2a13794ba06613fb508ea8f221cc1647f2a8e213994ef7603d92c88b17037fd3c7266 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d
+DIST artifactory-5.4.4.zip 76841935 BLAKE2B d763122cf0d2d1237fad41b825f68ecd6ec3c3453e5ec0a76a5b367c70c5aec4ee3cd81b9ab453628c879db22e0a292fc9b43d2b3d3d5461fc63d43bffde7b2d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8
+DIST artifactory-5.4.6.zip 76857888 BLAKE2B 04185e4c585a6e8121b9b6d78a4565c5107381cae53fe3d8aea647ea6ebb0920f9775a7275ba79d282a0c87a7e0544f6382a2ed10dbecb6b279679be0fd94066 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe
+DIST artifactory-5.5.1.zip 77406287 BLAKE2B be60fbbc3b8c61fc9d1a7272889219de7ea4e5b8c760afaa7e0003f6bff48d41783f76d62ac64b81ffa42393a265ed184ad4a4a23789dc79955907290035dae1 SHA512 7327135be0c2a08dd97c575b05be1c3e4be99b38354864313d201334d3276912bcff0c6b0743fb83a2433a82fc8fcf4ec43e98f4183287fc34f1807342abedf8
+DIST artifactory-5.5.2.zip 77438814 BLAKE2B b77d9348fbae8bf871e4fb6716e2a9d357cd0d268d65360ec7509b0999db78a8b80f68eb22cbbc0a85ee2980fbc72c7aa390a60c8129451506441d7cbfd9f776 SHA512 fd052e66316ec050599f6262274cdf5232ebb1385fedd2c19c6ba8e3dca0d9fe86d7a89fddbb8974b28e0f9dc3d7ccda1aac6b3f9159f0b77bfc51873ffd5e3b
+DIST artifactory-5.6.2.zip 91577071 BLAKE2B 1f9687bef239519171bdb28fb033368e5dea10186ef350c7ee7d9e4a33ce99c5e965692d8052d82454c83f42c84e79c18edafbb98540da4b818b65b577a9ac72 SHA512 b4bde9bcf53d2af6901a8e80827f3b09d685a8bbe7073badad586401b6881d046e5cade4165fa68843e981dea2912374c187518e29ab1ee86d3d0fac134a54f0
 EBUILD artifactory-bin-4.16.0-r1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
 EBUILD artifactory-bin-4.16.1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
 EBUILD artifactory-bin-5.3.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.4.4.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.4.6.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.5.1.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
+EBUILD artifactory-bin-5.5.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
+EBUILD artifactory-bin-5.6.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 MISC metadata.xml 368 BLAKE2B 1a5f91a194a1eb7b58ddc795cae9c3e52b33aca6b716b286069b8185c2393bd6b5281219f4a0e6446c9a8a930f18168b0f5923df9423ffd6b20d0d7ec08c48c8 SHA512 889ab0f86261be62dc4988fc99c8526212c7936b3fbb8a078d644046047f653108b3120cef9cc65bce00a1c267227e58dae0cb1eb7d86ac1f4966408fa783beb
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
new file mode 100644
index 000000000000..242019ded03b
--- /dev/null
+++ b/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Using a binary ebuild until a source ebuild is doable.
+# This was previously blocked by two major bugs upstream:
+# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
+# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
+# Upstream now releases source and instructions (yay!), but most of artifactory's
+# dependencies are not in portage yet.
+
+EAPI=6
+
+inherit user
+
+MY_P="${P/-bin}"
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-bin}"
+
+DESCRIPTION="The world's most advanced repository manager for maven"
+HOMEPAGE="http://www.jfrog.org/products.php"
+SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ssl"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8
+		app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
+
+pkg_setup() {
+	enewgroup artifactory
+	enewuser artifactory -1 /bin/sh -1 artifactory
+}
+
+limitsdfile=40-${MY_PN}.conf
+
+print_limitsdfile() {
+	printf "# Start of ${limitsdfile} from ${P}\n\n"
+	printf "@${MY_PN}\t-\tnofile\t32000\n"
+	printf "\n# End of ${limitsdfile} from ${P}\n"
+}
+
+src_prepare() {
+	default
+
+	if use ssl ; then
+		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
+		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
+	fi
+
+	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
+	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
+		etc/artifactory.system.properties || die
+
+	# See FIXME in src_install(), this can probably go away,
+	# but catalina.sh may need to be fixed for that:
+	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
+		misc/service/setenv.sh || die
+
+	einfo "Generating ${limitsdfile}"
+	print_limitsdfile > "${S}/${limitsdfile}"
+}
+
+src_install() {
+	local ARTIFACTORY_HOME="/opt/artifactory"
+	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
+
+	insinto ${ARTIFACTORY_HOME}
+	doins -r etc logs misc tomcat webapps
+
+	dodir /etc/opt/jfrog
+	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
+
+	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
+
+	exeinto ${ARTIFACTORY_HOME}/bin
+	doexe bin/*
+
+	# FIXME: this is called by catalina.sh (it echoes the variables before starting
+	# artifactory, as well as makes sure log dir, etc. exists). Those directories
+	# could probably be moved to the ebuild and the script removed from catalina.sh
+	# without consequence (and quieter starts). Would need to check if CATALINA_*
+	# variables are actually used anywhere (from reading code don't appear to be
+	# actually needed)
+	exeinto ${TOMCAT_HOME}/bin
+	doexe misc/service/setenv.sh
+	doexe tomcat/bin/*
+
+	keepdir ${ARTIFACTORY_HOME}/backup
+	keepdir ${ARTIFACTORY_HOME}/data
+	keepdir ${ARTIFACTORY_HOME}/run
+	keepdir ${ARTIFACTORY_HOME}/work
+	keepdir ${TOMCAT_HOME}/logs/catalina
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+	keepdir /var/opt/jfrog/artifactory/run
+
+	newconfd "${FILESDIR}/confd" ${MY_PN}
+	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
+
+	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
+	fperms -R u+w ${TOMCAT_HOME}/work
+
+	insinto /etc/security/limits.d
+	doins "${S}/${limitsdfile}"
+}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
new file mode 100644
index 000000000000..242019ded03b
--- /dev/null
+++ b/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Using a binary ebuild until a source ebuild is doable.
+# This was previously blocked by two major bugs upstream:
+# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
+# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
+# Upstream now releases source and instructions (yay!), but most of artifactory's
+# dependencies are not in portage yet.
+
+EAPI=6
+
+inherit user
+
+MY_P="${P/-bin}"
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-bin}"
+
+DESCRIPTION="The world's most advanced repository manager for maven"
+HOMEPAGE="http://www.jfrog.org/products.php"
+SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ssl"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8
+		app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
+
+pkg_setup() {
+	enewgroup artifactory
+	enewuser artifactory -1 /bin/sh -1 artifactory
+}
+
+limitsdfile=40-${MY_PN}.conf
+
+print_limitsdfile() {
+	printf "# Start of ${limitsdfile} from ${P}\n\n"
+	printf "@${MY_PN}\t-\tnofile\t32000\n"
+	printf "\n# End of ${limitsdfile} from ${P}\n"
+}
+
+src_prepare() {
+	default
+
+	if use ssl ; then
+		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
+		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
+	fi
+
+	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
+	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
+		etc/artifactory.system.properties || die
+
+	# See FIXME in src_install(), this can probably go away,
+	# but catalina.sh may need to be fixed for that:
+	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
+		misc/service/setenv.sh || die
+
+	einfo "Generating ${limitsdfile}"
+	print_limitsdfile > "${S}/${limitsdfile}"
+}
+
+src_install() {
+	local ARTIFACTORY_HOME="/opt/artifactory"
+	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
+
+	insinto ${ARTIFACTORY_HOME}
+	doins -r etc logs misc tomcat webapps
+
+	dodir /etc/opt/jfrog
+	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
+
+	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
+
+	exeinto ${ARTIFACTORY_HOME}/bin
+	doexe bin/*
+
+	# FIXME: this is called by catalina.sh (it echoes the variables before starting
+	# artifactory, as well as makes sure log dir, etc. exists). Those directories
+	# could probably be moved to the ebuild and the script removed from catalina.sh
+	# without consequence (and quieter starts). Would need to check if CATALINA_*
+	# variables are actually used anywhere (from reading code don't appear to be
+	# actually needed)
+	exeinto ${TOMCAT_HOME}/bin
+	doexe misc/service/setenv.sh
+	doexe tomcat/bin/*
+
+	keepdir ${ARTIFACTORY_HOME}/backup
+	keepdir ${ARTIFACTORY_HOME}/data
+	keepdir ${ARTIFACTORY_HOME}/run
+	keepdir ${ARTIFACTORY_HOME}/work
+	keepdir ${TOMCAT_HOME}/logs/catalina
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+	keepdir /var/opt/jfrog/artifactory/run
+
+	newconfd "${FILESDIR}/confd" ${MY_PN}
+	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
+
+	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
+	fperms -R u+w ${TOMCAT_HOME}/work
+
+	insinto /etc/security/limits.d
+	doins "${S}/${limitsdfile}"
+}
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 3d787ab4c6d3..a99f1bbe7864 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,8 +1,8 @@
-DIST aruba-0.5.4.gem 69632 SHA256 6f1c2210195ac94cf48e06de574e6f3897ec5ff7a7ca71cd10425b2cc889b0dc SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720 WHIRLPOOL 843e7cd5a0a70d15030bad868bbd1de94b25d96961865338c2596777ec87935bc0d3e4835259cb7b3e4843f4b0b5162cc11c44677ed966a927cae60eeb90c33b
-DIST aruba-0.6.2.gem 75776 SHA256 7c518ca72da37dc966c6a2f589d9953ab7576a43332b7bac38949d06f5009842 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e WHIRLPOOL cf85f65672946776f4de3f6b0b060c99adfa376353c3f11a0e27d2a32f7e400c58d863c0e574b415a19c52386294dfff01a7591c133772f45211700ea19f83ac
-DIST aruba-0.7.4.gem 91648 SHA256 64726a908f9355c1fdc15f26e4f657bc0c43aa034f86f3ce141c51f501e516b3 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118 WHIRLPOOL 2512507ee530d767b3ee6bfd7fd0de289c9289da69fd1c940f16817b8458b7a8c532e235c9605ec0a00ee0aab591181bfa37ee3ba93900b3fe6cab16a4a3f135
-DIST aruba-0.8.1.gem 121344 SHA256 110440880e0f572f44805765bc22ea20e5f822fede3628be9de3f55c7d0af3f3 SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f WHIRLPOOL 70b2ad1033b374e3ef61a7fe0b795d2bdf961b7d3d0a24e2a052fdd70755eaba37b3dfa1ff8e42a49fac1c715aca2859facb9c97d42d1a01fa425138c5255a58
-EBUILD aruba-0.5.4-r1.ebuild 977 BLAKE2B 47777f6811bffeb5f231d112d20c31231138854d5e0a3eb9258150d62fa27759c4d9c682d9d184ba5d0283c8f976b2b7aafc953c88baefd7bf1319446ec30f95 SHA512 24de1e675facfe1b8540a7a4479db18dde516052add73b9e02afb26d2f086ee93279640695924636f676ccbee4086b6e96b04d1015120fdca58b5aff027dbd3b
+DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594ff0d07d9fc74539d08f56df57a826bd87ee2b78989dad24b9bee7e6bfad7c10277b07b67ce39c663dac SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720
+DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
+DIST aruba-0.7.4.gem 91648 BLAKE2B 6a71fc740bcaee845271f82f7ab36a9205df796aebcd1502466e65690f978a090df7e13ebec5d172d4562adf5c5fbbb7b68606511f704abb8371989eb0fc4b96 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118
+DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
+EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 49e63ad8ed9196041efbe06952b08b527cc2d1333c563ad6ac265e974f5394adc36d915a6d4f588586930e2ea37488565c3ad8d30539587ee4c9d15b31020bb2 SHA512 39cdc79403806766050da35e5904e872575378b54692547e2f53e000f8a482c9e1940d1719aae9da44d6e2854b03b06a4fec43809aeda38a73907099cc99751a
 EBUILD aruba-0.6.2-r1.ebuild 979 BLAKE2B d726ae0afebbd5f50574ac9a846c1927ab733c6f5c92000676787944b0620d0925ea3864ca3f51b893dd9a152d3600581be174f7ee3b6f7cb2946f429168f750 SHA512 a50bb58ff396ec51ca349d985bb89bbdd887cf75f642acf29a8a51b8d4a876b191b1169c105bc22a22fd1fed4a4de154235602ad0a87d38873da393e32a210a3
 EBUILD aruba-0.6.2.ebuild 992 BLAKE2B cc346c563facc83dfe092932401ac736c44b45a1cb35a58c256808a9487c667e05c4bd451c5c10e6eff1a254e0a9c110d0156e6509e4a62ad5e0d91bd2add6e2 SHA512 859b7b7a1da19ad4687c8362a4fbc0964063f1d5b2fae8b209604add856e974e3b8c6f17627d98a2307c79bf526876223cf2f90f984ea7983352922d0c3529a5
 EBUILD aruba-0.7.4.ebuild 1305 BLAKE2B 8b0a11f7586caf45f615b06fe75f546e04724f15588098ab32d177debb4cbf1a409bdfae016a865963fe2d920e6e8d5a32e7f2dd6a1c41507facd33d88833148 SHA512 a3922e5b3550e7b93582b5fea463f68a0064a9e4e2e56950d9f52720a019f663e0163c8acea68ea5fbe0c48ef615e1124cda8c566affce80e122fc7551f9f694
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
index ddea35379014..6979e5175e4f 100644
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ b/dev-util/aruba/aruba-0.5.4-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 6a8a9dfb4fab..910f1f25ed4e 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -6,4 +6,4 @@ EBUILD bazel-0.4.5-r1.ebuild 1820 BLAKE2B 89980172d7f2f2bd708f0f070479df388882c3
 EBUILD bazel-0.5.2.ebuild 1977 BLAKE2B 3ea58cf2048b9825a17a01853d56f1f28cd2b84e14137bb4ef52d1d895c8351723447ae15e9ac379c21b8cd658bd21030058045aede3415bfac4c2591859b4c2 SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76
 EBUILD bazel-0.5.4.ebuild 1977 BLAKE2B 3ea58cf2048b9825a17a01853d56f1f28cd2b84e14137bb4ef52d1d895c8351723447ae15e9ac379c21b8cd658bd21030058045aede3415bfac4c2591859b4c2 SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76
 EBUILD bazel-0.7.0.ebuild 1977 BLAKE2B 3ea58cf2048b9825a17a01853d56f1f28cd2b84e14137bb4ef52d1d895c8351723447ae15e9ac379c21b8cd658bd21030058045aede3415bfac4c2591859b4c2 SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76
-MISC metadata.xml 789 BLAKE2B 03a7a8e839e3615d7464c91978f5c50fc577ccc67f0cf9f405cbee125ff60f1b2c6568d8a068ad8c97b0961313665b7ec682d306b5f2b3ec7f8bb53cd650d354 SHA512 e5790a5b54ca33ce53646382ff667656e0a843494cac2a6fbd3f11cc45b711b8dd656df1c16921484b186bf80708179602630d9aae4382587a19fe5b5270d77b
+MISC metadata.xml 783 BLAKE2B b8c4d566ce0ad9d6cf36726c7c9cd73d1fa40353d0e9eaa872cb800c0c8082c4287b14a57811168a326d201c46f3c250b2da11052e0b71ef90ec67c8dbb4c956 SHA512 3df923fa82ad27cc6b4ed4cf1f70b48d2a00f13c7266b35d0d3256e99fd03ea37f1c3b39daba503303e820e343b924c5b6441fa25dd354f3b9bfefda43d1d92a
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
index 518e125be253..33d6c739e338 100644
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@@ -11,13 +11,13 @@
 		<remote-id type="github">bazelbuild/bazel</remote-id>
 	</upstream>
 	<longdescription>
-	  Bazel is Google's own build tool. Bazel has built-in support for
-	  building both client and server software, including client
-	  applications for both Android and iOS platforms. It also provides
-	  an extensible framework that you can use to develop your own build
-	  rules.
+		Bazel is Google's own build tool. Bazel has built-in support for
+		building both client and server software, including client
+		applications for both Android and iOS platforms. It also provides
+		an extensible framework that you can use to develop your own build
+		rules.
 	</longdescription>
 	<use>
-	  <flag name="tools">Install extra bazel tools to build from sources</flag>
+		<flag name="tools">Install extra bazel tools to build from sources</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4ac1e181e702..dde387ff7ea8 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -12,4 +12,4 @@ EBUILD ccache-3.2.7.ebuild 2087 BLAKE2B d821a440198a055654f6961d9624d63a1c8cf854
 EBUILD ccache-3.3.3.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 EBUILD ccache-3.3.4-r1.ebuild 1849 BLAKE2B ca83c5dfe96bb3500b61cf4c80490f6acb437da2ee65f9321432f8b28f144c343760b0c6e6d35587c6d8ae6b781adf5ca1e3a0eff6dbca54319e02dce83efcf7 SHA512 a52424b561c952d169f27e82470e72941300fcefbcc431c1100b7f52bcf5c28fba7fedbf715734c098aa896abbd84c71eae820aa4a2552e2ae63005ac6bd4fde
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
-MISC metadata.xml 535 BLAKE2B 450f663bd1eb462f914cf8b91de064eccb4cbff64627c6b64cf686a06f48a1ad73216dea6d991202eaf11dfb5c95781c9a66592badd2f1755095e4881613a924 SHA512 1ea0a9f1079489e0f2cf70f923c0c2594ecabf73aa589fe2ca8474e67f41986757c7074145a5b68bc953cac75580497153356c51283e6a90eae91ac94f2fa910
+MISC metadata.xml 524 BLAKE2B 1c34a58dde9b1d3b231260ec8bb2a29d7a40450ee8b6318f21ada5b06a28084eeb9487ad6ec89bc2c66a6b4b55b14fd25b95082c57e8f8c7dab87f6c9d230443 SHA512 e26bbf57cf488e7d750f9f1e14b2f22b60df8c3b2a0eef6973fb0e8e6a2ef358cdf1aca10b5716c260c31adfe0c0a630d218253e998fb70ef6eea272853465da
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index 0d4a976163ca..f9b0907997d8 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		ccache acts as a caching pre-processor to C/C++ compilers, improving
 		compilation time when recompiling previously compiled source.
 	</longdescription>
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 48e123e733db..a94322b75fb4 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,9 +1,7 @@
 DIST creduce-2.4.0.tar.gz 677706 SHA256 0b4c5184b7bdc369a476c0eb4d41f1618f66e82d7ebeafa9492c0355ce63ed35 SHA512 75a603a8e2a967edfd12f9423f08b716a292f75e72ce770b083f4f9458510c3aaa16a91102c75f0ca098d08bb898fde998cae81e17c680dab330164fcffb5b33 WHIRLPOOL 676d20f68ff540abaeb7d64adf4fdfba7d2b164832481029b8a2cc0d95fe55d407ec7ffd7e5a85117cb3194264a70ecb79dbc95b7d5ddf1d62b901fcc6124a6a
-DIST creduce-2.5.0.tar.gz 742516 SHA256 2dcd784e1d27df60f4ea1d92c4c556c02da4152db353d544dce8b7813fa443e4 SHA512 5292381ddf5e2b061bcfb1a3f52cd25cab3ab5985faade7c779c41be19b5cf7309fbcfff1428f026bfcee5da7c6f898b0b8fa48d03ef83acd64000c3ece2189d WHIRLPOOL b73c5f091caa697de9bba5f069e33b796a9a02efe5c5e3c0536ba94f9e454270d1750c93a27a953ac58ff6e8fd816f78b60205a01b24dd4140e927b6e1a33e33
 DIST creduce-2.6.0.tar.gz 763886 SHA256 cdacc1046ca3ae2b0777b8f235428e7976b0fb97c2f69979c8accd8d2cc0c55d SHA512 e2a08127d2aea29b6934792eff4ff0d9f10952ca520671c60ef4b24a48522b19c48336d4b9d0b8e8c633dd8832b2a56d3d0daa311478e474e974c60a0ae381f1 WHIRLPOOL 882065bed157f441df9628a9e691f69c47495ba54b43580d7c5eb442d7ba58e65d674655ee8e013203adfab581b49f973e3ada3147d3e4b9fb707572b49be652
 DIST creduce-2.7.0.tar.gz 768832 SHA256 36dca859c97a988e71b1a08e0cbd5849e4da051d248c5e483494194c4a231a41 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226 WHIRLPOOL 224f4827317049971cc30d6909cfb4c094b5022c30c4d80964df85dfeaa3ab9a4a20685d685a820701daa16e82863fb9e625e2a94fa56a013e284fcfa95a9a8e
 EBUILD creduce-2.4.0.ebuild 605 BLAKE2B 225498cfb81f8ba12950c633e46cada16fa2db17f14b94950ce8303e0f753a30f98865688f73cb89e258ed2282c119409ef1420c1e5b7d0457f0808f5dfe7c4a SHA512 9213fd59de68f2ab9353c3d080e4f041906b210adf73ecd0f0fdfaac1b22926b74f958cb70cac30ac1e66470d50b77c8ff75d5b741c3d0d4c5a4f58ecbd5e2e8
-EBUILD creduce-2.5.0.ebuild 589 BLAKE2B 678258953fefb98436bf62f76510f91c180666fb4bcf88f0f647f89ec44bb3dd389efb304ad44f6eb7878838868579626d9d35364ecbfbb013e9f2b51b58eba3 SHA512 d9c7c792c642e5c8e2305b511c1af83b6d935c95a0539324378032f15406e98b933808eab8d0a53d186e249f72cdb25b8b7a9a6af4936f5cf3165ce3b2439487
 EBUILD creduce-2.6.0.ebuild 685 BLAKE2B 4653902af6969da46109a8731b2d26246364e7b85f9360afdde9f912ff6bf9d9426ee48864b631bb9569ac4e7f35a8309ff0f83bd813249d2e70d25f3c55236c SHA512 57ed962054073e3220adfc02d5fccd6000359c189404cf3c01763312ae675876f52f6900a2d42431373c1ec56b78aa664f0fe9bd555f6e524196d22290985313
 EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
 EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
diff --git a/dev-util/creduce/creduce-2.5.0.ebuild b/dev-util/creduce/creduce-2.5.0.ebuild
deleted file mode 100644
index 6e4e0f845cbc..000000000000
--- a/dev-util/creduce/creduce-2.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/perl-5.10.0
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent
-	=sys-devel/clang-3.8*"
-
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 530a743eff1a..64a829a2d7d9 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,5 +1,7 @@
-DIST cucumber-core-1.5.0.gem 45056 SHA256 594a30969a33f03693915db7eaa2a137e45fed76d9ae19ed7b96a4bbb1764262 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74 WHIRLPOOL 7e703d2f7b6131417e0895ee27c0efd511fb98a600a607292e4e9f77e1ca45f7241746b42c4509458b624992a00a60e850f12f8623110359fc0f17a015d37fbe
-DIST cucumber-core-3.0.0.gem 52736 SHA256 14877556e8f05aae857f2f2a5356cb96dfabf40e244a2544c57d2d6f54b71b9f SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75 WHIRLPOOL 75cf647046d29a17ce430f542a51c2d96be1e8de1ff3abb6a8cf49c1c531cc04fa0619fed8c47edca411173085df0aee746f1a5904e4ebc5637d22231a5e0bc4
+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
 EBUILD cucumber-core-1.5.0.ebuild 721 BLAKE2B e844a9bf54ecd54ba4c83d41b176c8ec0ea61dc595fbda3bc971212db0e4a30f487dc6111cc51835c8f539534a8588d10e391e269716f17bc35bc7ae985e95c0 SHA512 51ec60b0442ac8c42d1cc67b580d480af1f00e2bb3be71adb7d6427a73c9e0267e14d8b70267d292dd9323a9d8b3719b7357135aadbada16fa35f60d894307d2
 EBUILD cucumber-core-3.0.0.ebuild 772 BLAKE2B 5b577563e27cb2edb67d663bfcc8a7a0be3fa15c2301ea16f3e9faa8fe5e571fb164f9b41298b1a53618948353e26360f56180b582b21840499557c14021961e SHA512 d7ab47a769cce58a984cb3a2ee04adabeb4baf6e58cb5d0462ea14b26f7216853b449196f4de13f79fa383392e670284b45ac7ad0bafb0b98b4d6ffc843329c6
+EBUILD cucumber-core-3.1.0.ebuild 900 BLAKE2B e03b278e6a39d3c188123ef3c1a67d681581355b75ed6bceaba5de4c7c3687b985e3d3836f8ab85ceebb0613524e43297c36db98828e736ddc88bf5b3b276c8c SHA512 021ad5f6294383d136abaef2f25bb534474da77251d874da7b52a6abd44d5a6f4585ced131401d089fbe4b1ef811d206dd68d85d5a0f39639a2dadd9559f4ea5
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild
new file mode 100644
index 000000000000..fed19d04d55e
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-3.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+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 ~ia64 ~ppc"
+SLOT="3.0"
+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-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 35acb6796049..1c3f17a4ea47 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,5 @@
-DIST cucumber-tag_expressions-1.0.1.gem 8192 SHA256 8ee1756f01115627f283124909f23361d0a3f958b56622bf221a3db54d020583 SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6 WHIRLPOOL 6e1477b9bcdb1831f05602ddb75ee6ad820c350fc8e351f2c0fd2c48e7ea0d99d5d0ee873ea8bb2cf33c9c6f704bc592c16cfe0d0b4056442ad9cc4b5178526f
+DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
+DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
 EBUILD cucumber-tag_expressions-1.0.1.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
+EBUILD cucumber-tag_expressions-1.1.0.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
new file mode 100644
index 000000000000..37e6c5e8fac9
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber tag expressions for ruby"
+HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ia64 ~ppc"
+SLOT="1"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 05db26702f08..6125f91c409b 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,7 @@
-DIST cucumber-1.3.20.gem 279040 SHA256 8720b60453866f3970d2743ccf62a503bc656a56c7077cb30a892011c248f080 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050 WHIRLPOOL 72488e56a8e8c34cf35fcf8f3dae3b4d80baaa2b57d4e10207bfcdf93e2d7bc45cd13517c97aaf615049f0ee1e6f583db45473f6270f2db18455aa265eeb8ef1
-DIST cucumber-2.4.0.gem 250880 SHA256 307e87c24e250d015c1d9990a7d79f7bdd9b239aa25681fd861fe491541892cc SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e WHIRLPOOL 3a4fed0ea04a68732cf9d6177132e897e8de9de1b0cba225866e0657d1b798c53bc2139aba5fb1ac26990752595d3d92a524a1e3fdb04b26ffdf2eeeaffff141
-DIST cucumber-3.0.1.gem 265216 SHA256 bcd927f02c900178531d30714bdc3a5f201d0232a99565efbc65ad0c66ee16c9 SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b WHIRLPOOL 0db85b2115e5c89667223f928fb4d433c5942c03327440e9e3fdb35ae5eb3a0ed40f3c91284b84131972f358f057d86f08b708427a4d8fca71beb1e4a7cd5344
-EBUILD cucumber-1.3.20-r1.ebuild 2171 BLAKE2B f9ac80ff2e40b7f35efd41d73c8770f4a0ec639a687183b8f09a82a9a8c222ca2c7d0b43b48bde38fa544a57a46b46c365ffbcfa662fe11c8da788cf210482c4 SHA512 5022e706aa004375adda2c7a180257d609b9a4c39ea7594a02b4ca57e85d97d7bd46d8b208e6e88a82c22da24776f5e1d68de31f3bdfba084f299d1c733ca4f1
+DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
+DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
+DIST cucumber-3.0.1.gem 265216 BLAKE2B 5bf7e2e28f268dde043a5b24ec18cac7ff1e00443d0aa80acb9ade5419c94c3854bfb58c24a88d7db7d9a00aa6576c5a2ff46c1092cd89629d73c6ed6f3c83ba SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b
+EBUILD cucumber-1.3.20-r1.ebuild 2172 BLAKE2B c77fe5c6d6f6fee2edbf04758c1dacad34a7366d3b3c6db97b0c9c0ae08e1b05f12397db76f86cc2dac3c2f3ef5f46d779ef9d7e8051801b2cf425a75fbcba5e SHA512 b0fa2c24c9cb0ba916e9339f904a567562ab0d22337bfc0e92fcc0c28ab386780c689b5aeb5fa5bdb8fa8fb6054866d1f89573ebc0c20206dccc6dfebad8f28e
 EBUILD cucumber-2.4.0-r1.ebuild 2243 BLAKE2B dbd5da252bdd116741159cdec2030ded1353a7d2761ef55e49bed03cd12a2431b6f9701441debc5ba4ce09b3d6d0d6594146765425c2dd69564019f2b7eeedc2 SHA512 5d09f9b09b7a844c5475706db6ae5e9ac707599bb9a88d89ff8317a01b796dbba99cb7776e18627f768c15b29f7613890e74557fce0f51ee96eec393f5d28941
 EBUILD cucumber-3.0.1.ebuild 2455 BLAKE2B 0f7d4aeaaf0e9d7485b7b2eac0f0b4ecb26e5de337759c7f9583f63dd98e3325732cdef97d3aeac3b9528b2d06212afbc7ca7cc185779569d21b2b5131f2dd58 SHA512 279ca5ce616aeb93fb6faa546a8dbaaa970116976e3bf701155400da7be22a9d3ec792a6dd746f84ca7eedf32b4da574da64b0595dba6c4d8c1f8b1c8a9f9b3d
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
index 76491b1cd5c4..d0ea2947ec3d 100644
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index e9bc43214736..b73e3ef93e09 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -2,6 +2,6 @@ DIST dialog-1.3-20160828.tgz 501960 SHA256 453095abaec288bfbc1ca9faced917e17742c
 DIST dialog-1.3-20170131.tgz 507783 SHA256 81baec14cb7d76951763576ec276210b3a869e768ad5e2e6ee1cc53420ece8c9 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786 WHIRLPOOL 33fdc9f3ebf129560a412ff2bdae3b14648f31925d76bc4085613bcd7b74606c2e63f76b7b86af4c032d82b987ee5bea81b49998f07a0d7d83651189c701aaa6
 DIST dialog-1.3-20170509.tgz 509135 SHA256 2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756 SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56 WHIRLPOOL 6a98e9737d601ef58499c0a8c38464fb17566bbe3534eedb6184abee14389cea73d33ecc999179edd533ab7515395060eb37e9a402c43072597713d594743798
 EBUILD dialog-1.3.20160828.ebuild 1290 BLAKE2B 465efe5d711d6b4a7efcb4395d4c4d34d00e73e3fb42d7f1103ed36a0b89cb8f05ac3079a09d2248670d4946af43e835867fb00f330bda6c81907e1b0c12bd60 SHA512 f611cb56a20f8b80a192ba7d05319e39b3ea8174d3abb35ddf2b8601aa596bc10ab9fc21d011e43fed65f74b2c65929c686fe4759ae10a342ffaeeb04f1a6e20
-EBUILD dialog-1.3.20170131.ebuild 1296 BLAKE2B 26f3e8fbb1bb540c5e0c473b84c4d1737b9f7ab4771f6b211c988191825eb90872445d580fa5da26f171a1ca7f1995eca66f66d7d659e326d18671cf17574155 SHA512 961ae5dd9ba804cb61d5c1079c8d987b0fa9f3cd3cf5b274fc5c160bb971cde30ef80fe4e9ddde4de4db314681415145940b75718632008edc7de801b7d1b1b6
+EBUILD dialog-1.3.20170131.ebuild 1295 BLAKE2B 9729eb4ede694286eada521f2850358d910bc5e1f6248c19b53acfc02a34b64c27922fd1fbede1b1c300ee696d1ec8f066f837e4d585da4a617af369f8592943 SHA512 e06f785c9f6d85001470e7314cb9165785543e00efd15b1fca9850e65391b7fe3d695623127ae3019974a6c0f1cb6973d2540b60388009e10ae1e2475bb14bef
 EBUILD dialog-1.3.20170509.ebuild 1302 BLAKE2B 61ace37a93ea4bb328f6adc2eec9378a80d1879c32d63111f79e2291f7c74d9a1bb54225afbc5dbf6e3a5bdb30621182fa46c3c5ef97d48f5a6fc403e1509966 SHA512 7e19e71da7ee76ec74f0b7903c8254b7a377010128f4f6b4d5b83b2b1d4732717d1d1f460e7109ca7134710bf9be229f52365e22d44cee0219154c4d5299e4bd
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 4e0825e81575..c12f833acca8 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index d46fdde72c39..e0ef9bf1b818 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -4,4 +4,4 @@ DIST geany-1.32.tar.bz2 4341296 SHA256 8b7be10b95d0614eb07f845ba2280f7c026eacd57
 EBUILD geany-1.30.1.ebuild 1570 BLAKE2B a50ba6cc4c43000bed7ce4b1f8bbe1c0a9ecdf0729be7377dc16c976debf848d63a3aeb147558d005e2759df60752ba4061a8844aca239a2dbbe76076c3407a8 SHA512 c8d077fa9cfb0a7911f8ecb4fa343f359da2f48ab252928ba594e66e33ecf694e28239f5ab0185cf0d36b2e0421e053daaf9d12ef5fce48a8b458a47d319fe2e
 EBUILD geany-1.31.ebuild 1578 BLAKE2B b8d24b3a80cf74be805e0a77130a110e4c02a4d571cacf2c6593fcee85e36d6bb40609b70357667f0a764d5ea779dca19b74aa284e50aab9ba9f929129865979 SHA512 2901aeef60de657cead6a8014f454fde320ea444ac0971e8d9575b22a26fc28c5291873cf2aa04a630159c7385c8089cc9a4fe86d4df346a828a065095df023f
 EBUILD geany-1.32.ebuild 1569 BLAKE2B a451545a2dbcf970013939a50f67af077d1ff82eabfc3e0167731abd5ea3c3cd284d928d47d766ce9c070369192c8dbad0d366e14b3ccf1424b105d99011dd8d SHA512 092512d94cd461d2ba5822a1a7c6fb8151170bbadbebf037f2da41351e7be56780344c29734bc48d88f369fb20f2d9a617d1a9600f35909fd0b449d764373182
-MISC metadata.xml 1992 BLAKE2B a0a8879a3c87090650c8a516248a4b2596e052f10caebbd6ad4f341b3b37f735a497e11b0e9bad133d6fde839143a38a03c201eea1694404e3ee5140d70f6094 SHA512 74ebf425ba5707bd535cdd3a70af5372eaeebebd6a49a4829b4d2aae7e9dd5b0f9955b7928d869fd24a3ee310e216d52ffff2d20703611bfeb20619e52fa9f29
+MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 2231e497c97c..36e14323b610 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
 		Geany is a small and lightweight integrated development environment.
 		It was developed to provide a small and fast IDE, which has only a
 		few dependencies from other packages. Another goal was to be as
@@ -18,7 +18,7 @@
 		auto completion of XML and HTML tags; call tips; many supported
 		filetypes like C, Java, PHP, HTML, Python, Perl, Pascal; symbol lists.
 	</longdescription>
-  <longdescription lang="fr">
+	<longdescription lang="fr">
 		Geany est un environnement de développement integré (EDI) petit et
 		léger. Il a été développé pour fournir un EDI petit et rapide, qui ne
 		possède que peu de dépendences avec d'autres paquets. Un autre but
@@ -34,8 +34,8 @@
 		supportés, comme C, Java, PHP, HTML, Python, Perl, Pascal; liste des
 		symboles.
 	</longdescription>
-  <use>
-    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-    <flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
-  </use>
+	<use>
+		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
+		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index 8657250bb09c..4d741a64e8ba 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -1,5 +1,7 @@
 AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
 AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
 DIST icmake-9.02.02.tar.gz 371881 SHA256 18f673c66c39a392218725ab063ed1cec9f0b28ce00f3896123ecccdf855834a SHA512 7d62569d21224f4584fe6901690a53fa82882e5690ef296cd0fcd770bc19503ea5a5469a7b6eebc8b6719606630e24477801c3c5752c70efdb74a6f6d30bddb9 WHIRLPOOL 20dcad5287958f640f53fff2a0c220cb0c209fb93cc4e45826d7ac4465a8aba339866bef632ce4f869ba25107f1e0e58e6d6d17093389d53ffac6fa7d32f278b
+DIST icmake-9.02.03.tar.gz 372015 BLAKE2B 95886337693405c9c4ca73a0bf787fdd7dc0d4ca0b9955455acf99d9400ea7887b689f7f6b32cb19ab0043bb2d8463cb93443c63c6bbf1dd9dced8e83f03288e SHA512 1650497c8c2b2de949da33a293761ee371b1004c43234eced7840b66d0808b551dcfd09ca6b5fb82a9438539033dfc91138c2c16c700efab24821b043e3b0f10
 EBUILD icmake-9.02.02.ebuild 983 BLAKE2B 156342cbeb95e031b045a579e38f7fd7d298d3c47d695acf5c2410b846f40c52d255829e5371e2f427ba182009d8423c62950b8874b427f6f060a0631769237b SHA512 0a2be376db0816a4d62626e96dc28129306d8dcd41ecdb08a86aef650031e69ed3881b594cb024ef6c9ebddb3d373c770577322bd0adcc5ad06310cab474916a
+EBUILD icmake-9.02.03.ebuild 992 BLAKE2B 79e819cb0cce0791390f91aacdffd157283da1083ac655e527412907a509226ecef876063550873679b20644dca276c112db46debcf0bdd8202f7e58fbe85e4b SHA512 9e0c1420696ce6a88c7557ab0868c0900879fcb4b7e494e66a491f21018a7de9f3bd23458730ba9084578b26036650d0cbcb22f9c698293a30a04ca6680aaf83
 MISC metadata.xml 376 BLAKE2B 634e6b0be8b62eb23a242832d14772bd8bdd042747c80ada99c14fa4980e0be11b07e411746d48767f5f4df2288c70cf38f8eeb0fcf5efd97e044adde85fd73c SHA512 3ead41cb13dd73abf13566a5ce6911b39d4081cea9a77360b1102b2c439c04a97dc98e311b34e87200db7ab53f7ed07d6982f363b6ea29e8115dd808f2d0c245
diff --git a/dev-util/icmake/icmake-9.02.03.ebuild b/dev-util/icmake/icmake-9.02.03.ebuild
new file mode 100644
index 000000000000..4dceb3858d7a
--- /dev/null
+++ b/dev-util/icmake/icmake-9.02.03.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="https://fbb-git.github.io/icmake/ https://github.com/fbb-git/icmake"
+SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${P}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.00.00-ar.patch
+	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	# fix build issues (bug #589896)
+	append-cflags -std=gnu99
+
+	tc-export AR CC
+}
+
+src_configure() {
+	./icm_prepare "${EROOT}" || die
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/idutils/Manifest b/dev-util/idutils/Manifest
index d7e33ba92b7e..b85e2bc1cb82 100644
--- a/dev-util/idutils/Manifest
+++ b/dev-util/idutils/Manifest
@@ -6,4 +6,4 @@ DIST idutils-4.6.tar.xz 1001496 SHA256 8181f43a4fb62f6f0ccf3b84dbe9bec71ecabd6df
 EBUILD idutils-4.2.ebuild 1030 BLAKE2B ea65859c8ea252803d5d1988f3af729c5d2ccaf741e39e2531227135b0c7ad1593a095ae3f625b7f1f5a5796da3df44385df883ffb002591008ebd4f2d9b2e4e SHA512 66a0317bc686294ba65b08f7200de33a07b163db90310952dd8dd78e93bf854ffcc69e2b167c53acb565edcdb7113448b8ac41a089b4003e7e32d34db65f83df
 EBUILD idutils-4.5.ebuild 1068 BLAKE2B 90ffc4ed1eca039239c7ee8aafba437c34f75fc9308666d667329eaa6e2929c16abe2167fb0d8cfdcfa0fbd11c22b3c7ba2437e82e576296dbd9b158dbf17150 SHA512 53cfff637ddc40d96092c60d6604f98af3205d5c4e8a161a11a83e771cabf2b584ca471b42f0c5ccef5f2280b1698437217a8334e0175ab26eb61540c2172bb8
 EBUILD idutils-4.6.ebuild 720 BLAKE2B 51a9d40987fff4f15d50335b5c817b6b3097620a5cc8e95efff7efd93e5be1bbf23d550843eb748f13cae6d106f4094ac2d0d9ec01a3be69b94ae0f4cbc2e557 SHA512 0f35d7b81bc9b06df314b40666bc728316ad36f468f5d8cee602798beee5f960bafc1a8a151a67efa9ba50dbfd1b9b5a4ff1ad0a6786a6e9416b9eadce959072
-MISC metadata.xml 582 BLAKE2B 7be2ac41671034b63042636f5a15fd8e2c5a44849128334da46c360bef09937be3c5e8fbabe5ca93cbf6ba52be816d0d9c387324d8e85e927728cdfdcdd0a1b4 SHA512 029baafbdd90c0a269cccd061043d59ade95f0b405056ccce06b5b5667b74ec4167e1ad3617ca2230975e3f5f782218a0043704e779707d9bad21a9d808fa777
+MISC metadata.xml 591 BLAKE2B 91443111daa5642e9fdac540aec9f5d406ddec96a3ba68b31c6f282018dd463cec8cf9a9c46c1a882bf6907780f7ac4703f088acfadd2162c845777150049967 SHA512 593591a9d4a0d3303f6b96f06a59bae0983abca6b9d0ad9e0df691d3c192cc442a39bd18bac3b87257057ebde50315dd5d6c1be74ebfaa7f21b5ee0c690e9f25
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
index 9c67f75d7191..be1a52884a34 100644
--- a/dev-util/idutils/metadata.xml
+++ b/dev-util/idutils/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription>
-	Fast, high-capacity, identifier database tool.
-	Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
-	they program identifiers of any form, literal numbers, or words of
-	human-readable text. Database queries can be issued from the command-line,
-	or from within emacs, serving as an augmented tags facility.
-</longdescription>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Fast, high-capacity, identifier database tool.
+		Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
+		they program identifiers of any form, literal numbers, or words of
+		human-readable text. Database queries can be issued from the command-line,
+		or from within emacs, serving as an augmented tags facility.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 6c265b5cf717..3d56fbe0b2e7 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -1,7 +1,7 @@
 AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d558cdb7bc2a87c8211c88cc7defe41faacca6a5acf52c4cc47dde6aa8378d269b9c8ae42a0ae3d5b74c8257c2d5829b1de296e SHA512 f4fe5452b81d448d19ec58196ecb1a0fa619daedd67c86fc16dcd8f45b4fa449890a0fed14d6fdb259f7c6b13cf8a1ffe064d540305913a0d9df80bb5042aa17
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
-DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd
+DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
 EBUILD intltool-0.51.0-r1.ebuild 1012 BLAKE2B 1216428c6114b24670c9a8d97fc439be021b851a9081ddf371f188bf8c4e2e2ece04d85e64aabdf8a7c8c9f62faf19ab34c0d4703157a92c370271a35e043840 SHA512 4e437718701d259bf927c568e3829c0d7c4fb8c175c9b51d844f400fbcbd076793eda5ed924845c77952ab6a4efd0a99059eadad0828b6819c26bbf2741cda5b
-EBUILD intltool-0.51.0-r2.ebuild 1017 BLAKE2B 37a72dcee8587184158f1e8d19e1cb7f21af8442805eae111d4e79febbab56f5e1c3131659b0d3fdc4331bd069f1aa23835c561d5210dac640db2a838bd6499a SHA512 0d744d134aae2afbe386cc5b40785f00787012d67faa22942b5bb0032070fd970b2ba7131562be3d9106c4df7285abb08c5d1f7102a43374fea45723335a2261
+EBUILD intltool-0.51.0-r2.ebuild 1016 BLAKE2B 576229c6bdd7675008745f3481f5291b58995e85fdb19ba5023706660b237eae67fc742461126ddcbe21c8cca1fbcca3f5f42008a2c2adde7fb7a9c44b8155ac SHA512 40f3659ea892cf06163cbc6bb55a5e1ec2954f47f0fdb47250ad648535cc88aad87fd6306567797df36132f8ad99d39420cab928f55e4b570b3c329e239bb52b
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 3f4e67497e47..d52d2aa41ac6 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index 4a01bab3f3fa..11e48da0806c 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,4 +1,6 @@
-DIST kcov-33.tar.gz 276028 SHA256 23e20157c8fb933b76d5733ca5700c9eb2399851febf0d4144d7b2dc940f4464 SHA512 e35ba3c4dc320cef0cde097cfa2c4067ec6bf86a5ee797d3ec111facffa036da4fc4d403e63bd3767d03eac511987592e77ed61810605f8e2da77c26570e245c WHIRLPOOL 74a135ee5f04842013e8df75e5f9cd2e37d78cb54e0849abfae8574db924563dee4787bbaf50bd3d7fbb5302e09eda8a4cbe549b59acaee92fed5d9272e8d90f
+DIST kcov-33.tar.gz 276028 BLAKE2B bed7f2b2feb3ecb1a861928306626b44904af52f30d5721cd0e6ba9ad5db5edb1ffb51fd64ab0fba5f99fc0329bbe87949b901bc73e2299c2075817f606113aa SHA512 e35ba3c4dc320cef0cde097cfa2c4067ec6bf86a5ee797d3ec111facffa036da4fc4d403e63bd3767d03eac511987592e77ed61810605f8e2da77c26570e245c
+DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346
 EBUILD kcov-33.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
+EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
 EBUILD kcov-9999.ebuild 638 BLAKE2B fdd240a4bf38de8939b29ba7c04c1f29fe8977a074fb2c35bf23c80ac34539da1a0f39d60073a785d2850194e92d03f8618e6169ab00706cb0b686dd458ba5ce SHA512 cec899ac8769080dfa88b1d34d9f4a0b2da654da9712a4236cc343533e3bc33815159ef84074c843eba3053ee672f034ac2c439e9431ae2e0a0b4eac5f584eca
 MISC metadata.xml 334 BLAKE2B 49f7a7004704c8531accf4ab5979f0823e400f8bb8e79c987091b02e8abf7f288bdeb6eb9c65953605bf95a8eb07fdf9952c1c905a8f588225780d3ddef3b3aa SHA512 1a6d96440ff3def1c7fd765dac9c4f8240b36ce918c6c8d0803b2d2a465be5b571e31a2bdc4540cffc485eefb78e65f7ec5b30300918571e1d641112a078c7b3
diff --git a/dev-util/kcov/kcov-34.ebuild b/dev-util/kcov/kcov-34.ebuild
new file mode 100644
index 000000000000..7f1e7488e3b2
--- /dev/null
+++ b/dev-util/kcov/kcov-34.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
+HOMEPAGE="https://github.com/SimonKagstrom/kcov"
+SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/elfutils
+	net-misc/curl
+	sys-devel/binutils:*
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index c7151a556e74..03572de7e5d4 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -6,6 +6,6 @@ DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c7170604656
 DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
 EBUILD lldb-5.0.0.ebuild 2811 BLAKE2B f8a5c12fe179486993f4ed0da5f4b6abb4e282c4c5702277af7853cb71b4cacd1fa998346d07373fdc0e5f051155c373e2c5cfc30131afbf08660a782ac7b81d SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4
-EBUILD lldb-5.0.9999.ebuild 2979 BLAKE2B 1236c2caba58a97d194db73a82f9045c6936358f4b972d3207247f94a186d39a73eb7675f73bd760973f9e821b595c695fc960430ea0d6eae10b69fd8aa047d4 SHA512 46a0d9d7cc2d495037134f0ba7fd3538c974d9d1ba01290f893d2dddec4ab92905fb05c070a9b475f0a6d28c8fb132172784918ff03eccc0b2472573df05fbcd
-EBUILD lldb-9999.ebuild 2996 BLAKE2B 7e911509a45ed7e8ef8be2a9ee4ea919cbaf3159fd7919f7807623b4ad0cf39c3479ef0b3b224bee3794a66e80b4b3a0867c39a91f1eab2c2f21e44a9a121c2e SHA512 b4a20858c088c351ec69bb7989c8cddb98b6fe9eec55ef36163790771bdcd7dd51dcce44d1866ead97c74e187b86e4761e47a7ae9d962fa3e2149fb4943811d1
+EBUILD lldb-5.0.9999.ebuild 3017 BLAKE2B e4c15b52bf428a5b494ad0573d7d2d59fcd73bf04a369676a4402999a48c78a770afcee927c4418e30b5b040f65032aa751ee4418e19e7b552721419a45f5de8 SHA512 192f6dd7bc2addafe3614e5845d3b0e559c5804bd481e15c2e21018529d635fd5f242240d4ebcb8856e90acc17980db12f90bc652bf0ee1f36b9d62f43205aca
+EBUILD lldb-9999.ebuild 3034 BLAKE2B 56d803d7e909d209ddb0520067348425c6aefe037257fb586a3886d2a7919dac75b543d485be9b3f0c377063948dc4eac993f50997b80a6769303cd251073e68 SHA512 fa4a7ffca5a13ec289bcf87793448d172073e832e1d2847d1b87bb7d71ce01cc87b0cedae76f37c0ef878967d89816f6eccc4273b8e8c3fcf91d01e462604a93
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.9999.ebuild b/dev-util/lldb/lldb-5.0.9999.ebuild
index d1d0b573437b..d6bf9c6540ef 100644
--- a/dev-util/lldb/lldb-5.0.9999.ebuild
+++ b/dev-util/lldb/lldb-5.0.9999.ebuild
@@ -57,7 +57,7 @@ src_unpack() {
 
 	if use test; then
 		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm
+			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
 	fi
 	git-r3_checkout
 }
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 143975f66c9a..8befa71e1b0e 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.ebuild
@@ -56,7 +56,7 @@ src_unpack() {
 
 	if use test; then
 		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm
+			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
 	fi
 	git-r3_checkout
 }
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
index 739f8e98b56a..ba336367ce40 100644
--- a/dev-util/nemiver/Manifest
+++ b/dev-util/nemiver/Manifest
@@ -3,4 +3,4 @@ AUX nemiver-0.9.6-fix-build.patch 1123 BLAKE2B 739e42afdf466f23ec3fe3fae91f4040d
 AUX nemiver-0.9.6-gcc6-throw-in-dtors.patch 1734 BLAKE2B 4855d1d946c393815ddb5f54bd1cf74151c05c4fdf4a0a01ea50bc56109589b9fcef63a086edd4806c924ba0791ace37097cfbf1bbb6f3a6953b813c3c421052 SHA512 329c4ba78849fad8b20dba77cf66eca1994532946adb75583e19caa24da9360b50072d8ee9affac18aac65f245a96a911d783434d40ba23cee22a03dba3080cc
 DIST nemiver-0.9.6.tar.xz 1427660 SHA256 85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2 SHA512 6fd941975af6e9ba98d7100daf8205f8b61f75ccde4aaf30145a4e2beafe1b96b14ab70d22db7c258aabc7c1a71d4787aa121bc4e943b3fc310e00c13feb4f21 WHIRLPOOL 4c0897901f54467ea9cd49167a528631500b97d590811c554346cac7a54e21bdc68fe671717cdfd8c28f41fa9d0fa2ef2b5e29de0066ec561439462eed35eef1
 EBUILD nemiver-0.9.6.ebuild 1407 BLAKE2B 5a61269a0909b47d02dc847afd90dde4279f93e36b101cd73885e462c02983b2135a2c976f17d3fb9453d2e2b0417d933d106f72a51a92a1a7cfc46691ecae59 SHA512 7d332099a32235f626e819ab70d81965ac202b0100e8cb7fa130d65b525257e6f28936640192e300544876482e2a1abb0ea9c44482cc6529eb85765b020ef3f8
-MISC metadata.xml 560 BLAKE2B 76be786cb9e316e8d8f6abb392d27eacebe212d7a6b6a3e89a8ecab7ce7cfb4bf55316a6b04f50d777a1a251fca024520cad79ab825ca65ef506007e5c89c49b SHA512 57946391e99389c2e7287285c61f16eca71b6642beef53a06a6a884ae35e7337d56d16255f2e7c4e23e62b42cac5bf2a219c18c65efd71c2a2f50d1700979158
+MISC metadata.xml 554 BLAKE2B d078ba85541e172dce9f1b39b8384838e02dd7154a5a204a527cd6a1ce6d30f3133ea071730653bc827d0563d629566493e00fb04472e3599f4e19785fd54e69 SHA512 494c5fc60239abe00af0f60f96a3170f997fc6ce76692b996c2ad38b3a854e305d6af6609e1fdd68a169abc4aa933969519fff04032582b286339ef58628fa09
diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index c61ba4c696b8..8ad7abb625a6 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription>
-    Nemiver is an on going effort to write an easy to use standalone C/C++
-	debugger that integrates well in the GNOME environment.
-  </longdescription>
-  <use>
-	<flag name="memoryview">Enable the optional hexadecimal memory inspection
-	with <pkg>app-editors/ghex</pkg>.</flag>
-  </use>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>
+		Nemiver is an on going effort to write an easy to use standalone C/C++
+		debugger that integrates well in the GNOME environment.
+	</longdescription>
+	<use>
+		<flag name="memoryview">Enable the optional hexadecimal memory inspection with <pkg>app-editors/ghex</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index dcfffd5ad8c6..277d1f122a4e 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -9,4 +9,4 @@ EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf0
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 BLAKE2B bb1f549d41e64984e8b3ae629461f3bc616bb776324fd2d29e529a66453bb2304c8ad6d397e7c5b790d759455869b88f9796bf12f760a2816e651caa85226480 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa
 EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3803 BLAKE2B af3448e2d60b3f1ba82594628a783d17fab1d5de9a45eb1a8974ad6b233a41ca447a38a593e88bb63ffacf67fda7b554b2fba5a77a326987c7755265004f5a49 SHA512 22d346ee211e410d74b110d62252e1299f4eb77a51295e329fd757a73010732d9d32c1c68f51b3b6e81af1e34207b3a74419e8df9a20e20632ca681ecc98cbf4
-MISC metadata.xml 394 BLAKE2B db357721e245e939e85cf9b176bd70e5fc9eaf2fccd1ae317cdc6b9218a083c68435227d11f3d36ac58ac9914623b0c1bb0d4117a5234f0661397c9ecbf75d7c SHA512 f20a681825a67b16424264661572ef279bade1ff346f846c5fd7e802f6d0c012653f462580ad48a03d333735cfd7525a62efd389c9f42dd6181d51adf0455767
+MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 9ab4f583a9c4..f8631dbfe7a7 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <use>
-    <flag name="opencl">
-			Build OpenCL binaries.
-		</flag>
-    <flag name="cuda">
-			Build CUDA binaries.
-		</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="opencl">Build OpenCL binaries</flag>
+		<flag name="cuda">Build CUDA binaries</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index f20142efa6f5..60426f700596 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -13,4 +13,4 @@ EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6
 EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 BLAKE2B f9dc70a5ed6c7ba920d07e4b3213babb2d4f4c5991c8fb343563728e4b3bd2ebe0ca53f97f867c493d67e7a15f33683aa6dabb7fe13b2832dd12a617dd26948c SHA512 807ac67b141dd390d78ec4e764dc939e993aa3b23c6469dde9e29c62a0ac7bbbd3be4d2425e3a1a9863a813c88c5fe0da37f07d1bb2fc91c0593cab99f8e8a8b
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 BLAKE2B d43051ae9eed5138e952b22159035f8557e8b5cfe0b7c0bdc411b389e60a0db9ad1f890e5c8a0159689aaa1fa06abb7a8c843c6973cd2204a6fcbebd8a0f89f0 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33
 EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 BLAKE2B 8782b66dd08834300b4f3935544d9e3263725b3e04774bce75c55c174052d0203cef71a94df974b1cf0fa943da76137931d443e20d9f0a733db9cec18d6f3aeb SHA512 719b65770838e7497abcd39f318773d049339cd5e1335a58a7d873c4112edf85c670ddfd9544bbaa1a6f31501e1c0e699f88b9ad3d6f0409990ed7b7ce803c4c
-MISC metadata.xml 486 BLAKE2B 069eaf8c3798564ca18afc52745ff504904c33ecbe77a33d4e120f125b681eeb90c3151c75feabbd50654934c9fa7828396627d1f28a6fd7a6c55dae719d2c42 SHA512 14746574456248d684dc30574c868f4f14ae270c86b6642e7c4aa3ea0918fe7b6cc685323e376d32c8f97879e3fb23a35c4f95185fb44f7b845035b9fcdcc2ac
+MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index ad6a3973276d..4b8ba09a6653 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <use>
-    <flag name="profiler">
-			Installs the NVIDIA CUDA visual profiler.
-		</flag>
-    <flag name="debugger">
-			Installs the CUDA debugger.
-		</flag>
-    <flag name="eclipse">Install plugins for eclipse</flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
+		<flag name="debugger">Installs the CUDA debugger</flag>
+		<flag name="eclipse">Install plugins for eclipse</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/patdiff/Manifest b/dev-util/patdiff/Manifest
index 4686f13b3074..6c36b9413877 100644
--- a/dev-util/patdiff/Manifest
+++ b/dev-util/patdiff/Manifest
@@ -1,3 +1,3 @@
 DIST patdiff-0.9.0.tar.gz 40059 SHA256 ca5cddb2aad11eb29108e14b661427fc9488fca6753578b0141b331ee39683f5 SHA512 a48d58c7b2681d5be6281fd6ff4e95df98d6c6f50622eaae5560a9f99c3b8ea0154cec5e6e5eaff687122a1d907657e943239869125089cab5e94e65f7c6a298 WHIRLPOOL 3dc776b01b77b06d04b4511b06c9d892d5cc2eb93c62333707c274dc2af301bca05ed5be08b86e5c371b8efc8c98032fbff587e6d93de0acf7b8e1154b11b14e
 EBUILD patdiff-0.9.0.ebuild 847 BLAKE2B 6fb9f0269b8625015009fa44d911c171896c4335b92f3ff2301791a108e84a8b1ddf60d093e48bb4d4e5dee6ea19f77d3bfbec5141956b3922ff48a7ccc2ac7a SHA512 17cad2854442957d5c5ac9a41d5d35553c1f28c6a39d924757ddac66431152323fbfa9d3eca99427209f9c32c7e05b87406c70c27e7034720a74400ba46ff6aa
-MISC metadata.xml 329 BLAKE2B 61bf14c62fac9bf13fd8892e08876197019f85ce5391e41600f5452a4f55f0f0a62ed1eaa60868e0d907c8ffa14cd79562b466c0f2953706daee7e0b86941fc0 SHA512 f911fdd49ca38df516f914bb069165f9114f442d78f8626a5132b3699321683e9ea85d139e1e91d3fc48b4495bdf58ae7014dd4eb723385612d9490f6c9447ae
+MISC metadata.xml 330 BLAKE2B 25cf17fad7b6600aef724390b7253da203e27748b0582a15f5fef21e8d5025ca560eab4b9202752717b41a142f2a6a564e38a514b872d9eeab38cd746f50167d SHA512 bd88c00a353b7899ccfdecba9c1049a4fd618fcc353dfa7570f5d101c99a8da5037d0593a19d4614a4f640f8c46217c98a2833876b977647235cae9bf2f1c6f0
diff --git a/dev-util/patdiff/metadata.xml b/dev-util/patdiff/metadata.xml
index 80d170f9a1b2..b31ec668fef0 100644
--- a/dev-util/patdiff/metadata.xml
+++ b/dev-util/patdiff/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-  <upstream>
-	  <remote-id type="github">janestreet/patdiff</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/patdiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index c8bb9276538a..67995aed739c 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,4 +16,4 @@ EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4818 BLAKE2B 1ea2d6c9e7a1924e82b0d17a13373bb230306301718ea1804a082497d74efdd74676a535475c9dce1d470cccfe47ac83eaefe9042187bddeda90371bf264ee68 SHA512 460bb9d5077c015c85bc5dc256407d41d8ddd8dc8cb7e1bce4146261b4fec3d9740750d2533b7e80286b136416e180ff4b08b2c42490c335e3aeaf13b89ec369
-MISC metadata.xml 1153 BLAKE2B 11cc7a9c4382b66aa3a91a31aa7c4a201582520ac1c62e57daae8467e472dd7ccb070645d986eae00003ac4344054d68c68025e87299d8c879f03679509a0b65 SHA512 18e5b436d7ae5ba8c9da8bd4007e33006e25f351d9e01e55127bd35f47446663faafa1de37283410e0cec9f00b8b4422afb4a8d256b8161d88c3c084e8c9a09d
+MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 1b50bf7e527b..abff870927b6 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <use>
-    <flag name="demangle">
-      Enable C++ symbol name demangling, using libbfd from
-      <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
-      package will have to be rebuilt after every version bump of
-      binutils.
-    </flag>
-    <flag name="doc">
-      Build documentation and man pages. With this USE flag disabled,
-      the --help parameter for perf and its sub-tools will not be
-      available. This is optional because it depends on a few
-      documentation handling tools that are not always welcome on user
-      systems.
-    </flag>
-	<flag name="numa">Enable NUMA support</flag>
-    <flag name="perl">
-      Add support for Perl as a scripting language for perf tools.
-    </flag>
-    <flag name="unwind">
-      Use sys-libs/libunwind for frame unwinding support.
-    </flag>
-  </use>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="demangle">
+			Enable C++ symbol name demangling, using libbfd from
+			<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+			package will have to be rebuilt after every version bump of
+			binutils.
+		</flag>
+		<flag name="doc">
+			Build documentation and man pages. With this USE flag disabled,
+			the --help parameter for perf and its sub-tools will not be
+			available. This is optional because it depends on a few
+			documentation handling tools that are not always welcome on user
+			systems.
+		</flag>
+		<flag name="numa">Enable NUMA support</flag>
+		<flag name="perl">
+			Add support for Perl as a scripting language for perf tools.
+		</flag>
+		<flag name="unwind">
+			Use sys-libs/libunwind for frame unwinding support.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
index 9fadfbaf4446..bb88734a3b66 100644
--- a/dev-util/premake/Manifest
+++ b/dev-util/premake/Manifest
@@ -3,4 +3,4 @@ DIST premake-4.3-src.zip 514366 SHA256 36536490f8928d8ecde135da80cd8b751ea5bebe5
 DIST premake-src-3.7.zip 427727 SHA256 b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4 WHIRLPOOL ddebaac25b0382620dba378ca8f3f3340cbe630cc081858cc94a6dc4d4a5a13c9e09706af5dc602e6886a0e3f720cc68515f38bc112fd82a389593a2b3514bf6
 EBUILD premake-3.7.ebuild 447 BLAKE2B 9a52bc3e693e3500fe706db1e400ef552961952d06106e43c38fb4ef62c172600469fe266b26a9bd3ef7504164cdebb9db2abbb9f9c96d893b85bb0a9d7fbd93 SHA512 8e77f419f850b861e66e77ac0140fc0de4ead84b23d0abd82ab568d6e9dc06c6537eed6ea2b5db8b3a0b88f44f3b915009ae173f6165c53b56bbc5a0b384d1c8
 EBUILD premake-4.3-r1.ebuild 542 BLAKE2B f342745518422ce67abdde93c690299fa98f1c8d3a9563dcc38c2eecefc5b68345111c72f290211fc5f74be539417bd9f2c04f9f0e88edd508fd6cb62ea5ade4 SHA512 5739291a774abf6b87331f1bad8a4e00d890367194b7254abe6a92e252908e6a5e8698519e3a27154cf8518aaab112797b90171c0db8938703760d79986c6d74
-MISC metadata.xml 717 BLAKE2B 8a9527fce80831bd1bbc87a3752163196163a553de7d2ad23d3c9c1eaaf1adf5eb754e110cc5eed0b3b89aef2d1df7dee459ed2da35115995f8fae0a9d6e6be8 SHA512 416923483181ade601cee1fa8cdcf44d721dea0424adb0527419a5561a5ea9f48ee2fbd59b9b5fe120525b73faed68e9be288b70ae3c1c51b803c176843da1de
+MISC metadata.xml 710 BLAKE2B fd0c541cfcf4a44f4ca8d4de869358169d4262f6e1007165229a7d3a22eac9baa7c93da868663cda31a52deb421d0bfd93673d808e56a6ce1600fef9e672c695 SHA512 71522dfe5abaee8ad7ef61db8551ccd59a1060d154531cbe3ee0e4c39cbc0cb6f807aed263d52c2aa6b2e3a04ffe267b40f420d25ba22aac7b5b773af192d6ca
diff --git a/dev-util/premake/metadata.xml b/dev-util/premake/metadata.xml
index 798594dcbe68..e57cb3c992f6 100644
--- a/dev-util/premake/metadata.xml
+++ b/dev-util/premake/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>titanofold@gentoo.org</email>
-    <name>Aaron W. Swenson</name>
-  </maintainer>
-  <longdescription lang="en">
-	Describe your software project just once, using Premake's simple and
-	easy to read syntax, and build it everywhere. Generate project files
-	for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
-	Windows, Mac OS X, and Linux. Use the full featured Lua scripting
-	engine to make build configuration tasks a breeze.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">premake</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Describe your software project just once, using Premake's simple and
+		easy to read syntax, and build it everywhere. Generate project files
+		for Visual Studio, GNU Make, Xcode, Code::Blocks, and more across
+		Windows, Mac OS X, and Linux. Use the full featured Lua scripting
+		engine to make build configuration tasks a breeze.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">premake</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index aa25bab287db..0c9b96408bb7 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,10 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2016.3.2.tar.gz 215633678 SHA256 e1092d3692118f9097e4182edfccc76159160353b7d7379cada3249b9e2d4f39 SHA512 64f8fd908c2165e4534f77596e6f9a86e72a04390432a0c1206d8a5cfde8a54067d5747a6f1f2a5ba5bb168e311d5f432939c87a15f871330ce2c2e42c9bfc8a WHIRLPOOL 92320d3f96b76148bba1e0ead93578cde6890119fa963e1390b7da2ea570d4b99e6bebdffe6167e283d534073b06cd063c2d9e70c0100436afc6b6d0fd264eda
-DIST pycharm-community-2017.1.5.tar.gz 195342869 SHA256 1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b SHA512 1eac6062a1b92782e50425e053ec326965eaff6bf36ec3cf6d4e9fcdc1fe1a8baaf4d16131a38fc506c55c384943aaea51cf5f4c9d8d2e36080b7342ef1af21c WHIRLPOOL 1a655bcaa78b4a6607601229455e822cc56341c70132363a57cb9f6597f9f31ce007426a70284467cfe2c1a082972883746957e67dc678b5d379956f46a6c3cf
-DIST pycharm-community-2017.2.3.tar.gz 200478376 SHA256 e8562938c2ede32a1c1036391942190144cd9f0927bd49b6b3ddf5f7a01c33aa SHA512 502b056f15367c0aaed2a2b001b218f2f7e48d65b313d7560f3b77a0337a2502628ee502cb730eb2f8c6c853460988760e10601b98d43936603afa80beb1065e WHIRLPOOL 4096a3afcf86ae17e8021783c55264625e80a87034eaf6b0612fd622f88d52d24d7c27388be0c7f9a78b21333762fcf0531bd8f17b5cd4b2849cee5298d2f831
-DIST pycharm-community-2017.2.4.tar.gz 200392450 SHA256 a72045c348981640a12fb9739e04d4985163248006150d4fd3b3c09d34216ea4 SHA512 4c98c026e36d8dd7ba0bd2ccdcffb1301d0cb79b111d032d85e0875f55d8e8a708cc1d1f319baad93f308169a1ca2aad608b940b71810907e0929bb790af15f9 WHIRLPOOL a520ec02cf93c5f177f4b4876fd0e51493d1e1abbcf91a9d1af588b4649aa646b53bef80a719d2851441b70af994023cb127db174f2526065ea1f1adf3014a5f
-EBUILD pycharm-community-2016.3.2-r1.ebuild 931 BLAKE2B 6eb6c222d13f01cd8048a79b5a039286e8155853d7afcf968e178ca6a42c98c949bc3a121e9eff3284755c6ed4ea3d54f63bcc089cc0f143f623e1cb27591fa4 SHA512 a5a79043917ac8fd8fcf3e55d52d3e22707473dd044393a99d90cd00636c5fc4c3dc4125a9c89fa3b71a1c73877e8ce7549ebaaef17c456a14c7c8a16d6009a7
-EBUILD pycharm-community-2017.1.5.ebuild 938 BLAKE2B 5fb3567a49a9d5136f9d6a43f54bfed04ac666ba35e64d316c99bca1ba51328fc6093e9a229fdfde115e65beddbd7fc7148be649628fe7ef0987e4797d151644 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332
-EBUILD pycharm-community-2017.2.3.ebuild 938 BLAKE2B 5fb3567a49a9d5136f9d6a43f54bfed04ac666ba35e64d316c99bca1ba51328fc6093e9a229fdfde115e65beddbd7fc7148be649628fe7ef0987e4797d151644 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332
+DIST pycharm-community-2017.2.3.tar.gz 200478376 BLAKE2B ea42444c5596358aaa24f0b2ece1294ff386c83c8f411c328fea540b1250fc225fe5297789da2d9f76c2faa485c151cf20d02e7af890cdd18d9fbfdbb59aa4a8 SHA512 502b056f15367c0aaed2a2b001b218f2f7e48d65b313d7560f3b77a0337a2502628ee502cb730eb2f8c6c853460988760e10601b98d43936603afa80beb1065e
+DIST pycharm-community-2017.2.4.tar.gz 200392450 BLAKE2B 83c03b02923074c0a744e6df749d5eaff2b4f5d31f13d0e1cdda3fc7aced4b13897515260605b6b277193cc84c0de4bb61917227e30879bc8135b47d5712a540 SHA512 4c98c026e36d8dd7ba0bd2ccdcffb1301d0cb79b111d032d85e0875f55d8e8a708cc1d1f319baad93f308169a1ca2aad608b940b71810907e0929bb790af15f9
+DIST pycharm-community-2017.3.tar.gz 282451011 BLAKE2B 250265d7cb0cb3ba94733c9404f6bc1c6e4f62207721011e9eec65780f9e4c92148626065051a1e875124d013cff488c8d7ab9861c094bf4a33c0b8596e717e9 SHA512 4e835f671971171966f52a4219f47fda2675b2fcf38f0f91ff90b1aa00508ed3b5445a488750c6e9d82515780e9f190201da918230c0b80d869d6b16ab352cc6
+EBUILD pycharm-community-2017.2.3.ebuild 936 BLAKE2B 6345f6cea742d9927163730967213c9e3b55fb54a04b1b29064f93ae71b1521c56605cde38274c66656540bb3c89186e95600026a2a5902f0d945bd9e3959d93 SHA512 dadc4220bc871e02e445e0e59e0655866161b9be193991fcb99941c86a34291ecfe0f905ca89fa45276d7a05c9b9ae06875460a5aec49d43d282ed669040ad5b
 EBUILD pycharm-community-2017.2.4.ebuild 938 BLAKE2B 5fb3567a49a9d5136f9d6a43f54bfed04ac666ba35e64d316c99bca1ba51328fc6093e9a229fdfde115e65beddbd7fc7148be649628fe7ef0987e4797d151644 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332
+EBUILD pycharm-community-2017.3.ebuild 938 BLAKE2B 5fb3567a49a9d5136f9d6a43f54bfed04ac666ba35e64d316c99bca1ba51328fc6093e9a229fdfde115e65beddbd7fc7148be649628fe7ef0987e4797d151644 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild b/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild
deleted file mode 100644
index 2b1fc89caea1..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2016.3.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=""
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild b/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild
index 6bcb19218d4c..bc2aa0e1908c 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-util/pycharm-community/pycharm-community-2017.1.5.ebuild b/dev-util/pycharm-community/pycharm-community-2017.3.ebuild
index 6bcb19218d4c..6bcb19218d4c 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.1.5.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.3.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 132fbbbb51ef..5c94db8a5d57 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,10 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2016.3.2.tar.gz 283150795 SHA256 c36413a56a8a1d046c84a2c32bab8aaba132551305a5db0845a6c7ed1dc0d4db SHA512 a189ae38a70874709b0e0243dc6a1dd14aa2b5199e8cf33a0f8c85dd0606e35ddb9d0f954ec9252da7a098cbe184bfa6bf69e43b7c8475c5c3776312f89395f7 WHIRLPOOL d8350fb6d1b4712f0082bca41b9ecf2f190bc5c95a72677efc9321abe7a9f5687c05f3554c7e7022e18e7d747f1a628acde8738012eb7e354d1801e374acbc53
-DIST pycharm-professional-2017.1.5.tar.gz 269726667 SHA256 52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce SHA512 5ba5c2893587afef3b2a5f0b7a5d4395665fd8e75764f9d8c7e1c41170af0c0457f0f27953adceb74a24c8f2260cabc65ba54918bdd38271e1aba014a5428bc8 WHIRLPOOL 0eaee27ef5ed2b3a4a2c5da3211aeed596d15de928c6a4c8a80abfaa03383e167d40e2633900f26e9795720692242a1f12afd880912e57f8b83fa378ffbd85fa
 DIST pycharm-professional-2017.2.3.tar.gz 273776254 SHA256 3e6f1cd48c08363353b2d2777a581cb60bebd6c538b325767c11d02395376945 SHA512 1233b4b272017856e90125e3439f1057f22852749d101532e1b57d51c382d017fa15442307120d49a77a150c863e33fa53e799f2c77ff6d56312381a82fd51fd WHIRLPOOL 52336480fc7dee194ba707adf529814d040519d8a6433ea381a37592adfab765c4f8533360d39d97d7ed169b1255ce2a225a4430f875eb86fdefb8306b83314d
 DIST pycharm-professional-2017.2.4.tar.gz 273678656 SHA256 713ed26396f67762cb225917416d633bc8d4f35e20656fd289e74c2791be3658 SHA512 60693e48a3c28bc7108e84b9beeba073ae2ebad53dc5bf792bf42abb474ebeb4d6b7fd73211cb3152a7afdc632384903900a041df6b3dc8f73a8ba623415fb8d WHIRLPOOL 7d50d2272a935ebd96ab6e48f33dd38720d7c0c66738922af3574020bb92fc021e877c50e459fe1088909fed09ecd79597d6005daddfb4b2e39df8bf510f257b
-EBUILD pycharm-professional-2016.3.2.ebuild 1092 BLAKE2B 0825ca30e5c770e869925722b23eefff2b45d6a7815b050ceb5284a5480fc2c1f71a7741d40b704b8b324eda1840b842a70c8e33c8b5cb79b70b36376a651e12 SHA512 3338054b9cedc55f4b79a39e672857265e703106ef6a6d28f7beaf3e92d9ecf8fdb79b44057c2faf32bb789c448f718111c17b1d0b69a977c712748238c2a09c
-EBUILD pycharm-professional-2017.1.5.ebuild 1099 BLAKE2B 668cc43168d3748581b416f84f9126c22574d0e9b98d4122228cb8fcc91d81477d05285330fefede53a2bda17b67459f0a1858e570a799df3dfde731ea57a473 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0
-EBUILD pycharm-professional-2017.2.3.ebuild 1099 BLAKE2B 668cc43168d3748581b416f84f9126c22574d0e9b98d4122228cb8fcc91d81477d05285330fefede53a2bda17b67459f0a1858e570a799df3dfde731ea57a473 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0
+EBUILD pycharm-professional-2017.2.3.ebuild 1097 BLAKE2B 0a6e71e52990bff2a087cf34198038e73464cb2f77d3549b25472302b32d731a7bc985a873f468bb708f3c62d7b0ad762fcfacf14a19d43eab1449306f89e2a6 SHA512 a0b1a344b3131037e3f9b2036366b17062b722352eb1c0c09a4feddd4ee4dbdaae38424a2d136594ca58ae0cb22a48ae7029308a7efb862fe6a00b5f71988b80
 EBUILD pycharm-professional-2017.2.4.ebuild 1099 BLAKE2B 668cc43168d3748581b416f84f9126c22574d0e9b98d4122228cb8fcc91d81477d05285330fefede53a2bda17b67459f0a1858e570a799df3dfde731ea57a473 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2016.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2016.3.2.ebuild
deleted file mode 100644
index e7a6891d1266..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2016.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym /opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.1.5.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.1.5.ebuild
deleted file mode 100644
index b8731d8db528..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2017.1.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
-DEPEND=""
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon "bin/${MY_PN}.png" ${PN}.png
-	make_desktop_entry ${PN} "${PN}" "${PN}"
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild
index b8731d8db528..78afd12076c0 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 3dbc1c19488c..163ce5bb3b65 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -9,4 +9,4 @@ EBUILD quilt-0.50.ebuild 1498 BLAKE2B 278341390d78fd902a2f8ad2d858365a680452d31f
 EBUILD quilt-0.63.ebuild 1934 BLAKE2B e921625ccce5e227def5d9b5bb942a7bee3acb7193ff28cdcac545a2fbc2a34f4ec3dd6caa66a8ffa41ffbac88dfb9bd3e963abf9340409b7acd2f2a9b810c0b SHA512 5d60f84f0fa3abd6e15f428182523f9417b5541c3301374b60bfe3704aa2e488628d501f1dffd47028db92de44e95c8fc2e89217d9fe789faff7f56d6c636082
 EBUILD quilt-0.65.ebuild 1647 BLAKE2B 241059eba66ff1af2c563bef7a12cd44e87667e4f1a2260e55c4af1b95fbf4f057d71f0b0c34c21ceb6eab1c0cec0ceaf43e704442e1d5e53052475d743c1c6e SHA512 7be1c157aac11b74de9fe6bd2bb18719f9b5428f58ce8b9d1b1277eeba0f130f591c9815836c6d60004d8774bb5f463aaacdd9ae479ceaa00374fb73bcee49b3
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
-MISC metadata.xml 320 BLAKE2B 15bf64c6bf932c577f9c02ce746db1d73329d706b50d3f7efa190ce96feac9b89b42afb112a5744f01355e6aeee54757d8f002a5f7a565ed7192cb8f996641ee SHA512 7a8f43fb660058256892da7cad161a61a02629c1a1137919a768ac18dcc5a7e211944cba8c0aaaa33ba0b4c005bc17605706040e3bee8af923b1bdd7d4518cda
+MISC metadata.xml 315 BLAKE2B 51aeb1afe6e6c77c1bfaf6123226073d179d533c66da9823613396a569e07a622286a83df3c90bc69bbac39e55089c1b01c7c20da61b36bd330de9cdd6d310e3 SHA512 2953a11e7bbb1a46498c696757c5e95b898ef7cc71096340c0a331e6a927afe0270e21e96eba6712215067d8a85dc3a9bf388b5119fde5bc92a9c82869e0f875
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 8b375ab7cfb6..85ac25a40330 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		  <email>mpagano@gentoo.org</email>
+		<email>mpagano@gentoo.org</email>
 	</maintainer>
-<maintainer type="project">
-		  <email>suse@gentoo.org</email>
-		  <name>SUSE</name>
+	<maintainer type="project">
+		<email>suse@gentoo.org</email>
+		<name>SUSE</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 7b7619d65cfb..9e5081f28053 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,6 @@
 AUX radare2-0.9.9-nogit.patch 352 BLAKE2B b65dd677a246bfd47205061d41f731e5b3ae477946e8b5b1fec6a19aa54fb2bf307ae4421c74ae38049f259476b43897968670c5a5b34808d37de5623ba620c0 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270
-AUX radare2-2.0.1-635618-p1.patch 938 BLAKE2B e93734f76cec74133a4fa443771fd8549592ebd4a6338d47522337c29fa69d44ddb44e5f64ccbf8b05c2bd6186bf18e6da4e1264125fdd1c620e8022973e7077 SHA512 526a0570b60ee90464f441c26c66167bbae734e400d043e3eb54ce335e2e0874a29330e885f3703d116fc3175d5341f0ac9297705757bec54273db4cc0937e8f
-AUX radare2-2.0.1-635618-p2.patch 963 BLAKE2B 3868ec3775777c3727adda7ee760f0638ac22f125948f9f02c8ce045ecdd8d04c092cecf03cfd612e6a80f15f97f20eb74bd43118f6d1b93fc95a598e3628a56 SHA512 d912a3be1b136d963c99c53032fef48b4176421213ffcc12a40ee625a7c126cc1fb0b55b9316fe0385caf5c605396a6d826842d649229ec514d619ce86a752fe
-DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e
-EBUILD radare2-2.0.1-r1.ebuild 1173 BLAKE2B 71e6b2b3d3922d1f517bf8f0d3abc0e479a2308b5a8302f3d0f814be8589702c1907329594ad77b64a7c3e31c37fcc93dea0094c3665e22139eb5c9a51c698cf SHA512 d2b9207d58847675ad5eafa9cc26465fd9bca05f6b9b16d32748e28b74d5b04776bfca981bce57986c1974fa5979f9042ea0d88d8b0021f0ea61ead9ef433986
+DIST radare2-2.1.0.tar.gz 5954222 BLAKE2B 9128a01d40ef1401d457f1fa5610ad7bbda92021e6e16fd70e9488bdb11be923c3d0f453e49a7bf78203c320ec2f1b2276925db2ae6eeaad90100ae0c2724b56 SHA512 38a907834e21967a83943e62cb29d8097e0522ff71ea61a2e3ab9e5263c3884ce28c17fb3ca9201c2b9f341e1b066ed0899e5152e146e61fc4f650f319299cd0
+EBUILD radare2-2.1.0-r1.ebuild 1220 BLAKE2B 76313607d2fb45d2a0ce0db3e7ed7ac352c104d96de717fd8303d20c559e1e366356aa618ebd5da7d72c79d33e231ac2020d0147f9522f115fc3a9770de97c1f SHA512 c5596fbba68cf04c21bc836b1bbd7a9cd96b0525132394a6a3c376f7b656533524f44037be404e40abe039afe0170ae5a1ec312ffb058679ff2b6f0180f2ca7d
+EBUILD radare2-2.1.0.ebuild 1101 BLAKE2B 95b47781088e5ed9f60e3e03c077210c392d4c858b6cb9ba453f1a77413e317cac19b06671aeda1d478d804e6a810aa5c76fb46586346e9f5924f602d4363c7d SHA512 c427dc6275301d0a4dc98ceb765369ec677e09c2db0aaf6563d5349584e03222a6d1732d8979a3366af55d27c0bb8fb991af028c56a7130c89d1b49467ae153c
 EBUILD radare2-9999.ebuild 1100 BLAKE2B 3dd09be4a69f5d2b89cbf069148cc12e6f57b7dc476aed4ed5dca5b12a0edc0f712d17cec93b56a3f936bd190edc8c54c4705421a6f819ca18da26ac6bdd0a9e SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
deleted file mode 100644
index 5644e50cc115..000000000000
--- a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c6d0076c924891ad9948a62d89d0bcdaf965f0cd Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Wed, 25 Oct 2017 18:00:11 +0200
-Subject: [PATCH] Fix #8731 - Crash in ELF parser with negative 32bit number
-
----
- libr/bin/format/elf/elf.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
-index 90f6acd30..e3c852fd3 100644
---- a/libr/bin/format/elf/elf.c
-+++ b/libr/bin/format/elf/elf.c
-@@ -900,7 +900,11 @@ static Sdb *store_versioninfo_gnu_verneed(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
- 			free (s);
- 		}
- 		sdb_num_set (sdb_version, "cnt", entry->vn_cnt, 0);
--		vstart += entry->vn_aux;
-+		st32 vnaux = entry->vn_aux;
-+		if (vnaux < 1) {
-+			goto beach;
-+		}
-+		vstart += vnaux;
- 		for (j = 0, isum = i + entry->vn_aux; j < entry->vn_cnt && vstart + sizeof (Elf_(Vernaux)) <= end; ++j) {
- 			int k;
- 			Elf_(Vernaux) * aux = NULL;
--- 
-2.14.3
-
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
deleted file mode 100644
index 242f4cc6220c..000000000000
--- a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 44ded3ff35b8264f54b5a900cab32ec489d9e5b9 Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Wed, 25 Oct 2017 18:09:24 +0200
-Subject: [PATCH] Fix #8743 - Crash in ELF version parser on 32bit systems
-
----
- libr/bin/format/elf/elf.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
-index e3c852fd3..2248731b3 100644
---- a/libr/bin/format/elf/elf.c
-+++ b/libr/bin/format/elf/elf.c
-@@ -748,7 +748,12 @@ static Sdb *store_versioninfo_gnu_verdef(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
- 		verdef->vd_hash = READ32 (dfs, j)
- 		verdef->vd_aux = READ32 (dfs, j)
- 		verdef->vd_next = READ32 (dfs, j)
--		vstart += verdef->vd_aux;
-+		int vdaux = verdef->vd_aux;
-+		if (vdaux < 1) {
-+			sdb_free (sdb_verdef);
-+			goto out_error;
-+		}
-+		vstart += vdaux;
- 		if (vstart > end || vstart + sizeof (Elf_(Verdaux)) > end) {
- 			sdb_free (sdb_verdef);
- 			goto out_error;
--- 
-2.14.3
-
diff --git a/dev-util/radare2/radare2-2.1.0-r1.ebuild b/dev-util/radare2/radare2-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..f69a9666f3b3
--- /dev/null
+++ b/dev-util/radare2/radare2-2.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
+)
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl +system-capstone zsh-completion bash-completion"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	system-capstone? ( dev-libs/capstone:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_with system-capstone syscapstone)
+}
+
+src_install() {
+	default
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins doc/zsh/_*
+	fi
+
+	if use bash-completion; then
+		newbashcomp doc/bash_autocompletion.sh "${PN}"
+	fi
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-2.0.1-r1.ebuild b/dev-util/radare2/radare2-2.1.0.ebuild
index 78ee0f1268ef..8f051ac51137 100644
--- a/dev-util/radare2/radare2-2.0.1-r1.ebuild
+++ b/dev-util/radare2/radare2-2.1.0.ebuild
@@ -18,8 +18,6 @@ fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
-	"${FILESDIR}"/${P}-635618-p1.patch
-	"${FILESDIR}"/${P}-635618-p2.patch
 )
 
 LICENSE="GPL-2"
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
index 9d8120d46aa2..a1fa4c71a217 100644
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@@ -4,4 +4,4 @@ DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 SHA256 3f46b5576
 DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 SHA256 bc6b9289ab318a4eb7e273a2990351cc051a00051b208192591c0a6fad5da20d SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5 WHIRLPOOL 11dddf53d364864198629dfefdc84202fc19876d325e7738488402b7614faa5d6b88e8f2867810c854e9110fd3596043529a2e6f588107af519ae807a9d711d8
 EBUILD scala-ide-4.1.0.ebuild 1118 BLAKE2B 4c3e0a178fe0bbaebc014b19b865841d641b3a5798c7413f4c6470b8024b854ea86dfe8620c1c43d53aad7d1b511f2ebf2fdeb2da25e642c1e65e820ffd44182 SHA512 24b633c578ce15a47dd6bdb5ff777891b7a9d89483284ffc26cd84c3820397d6a9a038fc3d725ed3fcc43d087eaf52e748e94dadb086b778ae0cd1a25ae54739
 EBUILD scala-ide-4.3.0.ebuild 1173 BLAKE2B 69ca00aacc88a04e68dc8a8cdfcacc990be801be4fe378d3f17c23b2fb1070825d5226f5763317429ee56a0aa9b8cb210a24af66b236d4cf0d916259b8c22aed SHA512 fb6404dda5c2334c1510fff49defc095a21e65f51be2170705f9a5ec5ab80b8378a900d7a221d2d86dac8c87cc7e637009f2f793280c55be676194a92fae151b
-MISC metadata.xml 322 BLAKE2B 281c75bbddb40a3e213c99dc3537edf2b15f3425a8e8d835b53280434b16d7ca597acbb869410cbb0079c9546c2f74893abc34af449cdbc8eaaac04782c7f389 SHA512 31b070b2d770ffd3345949cc9ef12f660631660b312f64a2e5b657205ead2dc40da0245312fd7d10e8c78ca3853f325c105c70bd85ae9a8e76bf5c24c2dfeda0
+MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
index 5352e92a2dc2..4422c51f84a2 100644
--- a/dev-util/scala-ide/metadata.xml
+++ b/dev-util/scala-ide/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>monsieurp@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-	  <email>java@gentoo.org</email>
-	  <name>Java</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/shunit2/Manifest b/dev-util/shunit2/Manifest
index da4e648775db..e106d05f5955 100644
--- a/dev-util/shunit2/Manifest
+++ b/dev-util/shunit2/Manifest
@@ -1,3 +1,3 @@
 DIST shunit2-2.1.6.tgz 61558 SHA256 65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee SHA512 c78cf349d72a9048e4932108a62b2d1873019b9b1909c3fb1bd7e873e7bb62df58c1941d916508dc60ef6ba0261a2bc6ee9e25d654eefdcce997682f2bc748d7 WHIRLPOOL f20154214fa08db98ad6ffaef39b555079f1dd17cc04b3c15f206a4ae690b55a8dbff582c5440c232920dbb4013c0b292f9fe15aa7dcc64fb1a99e51189ddd92
 EBUILD shunit2-2.1.6-r1.ebuild 547 BLAKE2B f85d146421c60c42669c418c596cb078b3ac1b402d8bd4687d684a9c3e56a8ee0fe2994cf7cd3e69f437e7a87bf1ed60cf8809220d69841eaf3932feebbd6b07 SHA512 617fdbc114ac334c52fbfa0d5580a062799f8aebf03a16398ef786f8ffd28140273161d18b468665f8dd2ccce93d43d93c10f1170c8e6d8573ce8124935b8251
-MISC metadata.xml 552 BLAKE2B e7a16f6239be8d9c6b55969ad988582f7924f14bfaa34e5461967c8df32441dbf79a024d86efed0ee096753e95460ac08a5a96519fda624cff2abc648c9bb9ca SHA512 e414e03b4170cfc183e9cc169e7eeec9fed89b815023e534a691e36ee8278b606c60ff5e9b3768a5f8d570dd7ba9e3a9e22dd8061753be6e6b7fa55ee8a38739
+MISC metadata.xml 554 BLAKE2B fa966d5f0a498ec0c3327ce604f1a628120c138510890a59c0bc12fd955300cd2e399d6e36fa9720138713a5365751051ce83cd743bc7aabaddda65f5b08e446 SHA512 a548ed7c3551878031b1df0a9c45886e46271034f477f1c34ed1cea69c750176875a61ad526ecc59df5a59aa5c22fc0948ca2cf831feee5bb1178cfb76849dea
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 52490b64142a..45da850feec0 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription>shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
-  	it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
-  	have ever had the desire to write a unit test for a shell script, shUnit2
-  	can do the job.</longdescription>
+	<longdescription>
+		shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
+		it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
+		have ever had the desire to write a unit test for a shell script, shUnit2
+		can do the job.
+	</longdescription>
 	<upstream>
 		<remote-id type="google-code">shunit2</remote-id>
 		<remote-id type="github">kward/shunit2</remote-id>
diff --git a/dev-util/usb-robot/Manifest b/dev-util/usb-robot/Manifest
index 97de2548f111..c7cbe7df5d26 100644
--- a/dev-util/usb-robot/Manifest
+++ b/dev-util/usb-robot/Manifest
@@ -1,3 +1,3 @@
 DIST usb-robot-0.2.0.tar.gz 43682 SHA256 ee7d9c8cbbb22c8ac13387aec5ce88523b48264267dc9fae7f248884c7637eac SHA512 45d7332a10ba881ade03e1f927a6f36e13d31661ac85950c2f31534b313db4bb354e75404b98bdbe522ab22a08a18592a8ab3b4c73bd6cd902e97285b505e37b WHIRLPOOL aa1ea89ff3c8dc8f5938da74e384b6bdfab856b71cbf65415ba2ad9036b40220bee17d22ed8d0b1913cf0c39fe0e0e0f9e262de8526ba0de1ea155f057a4e36a
 EBUILD usb-robot-0.2.0.ebuild 565 BLAKE2B 4af189e9f10a599ecf9be84f9037c33ada6c0ba99487cd7aa2d319557561bd13f89e1713d6f1353e26a0d4c463de83751d23a14ee7a6fe3aac8b45d089fafe9e SHA512 a630c903c673819198ed16d3e52d743159ac2ddaece12211611a334984655b3a8d0d7c2aafbe5646ab1c2223499e263fa56e70ca7694e8960c1189060f7cded0
-MISC metadata.xml 335 BLAKE2B d557412da1a9df12cc07cd509e54796853f0a76ceda51268aa268a4af05279431808a66fc9503dbec2ab9407d04bb761ccb464d0540a26a23e4c5de4a879cfec SHA512 660c92df11d079a8eb300c181cf4ededd9a469e1e2c04c4ed900b04a86ad785e44ea207060d7aaeb286ff39b4b75f2828adeaec97ee8ad7dfd5b101ad72f214e
+MISC metadata.xml 329 BLAKE2B 1079bf19c0f237b84e3073fadf5d929ba2e37af27e224a843fbca34d103d76395ed49dfd27c49706c60dc4cfd01cc184a9af4e5db3478515e98739f7eef35c02 SHA512 0e3f571fe0ff42f145e6d2454ee9dcab22b58ad84c4fe058e90b52a2ec84d9eaf07a34aa4cb1a60efc76714d230c5481fc096b1b2edbcf64c4e7c638ab22db9a
diff --git a/dev-util/usb-robot/metadata.xml b/dev-util/usb-robot/metadata.xml
index 94119439ccc2..177384d92a1e 100644
--- a/dev-util/usb-robot/metadata.xml
+++ b/dev-util/usb-robot/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">usb-robot</remote-id>
 	</upstream>
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 88640d1f6ec5..3f954525cabe 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -4,4 +4,4 @@ DIST weka-3-7-13.zip 42159458 SHA256 8d856d52be9964da580e7d396deecb03b83016f5b21
 DIST weka-3-8-0.zip 50550487 SHA256 2586298688059a025e2810b1ffc73f4fb3cf81ebf2183d8d19b0763d33857f61 SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33 WHIRLPOOL 127566483c9ed3764ef6e8eaebc6d6b5613b766b2e8c0438db0b27213bd837b14618d7d06026d9041be5f78e91dbc7840b3c2e0a57192f001ecd50b7cdb38c2c
 EBUILD weka-3.7.13.ebuild 1468 BLAKE2B 1082a67e52f5425ca08b2664b8203f59b48639dbb025541e8b934e1f8390e202e5e48ab711643a2eb4ab9d4a1ac9a6ff2dbb5dd26a079cced1c6e88e2a80c987 SHA512 2f746f8e8874497a66650d5561412ee92996fd97adb9282a423a34452a261845a9a2d9d6370f01cbd7d6af3c188ac885eb1210058e4722eefa02f87adc54e733
 EBUILD weka-3.8.0.ebuild 1776 BLAKE2B 233d1f1d2e51086bc78a5b8c6d2b99dea0eef5a998f8ba99a6c5ceccf22e99b243cae5c171fb69acac04a751d1115fe398615c51c2bdfd37d0348e44820c552c SHA512 f684824f58f527210c932662124d3ab3e3ff77398c4e592bf5e238a3caf57329d8536155a1a54e0efe14a9def8306325ef524ee5d00c1703d6bf1dc7448d80b1
-MISC metadata.xml 397 BLAKE2B 0a1c7f26e2d17179847e9e144693e36da866f8f8343ae15229ee9b71e2f7162e1e901676d308e63093152233baac5228f38dde03b9ccef64d54f31cd2fc51c22 SHA512 7864802fa60e29a0505d15ab5d384c7b3aecefb72ac14a58aa3e150da1fe5c870c7e019aa5ab38a16bf2b1484717e7432c8c3d7d9515dd650becfc748cbef084
+MISC metadata.xml 388 BLAKE2B 5f655f856c468f07f1b65024d9f86466f633b94f57f8ab384a47959975a8a96ebe910e6c7220c3226c83c90e6ebf3d3128c6d354517b100eb018891a02c3bb69 SHA512 db8902561c4e18c56a16e2445822e5f8592822f911c4f098c444f5345599956d877b8d0a9982c2cd143443231d78bc7931e635657ccb9880a54f8631055d8c54
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index 21b778d163c4..1a7ed67ed610 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	    <email>amynka@gentoo.org</email>
+		<email>amynka@gentoo.org</email>
 	</maintainer>
 	<maintainer type="project">
-	    <email>java@gentoo.org</email>
-	    <name>Java</name>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">weka</remote-id>
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index cc8aaf5c7883..7cdbd7b42c4f 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,4 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 SHA256 e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31 WHIRLPOOL 27963f582fc568097c943133fbe7517cc27c526b795ca7813b4b91c2707ee82e55012044c6cedc1120b24614f988048fbeb2a0eb528c57d63cd016d3faa22d23
+EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 633 BLAKE2B 782c452d10a7e936bbc6591fc765c2bc8aaea97b86ca7ad6ca706d9eae40077a316d7999c5a012027dbc1b21deb7d472653b84da24dde634bff291f40a4d9d60 SHA512 2435e9609b8413ba206d6a3618ce0d837141458a9b38d661af52c865ff0f5ad129413b9828452b4f69572df9de4e801dc2572541b950c7e6063c6f57f0706184
 EBUILD xfce4-dev-tools-4.12.0.ebuild 656 BLAKE2B 8ac6d5792b533095405de797a2965b03a3cea149f780e65e9db7b6238854f1c2bb36fad06b74bfa0c2a0994ce93ed1cc0f17e6f3ba0c6eaee1264879b43fe85b SHA512 7eedf87afd0397dc9632458762b3471ebbbfd2453d5d2903584f79f05912999631629ea1d221aed8883705e05eeb6beff4dfe99aa38e0c515a9f0944b1b93382
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
new file mode 100644
index 000000000000..4d3333996751
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /dev-util
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)