gentoo resync : 12.10.2017

16 files changed, 406 insertions, 42 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 01c96943ee27..04cae11fac73 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,13 +14,13 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 SHA256 5cfef1e684b67f3bc464fdbeb7
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 SHA256 dd3388f12fcaaed08c752f85ed4f27d795fd97896386a0c1f237e2cc4a65a9f9 SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12 WHIRLPOOL 51a499e6df73e9a68f243979a4fef33eb717e1f60fffc3bfbb9289f7a03c7438e44e4d01a77e87ea24c7bb956199a3f5a7fdd7f3583a625384487366ed0ba6a0
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 SHA256 2f07ffa2eb1129b5bd707b0834be1cf00964710974393a301a8cc9995b2e07cf SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0 WHIRLPOOL 5b0f3afbddfb202cb12d7b86823a39ab2de81b6ce261aba25afdaabefd5b4ec87804ea1b6d7891c69f6b7b32a2ef2977937e2dda62c88cd5032e5987b16c40ee
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
+DIST cmake-3.10.0-rc1.tar.gz 7797769 SHA256 577f83d57fc2d8dbf16af985e4053de4f9c06c445b017c36f261928d539fb85e SHA512 ac60dc90930f65807db4ec15409bb1a2d1c03b17526144c468ab74ec1843f8953015cb4ffcf8739de61c77da4fd74ffe228013c7105c28efe6062e98ceeefb5f WHIRLPOOL 91113d3a24fe7730b78d10493445a20c9d13021011f72b3926ffa178093c0474485f7f61a354bcba73c3fd83006e173d36e63a1d4f94430b1fde368c77e3d194
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
-DIST cmake-3.9.3.tar.gz 7705238 SHA256 8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a SHA512 30058cf4c154221846d1cd22eaf44a297d2a2d020a443f3e6f40384dfb86ee9a639a1299aa9f187f230505b2a6ee0fe69fbf5e80410711a6ac3d7a07b37f8dfc WHIRLPOOL 68d85783cf880984ce912e873f31500c87352cce69bad6da5a6086ce5bad2dd3d4a75ef2eae485649af7c380205aac9411f1dbdff155763d0e69d12d1eba4784
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
+EBUILD cmake-3.10.0_rc1.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
 EBUILD cmake-3.8.2.ebuild 5723 SHA256 4ae72da525b7d6ca7f45afcadcc89f0703e5232edb130ea1dd28afaaf7480c52 SHA512 e8628d712d82359c42c6940b745d7b29211bd548732ea08de7bf22978896d9fc9dbd21bf61db76262df1f440ef786550af83452bac48240025a4aa7d4c353ebc WHIRLPOOL 895f41560a2bc0a32b5b9edf48c1b7ef06721a6f505704c0628492677347d0bc7e0af8d2c4ba30ce5e0aa1f806e5ee8eee96c86ae0aff2058919e85d9d05d25b
-EBUILD cmake-3.9.3.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 MISC ChangeLog 19332 SHA256 2a3d0d8e5bfffb597c1906abb1eca3af3f997ac21673c469afbf6158a6b81b61 SHA512 83435d8060bf76931f512560a3ac4e9ae1f76073e9b8d05f75a5a4fb5d809a949bd55c4891b72475c7f8e19a4d31eb9e23799131fdc66ead7877790d43d3337e WHIRLPOOL 5e3bb823b8460257e98e0431bf55d44e5279f993724293f421e8348640ccf59980ca804bb247dc1f0f19d45aec45245dbf2f6c5d6bd075ed6350167782412c52
 MISC ChangeLog-2015 51428 SHA256 7e79c94e1bc0bc7071915d8e7bdba4812c823812de795931aec29749c410bb8e SHA512 cf217bebf0e7cfcb5771dce5a6df4fb9a4ecf77d296928de0dd2f3f34852a509a403b5b6351b49ab0ce6de755631d7e01b395a5bb9d6be5d6aa49f00185acc8a WHIRLPOOL 8f8585bf220e0a89a7f404108fdd4bc290ca37daf5d24ec3244b0bea8616b066725d7800d94697696a98fd49d6cb7cf834014ff4a0a2b77641119af3a186d451
diff --git a/dev-util/cmake/cmake-3.10.0_rc1.ebuild b/dev-util/cmake/cmake-3.10.0_rc1.ebuild
new file mode 100644
index 000000000000..95dda9d73a6e
--- /dev/null
+++ b/dev-util/cmake/cmake-3.10.0_rc1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.0.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DCMake_ENABLE_SERVER_MODE="$(usex server)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index f25ff81d884e..4facbf87dfa6 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,9 +2,9 @@ AUX cppcheck-1.75-tinyxml2.patch 2294 SHA256 309309d7af8046e7841c0de02404f804aa0
 DIST cppcheck-1.77.tar.bz2 1188453 SHA256 1980ffe5c9c24bb6dea24514d42be3aa49d6ba7cc26c448b3543611fe8ba2619 SHA512 df8dddf7758c342d45b3393246e07eaa11a53dca19e8a0d09de04f12ea6232538941328d9ca9ac52eb425871fd1c49d55c77e6e38b40772b6f856fd1e9e99779 WHIRLPOOL 9f7842eba0f53a999993dbd23d09c10e5bd3dcca5ecbb0689e4ded8c7529d84fd939a57ce9cd267cdd21b2d79aeb6c07d672983ccb52be0fcc0b28ca80a31b59
 DIST cppcheck-1.78.tar.bz2 1201959 SHA256 e42696f7d6321b98cb479ad9728d051effe543b26aca8102428f60b9850786b1 SHA512 598556e9d657a3a77ff889cb6647291160017f7f9322326771416ff59d44126ce47c39767657b863cdb8a1b46d7c83bb337ec2fe0574500b37e99c33377b5dd8 WHIRLPOOL 2087ad837353d01bca828af940c427909a3e556e97e46d1822e0f2f527619c87b15d1a7f647992dd46eb3a2ef1eb4fb86344db31d7a01fb6f8a9070dfeecef96
 DIST cppcheck-1.79.tar.bz2 1206623 SHA256 2b85b693de54f15048f1841e7aef74574f99da6270d2182baba78514fa27f06d SHA512 766649b685d60b057752a49eda46f5bb42681c01c32169e83f85ea6f5d3302b572a2d484c1cee1380fd304489d5a32f83eb59a72ceefb1b787031e84bf3a2676 WHIRLPOOL dee33b68c8b924a68b90cbabcd9da6489003fb9f4fc0e2f5d411c82404c666b0c034ca33cc8e4043e4b1d18622158d1dd3de3b8ebd83d52ee01cd3513a39ad26
-EBUILD cppcheck-1.77.ebuild 2194 SHA256 dc079d8e141b85ef9a9360e2553901dfcf95a985f57e3c1683c84951f004a31f SHA512 a1e30c8344d63a466b1d344136b0d553dfaf701bb9e40358ed7b5e64fa8bdff69e79980815e458e8de36843d886a4632b1ccf8f8543a5a6cbca519a718dada6b WHIRLPOOL 48c5ab158e84034bcf7ad3fd0cdcc312766757927beaaa521a1f656050c41b702f3b00c2fd683bca8db6f2b81144eb32cd7d47ec13dc4921abaf31b90d327646
-EBUILD cppcheck-1.78.ebuild 2196 SHA256 a3887ce663e5b77249f8d34abd37535a9c6b5bca9d525a95aaa8780ece35e533 SHA512 4cf2adf39208578543b665f772c144a17698d3633bdf9b019b4b6896dc7703965bf887921dc43100bf5300328673a23daf0c555cc0059d3753527768da529759 WHIRLPOOL db40b7c9e9fa964c601934c54b53e29340d74f9b761bdf1b61d4bc62e7abaa6257da0caa2258f3505af6347beaf95548c5f828d5c53b5370031692845a093ccc
-EBUILD cppcheck-1.79.ebuild 2203 SHA256 4134be2a42148e120b57102bea02556e13e866700b4a7de33068f13fcef68e53 SHA512 f4af48b4d3adb8ae4c8efecc32f29ed249f12da9d8f13ee70700277af3ff33b4bf9387bcd96ca9d4523d03d4cdcdbf729418ee75df90a541a5687435a3d1d0f6 WHIRLPOOL 67fb465ca5c8b23d070599f1516c21e6e0072b5aadc575b726f5e7c7409fdad173468812fce1187a0674aa359ffa998741e50eea17276ef3a74c0b262544ee5c
+EBUILD cppcheck-1.77.ebuild 2205 SHA256 b2834f429f6d45a05e8c6bc3481fa732a37365e9ce0619ecbbd83e83e7d09f3c SHA512 4bb41789b127b96ccf383a9da90417b885bc8f5329d7093859dc8d036229a5d63a0a711b9a873e12a884db1ec8ac094939efe9a067f87069050ceb7e0a5dff9d WHIRLPOOL e21778a8fcd194c72a41966f822972aef1f929961be2d4d1a7b49ef6ad3c005b536b244e3ae6e2f4957b6cf9f95dfddd677a02f330a477c0dfa939e04a375985
+EBUILD cppcheck-1.78.ebuild 2209 SHA256 8274e4e120b62fd6de8eb9ea0374fc2157de8d12987613215fd9f5caea6a222a SHA512 b5716c018561011fe21cdfc2c1b16b08388d160ef6c588995fd69170db8fe2e9db60e6df8ad3fc964e762b256242eaaca5b6d57291e1eb7a651c79b5ca9aa3a8 WHIRLPOOL 0068e1dbcf7d43af42579f3a6e8f88d89780425d4afc7f89433775dfcc11beccac18f41b19a4a614722bfa83e63cd5f647929ea4bb6d0614b112966d458c611c
+EBUILD cppcheck-1.79.ebuild 2216 SHA256 605169bdcd9d9c4a8d1b3a9dc1fb667dfaafb8c1dd94ff76f8eb3e1e004c3764 SHA512 06533cff4fd86c056b44ef891e5cb0be02f928e4f65b14c37328fae026150a4396b3cb9c99f6af63f1375cb261129bfc63afb4eb6d787885021a43916bd7f877 WHIRLPOOL 0b19afe39c24fead78eb97829ca99f96c2bbd5ad115a981220cdc7d0460305550402f4abbb196cc3dc662b49789fc9c5a1c5264db71334585d476d4196234d5e
 EBUILD cppcheck-9999.ebuild 2196 SHA256 b5b9ab11751b82408531d1391190be14ceec633cdbf3a8c4c942965f9daead38 SHA512 5dacbd45a70f2190492a0d3adb92753ac768579ffa2ca9fea5dac74bcde3e3c889465deb3f46248b7a870fdc9dc5853ee721975e2b5f1a4c136564a5d450b9ac WHIRLPOOL c94929ed0c9e18b8e6aca4c8f15e9c28b03aa4ef483a313076d11f58b0dcc0d3e2053fbaa15a8ce1c5d720812708eef9a43e64e7cd59d95334ca8dfc75851cf1
 MISC ChangeLog 5582 SHA256 507ae46ed2c6e07dcd0fead0ffd82651a50b36f2cf2296e5c978178f5696964c SHA512 d16a214991a86f76f11edeed8378c0208c0117cb20a62ce351a63b64ebee778c41f81be7fb021c7c557c197c93f16e727801af05322f0177ce554d1225a1fc13 WHIRLPOOL 24efef1ac7031d3782ab487fa8853463b96112cec85577723edd534aeeec9f77f61c139b184b6e9c81b96212c4f9b4d11b08dc1cc64dfd574a337999bbaf7ad3
 MISC ChangeLog-2015 10993 SHA256 012074ab8ab80f8cce91ceb12de1dcaabf7edc2cd76e3a8ee612c74c7a2f1f05 SHA512 72ce4bdd77ffe3a9bdaf89dbbef5d763fbf43d3ec694bfe8758a5cbfe2bcef11256b8975aa60631145993d032e572135bbe9595d15682329ca222a45412e01c8 WHIRLPOOL ea46d1646fa95ac52158453e7798d9c61dd3c9cdc92a791611a0636b8ced3cf57ed58959e0fe50f40bf064694299045449796b7bf114e807c68a7bddca363c2c
diff --git a/dev-util/cppcheck/cppcheck-1.77.ebuild b/dev-util/cppcheck/cppcheck-1.77.ebuild
index f4ad03600e8f..6dfbbd3b0531 100644
--- a/dev-util/cppcheck/cppcheck-1.77.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.77.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm hppa sparc x86"
 IUSE="htmlreport pcre qt4"
 
 RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
diff --git a/dev-util/cppcheck/cppcheck-1.78.ebuild b/dev-util/cppcheck/cppcheck-1.78.ebuild
index fcdd220729f1..665af8ce0784 100644
--- a/dev-util/cppcheck/cppcheck-1.78.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.78.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 IUSE="htmlreport pcre qt4"
 
 RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
diff --git a/dev-util/cppcheck/cppcheck-1.79.ebuild b/dev-util/cppcheck/cppcheck-1.79.ebuild
index 04500dfcb915..5cdd5a3eaea7 100644
--- a/dev-util/cppcheck/cppcheck-1.79.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.79.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE="htmlreport pcre qt4"
 
 RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 8e71ae2502b3..7e76d08ced65 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,9 +1,5 @@
-DIST gource-0.44.tar.gz 875131 SHA256 2604ca4442305ffdc5bb1a7bac07e223d59c846f93567be067e8dfe2f42f097c SHA512 4cdc7824f8f5b4aa7004135e59157ebf731730bc2dab0120ab919240576939b0e13dc6a09df79fcdb55cc7b4628c3887f5eca7ab0fa73d5e7bf5ad49c7cf898c WHIRLPOOL 55d637d7c2306f87b1ea4acd12f639033cf15b627a06d9d7eb2a4a2bb5bc79b78f0ff1ca949cad1eb4fd77586411662a84838abb65b19e4a7e3b3bef537a5eea
-DIST gource-0.46.tar.gz 876639 SHA256 9aafdc072e4508990965da246ca17ab94c6937649030bf49de371126fc8479dd SHA512 5470ae31172623f5129ca609f039995dfa3338bb100241e6f3b9ccac55948b3400068ae6faf180c78fd63efb284e7624515383d4150f60648e4bb3e1819fee31 WHIRLPOOL 0ee43bdd6526cfb3d4af62cf7365bba51ebd0644562ef75b752586f516b5cc990ab817e069e9efaf090d6dfff1cc13d2d6b64ff0aec0df517243fa42eda07b39
 DIST gource-0.47.tar.gz 876624 SHA256 f2b16083a01b897b6c062b363793028fb9e01cd6f888d91772ee06e56ce398d2 SHA512 8b2c4c20f5266823846ee2ff18e4b793b35af4c65ab466b962aa2861d2fc8b3b9f7614db14ad8b3745548d3921ecd8163d58bb7ef67e7e4ca07f381565c85d14 WHIRLPOOL 2b167e546d7305376e8e92fbb730b53c4cc4940581b7b243fe72c8b05a9896f42d9efe66bca3d787ec325718cbe52e228988a3ddd86d2ec07e7a854c414c4fb2
-EBUILD gource-0.44.ebuild 1060 SHA256 ee9177e2c0ae6d8aaffec15c23d8ade080a4faac5f0cf1d4d909e64ef32211a0 SHA512 e165b22e0f20ca14e6da083f62114778037993438c712ebcb06be87123de5e8d4b06f766367df1a68678b0c25ec7b9edb03fb3e2242452d31f37bc2aba410e2e WHIRLPOOL 51974b0a04fb51094e5e9314963e266624c335c7245f17bd6506fbcba9701b0e8940ea20bd018394e5b5db4c613b910968f9e8b271b13e4436c943db675676e9
-EBUILD gource-0.46.ebuild 1062 SHA256 6aab4bea2b4759efa7ea70392726a979528198f8b25b9c4d0a345a9a3988e0c0 SHA512 f01007957e2ccbd2786bdefeeac22f909e789a8b223baf735d1f762863b20b9ee10b3135cd9c2215eb29436246f49af487ab3bd950d0a3ae7492592368571e0a WHIRLPOOL 2627a89d86a2a8eb09601a12ae9d65aaa05099264e9ef85cc135d5ff57d77b872ce7731fcae9dc1b661ce6ffe72263e631565682972ae1779169cc969ac31a21
-EBUILD gource-0.47.ebuild 1062 SHA256 6aab4bea2b4759efa7ea70392726a979528198f8b25b9c4d0a345a9a3988e0c0 SHA512 f01007957e2ccbd2786bdefeeac22f909e789a8b223baf735d1f762863b20b9ee10b3135cd9c2215eb29436246f49af487ab3bd950d0a3ae7492592368571e0a WHIRLPOOL 2627a89d86a2a8eb09601a12ae9d65aaa05099264e9ef85cc135d5ff57d77b872ce7731fcae9dc1b661ce6ffe72263e631565682972ae1779169cc969ac31a21
+EBUILD gource-0.47.ebuild 1060 SHA256 bf6b3a6e78530782e432c33033255c9536a87ab9c2766095634e35bee4f1222f SHA512 3cc91c93ae21cb3e89ee95d6094fa49416439ac394ca1f72585c204afcd2e7f91045e63184c12539df6daed4b83dfa284f01cd779dc8f02895f509cd8cc2b213 WHIRLPOOL 55050c2ec3fd1ff78d0b2c550ff4b4bf808ea925c19c90e66690afce9c3fbf8c3c76bc94c5ca0ec0566aeb422cafde97a30bc4c848107487f21f4c4e0b1e6aad
 MISC ChangeLog 4331 SHA256 fd75349444cb14440d65a829b1898177f6ffe6592798e099fb220a7636d11f0a SHA512 dcb7f211d68048ce09346e4b0df2376b7a405f12434e0c5046abedfd3836863397da3bcf19191291e5b2300fd60793c0647fd1ec4e96de47e2125a460f8bbbb1 WHIRLPOOL 4eaa1668961477c4596b1dd8ccd028f69b9e2757a1f7a95e25dc8c63b2f087237e8b7d05abeaa4956da02f34bc239973d3b39f5539764654a2d7b54249c6fed2
 MISC ChangeLog-2015 5742 SHA256 ce1b7f89be78bee183963d45c58d8232ea3f3f386dc2954b440b98ab58b4bf2a SHA512 13cace9156dfb4eff1c85bc31575915c566a654e9cfc3445f1119cc1d59ee632af0cb6f1907ae871aec0c38fde7bad46cae2ea20d1e653db52b26b3c874ff9b8 WHIRLPOOL 0af832d015fd058352223005b9bba25c78c52170f653c682fe4bb651122af1002ea935c4f7e0e56a48eb0c55f68b0efdb67ab2614e56179c4d83bb2d8ca05f4b
 MISC metadata.xml 353 SHA256 743fa902c09282d58a4d42053ecf87c112dc926824820933de7c5bf70152f967 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729 WHIRLPOOL 84fe64b56da61b1c9452061c2ef42b3ea94200a48a56afa2a26e39987c831bebbe68194bd62235b3f544df7342a5331d597505b00bd3f6b6a2a460e91c0ac6d4
diff --git a/dev-util/gource/gource-0.47.ebuild b/dev-util/gource/gource-0.47.ebuild
index a5617ffb831d..026d269388f6 100644
--- a/dev-util/gource/gource-0.47.ebuild
+++ b/dev-util/gource/gource-0.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index e1f743775424..a9a8e51fe9af 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,22 +2,14 @@ AUX jenkins-bin-r1.logrotate 483 SHA256 8bc2cb9759a54f2674abb1264dca452c29529555
 AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7209b19a2f14dccb3b SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b WHIRLPOOL 5c0dee7d648c22c65fcad7ec678ac839d1ab2d61aa52c8e54dccb6a9d58bcda5cca9685e570f0fe5b5f0fd6dd6ce0a47acc616cb9c5f6568758f92125a38f8c8
 AUX jenkins-bin.init2 1782 SHA256 3ff6ee9428744f616b32db1a7a6da9b99cd78573d2a6c9da90a2e70c1d54875b SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8 WHIRLPOOL 35d6ea0b7b317dbc76222460c4a2219ee7f9a969e88ad04c34e4855b6144abd29c24447ba68012ce511690b0d245c41995e60a68683278b5ee4538153fb04875
 AUX jenkins-bin.service 499 SHA256 51de27d125003a65ff9f8680e741e5f92ccd56e0a2f8a95a4fd0050204f2c3ba SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506 WHIRLPOOL 684d39cd7a2fb9b8e9c1efd29fc6b30ffc1f65b045ec271743c9eeba06a267b4a9e0d54154024308917f0fcbde6d070bd9f68a6437d9de1e592147b650a2d1b7
-DIST jenkins-bin-2.57.war 70476328 SHA256 5d7a66864d0941629e1fb8ef82ed98a38e54da39f4a9f3ca31561d573e18b2a5 SHA512 8207174bff1395b017b78b9d99e26b612a138977e75a2e01f59bb17fd42ac4470b7ab3b0b4fa305741bf5bf22987a2e51d61b907cb69c7ccce1697edaf331f76 WHIRLPOOL 17267b5df3ca296f42f711d73070b2a0a54e1a5ec293200bc1fd312a5bfc32abe4dfd63d97e9bd0834640bd28c9d625520e5e221cdde6b48c40fad5e0ba87435
-DIST jenkins-bin-2.60.3.war 70620203 SHA256 2d71b8f87c8417f9303a73d52901a59678ee6c0eefcf7325efed6035ff39372a SHA512 314a66a6745a164a8cd94afe83331246f46a93b1bd0304b5efe4523225ac96a4bd37ce3313b694a0a682d0bfd941ced957216dd1d53aa5e63aa6cea44eec31d2 WHIRLPOOL 0e34d9a4a0afbef823744afdfe6969e603b523a0f8f2a076a27fa111d874ee0102262cdc2f609b4d61117ce0e3ffa9f37cafaf59666597044d55455b5465bddc
-DIST jenkins-bin-2.67.war 71617234 SHA256 2def7deae23ffdcfece481548b3f6d7083d50a2696c91cfb5a9c5e84afcdf704 SHA512 c4b9af585888d2d1dd672569aeb92d2458dba808aa3cd664af31310cf847a7625afe7aad133f709c24598646b6e96d504bd53e54cf14490fbe756273b8494041 WHIRLPOOL b68d78f8e0dfddd3ffae89f2797b62b5a0480581b618f73dbeeff992eb961c52ef2da3de93170f3c97761dd4cf9f743d250cfc13e9fe99d92ea44e47659e8f1c
-DIST jenkins-bin-2.71.war 72956752 SHA256 14727da24054e956dc8b8514998e19001c99efce637891f544d2a9b3d9ea752c SHA512 d5718c70c7a1569f7389a8da2618382abe8799abb98faf87f4b25519b9336af904f32d72c8b30b2ca0f33e72c37d7984b901d4b26179c742333a538152c05b3b WHIRLPOOL bd592e4fe99ce66c6b659b8c28c3f29a2e8b7eb4b953bd1f5920998ff06519492504c525c17ad38d56cb257ad78e7e9e70a897dd43abf6ffc0f557f44e0de807
 DIST jenkins-bin-2.73.1.war 72954406 SHA256 171c6b3d819fb0240ccd06831b4b493bc7d1eb37ca2632c94f907f15b3aedf7f SHA512 82287ecb00c2638afd7f865b1e84da64fb1203c7d93926b7eb1b6dc46b44344d3ae020442d900264e525c3a5d25209a5aaa1c5ee253689ea4acd50ee906a9638 WHIRLPOOL 182c4615b33d818d6758b7da1ca1059926b06a0c1d11655c68538af6d19dbf2d8f299c7820aa52fd016be1396607b06006cbbef69f2887cc3327b0fd459b7380
-DIST jenkins-bin-2.78.war 73240530 SHA256 9d8ce9653d7a1ada2071ad9688ba7938e1e0672586e893e578dbfecdff725df6 SHA512 444c566c96c6d333319bf03629f58a05060628511326cd4fc02252fa55e70950c7901315318e9acd44ee33b51ab911da5f716fc3073b88fb10e3c0ed5977251e WHIRLPOOL 89e0a5ddad12e7f455546189fb878fef8b6d112832079f9ef96f4a298b7d1abd2b670d9b29a2fe22ef277a871b5986d91c967b1cdd0e72be3397ddb6c0cc5752
-DIST jenkins-bin-2.80.war 73094442 SHA256 69a84b894ad03518a66ffef6f63e289476a35a15e0ff186f0ab70f17b87a2a88 SHA512 3e39a4be9e4d977003db72fbdee77824eb9e65a62730a489bc8fcc45941f659d0d766e80d8d1913a2027bbbf8f356b9db18872f03ce1627467e3be373c781ab1 WHIRLPOOL d8fd4140944e44f84704f4eb4bdfca3dd865e3ce21b54a43c0d571a3ab95d95137d35e5ca856c2d41797765f30b9548bfb404e4674b8e338399737ab80a7e10b
+DIST jenkins-bin-2.73.2.war 73280014 SHA256 f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 SHA512 36fe7d2581f9a2f13b07c43ac9d5915d057bfede3522a17abc9376f19656166586c207c7516f46df7b2cef46ec67444ec44a97df0fc9af50ff41e9938465cebf WHIRLPOOL 1ab128a9e779de7b1c85283b40cf7401520123302d228462da6e77eacf30b288aa90b50b8f5576579e62287e5545cf6696f75155af1dc27cf6363e569806bc22
 DIST jenkins-bin-2.81.war 73097494 SHA256 6cdb8912f63b19bad5f87e9200babb8926ab1a1a480998b1f54d4a215c354338 SHA512 94b250119441f19996672bd5df216d86034c1188f0293beea8833bf77ad59706dbb8082a8540aa70c0ddc96cb5e1cf57f30c87ee5bda3e7794040a6df436e5de WHIRLPOOL 0b6e2804526e739953c3a004d8d0918f2fcc13fa0a8ec125dca04240f77582c9c85ddca5d1bd359cbd1594c823e6e4bf47b02a7d1fced55f2468147b2bc954d8
-EBUILD jenkins-bin-2.57.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
-EBUILD jenkins-bin-2.60.3.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
-EBUILD jenkins-bin-2.67.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
-EBUILD jenkins-bin-2.71.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
+DIST jenkins-bin-2.84.war 73749405 SHA256 067bdf4a3d473a5952e541d7755d8155a6ddf03cc1363d54daeb117d55dc955f SHA512 0074b2299f72f45040b4afd087caae0e08362708d3370d17f3bda047d11240881a3fd779753a49c298961e87c509d0b278ac2712934febed23c13c7e36d6c51c WHIRLPOOL 353d5297e6b5fdbfd95e6ea5ad4e6b8ec80653316029cd5bf108c0fc11be85f4f855c5783091e70d729cac842f16602c2f99f314af7e9bd46038854c15adedbb
 EBUILD jenkins-bin-2.73.1.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
-EBUILD jenkins-bin-2.78.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
-EBUILD jenkins-bin-2.80.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
+EBUILD jenkins-bin-2.73.2.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
 EBUILD jenkins-bin-2.81.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
+EBUILD jenkins-bin-2.84.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
 MISC ChangeLog 17147 SHA256 cedd72ff5b9bf786d1428289ac9ac8579ad33145dfb8404deef944cdf1665e67 SHA512 022d5ac33a69933bb466ee8276cc03191402ac9c20c361beb5bcfc73abf1ab72b96b507da444a31b524a9d764ab96ee91640a5713c2534460a562e23fabe2632 WHIRLPOOL ac693d36948f784cd45016c37a7b242fd7f0697157f818656754512bf907f8e06754179bed804cfc8c27b5662317b9bd0c3f983e34da51831cdf7edef16601a7
 MISC ChangeLog-2015 7461 SHA256 e48db67fcc69ca6960feec378328abd2bf810336a50541e6415fb0b3761fa32b SHA512 63f46144cb8712c22700d70fcdafc26c8113cb314781e6b351ca5254bc5196d86ff53b48e3eb0d722d8e6788e5f9b3a68f7767dc4d24724312844c14b8a476c8 WHIRLPOOL 58fe8bb9da5b4439fcef35aaed534ff6b78822287b4e328dc993580a4c970e8ff3b63d925405b48fe4c47a869f196f2ff59a439743b4a1b27acdbaa0ece4a7a6
 MISC metadata.xml 397 SHA256 f748bd402594de6903f7182113715c4ab3a9b0b382350ff52a3671ed7b11bd0b SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810 WHIRLPOOL 63fdb75a201da6f1a0d1ca73ed6167a0bbf438b568f0d2d68a620eae559ed3aac5e1d8f5e9f57557c5310dd38bcf459d512027c49928c5d82c7e99609c2dca49
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.73.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.73.2.ebuild
new file mode 100644
index 000000000000..fb976b69a9ff
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.73.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.84.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.84.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.84.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 58734945eb22..3f4e7b13373f 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,21 +1,19 @@
 AUX radare2-0.9.9-nogit.patch 352 SHA256 cb87e4093d4ace137f48e79d899576e89c91805934b0ad0f0b1c5f4a965332f9 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270 WHIRLPOOL fcbc1358c844e486366f766061b82c2ae72f7d513b2e504e7b488057e88f1af732667a5f02b05a8c8f91642799f3fdd47ad8f17e82f9659377c651d3e8d9c7d7
 AUX radare2-1.1.0-openssl-1.1.0c.patch 917 SHA256 250cd5d020c26627cde4462d98cae74b02e7b3baae2273bcbc0c482a868f1058 SHA512 c3829ce72751dca4d2e24e88d6bf4a03852f23699e5a8f6e64ede4c1304a5f00ba244995950f564531deb6552d9b0f7766cd991ef8205c579fd60db19a722714 WHIRLPOOL 3e2abd56c149bd7c2c68d82b18f2dc83728dbf0786ed4edae28cc1b3c54a03be7d76263911d0603bebbb73f2c018fc87cdda0f2116c607a2a718a8e8120badf1
-DIST radare2-0.10.6.tar.xz 5082028 SHA256 8e887526b22bdf7839fe10779c8da11d6156a5999382c2fa7bf6791a3f6a9d45 SHA512 1e33a831244c8bfc6ab317ed74ec108730f361550f504d48d8783e6c3bfc2ce98e4feac08b37b4b8997f0a83a456fe26685c6f4847798dea841a97b259dcef8b WHIRLPOOL 360d5ec9fd5fa02a7dca12a8bb5f388e1684419d757bd0767f33ec56e60354d3dafbca440e3d0b584d37a42a9aba12e6465f42acab71af2c584c30ccf3bb4f6b
-DIST radare2-1.0.2.tar.xz 5014612 SHA256 91fde12126e29bf8bbd6c4aad9e5b226b96afd289e55a52db3df872dc580a294 SHA512 cd60246aaf612818f8bc9fc77ce746a33b92b28ba7ee80988d56f7060dfa26072ada17a01b56c32d6d1f2bc2d98781c806a86f9e1e38aaf5c400ed54aaaff9b1 WHIRLPOOL 5c3f23fd938235d526345f3df2c3dafb5fa29a290bb96cdda79682057e37bca585fb5542cd2eb3d600e7b9a4901fb45b2bb8148c7f328053f99a08f7da43335e
 DIST radare2-1.1.0.tar.gz 8438634 SHA256 7bc1e206a2b4def6bdb8684c2af0281b007986a0b5b5da652bd03be264ca0fa5 SHA512 a99ac488f78c52fa9d6fbfe095b0aae10864f4a591721ee3679310ada3ef5e2a069ad919d1f7472d0dcd2c78569aac584086a7e975f1946194b346c94e4873b7 WHIRLPOOL 0d00f06eac3c6a7f3db1b4dc6b728714c73ea35eb5bbdd8281fe01052bd8519e19f8737c794c51f098d1fde9feaa8f1f7959815afad7a87ea8aaab36e862f834
 DIST radare2-1.2.0.tar.gz 8461187 SHA256 3660f4f8c1490194f5b5b80d7e21e1cc507e6aff2551008074e632c22549b941 SHA512 8419d92c9db2f1312bb188317af53497a75e0c78504d6b9c3fee7cb90f9219d6801543a2bc68f2dd3fc846d75ba60ce3f8d4cde61c99ec1e3c5f63c8c2b8dd88 WHIRLPOOL 1cc31557e4a6882251a517b24f5df59fb2fb9ad083e6670c42d392ab79a8ffd0d56f11f82512ee59f1c233edef3b3c5b08cbbb936ffe5e22753889987e313c2f
 DIST radare2-1.3.0.tar.gz 8517265 SHA256 adf9bbfb36b5cff986e8218455d75d7410e41e2fb4a380b99d1bcf6d36dce222 SHA512 ef410f8c5c0b931dab452c50b694313f26898a5f36c8286d18f56889e056658331cee87097a0e3028b8f53f25ec9c4354f6c78a41365a74d5bc67a38a6510174 WHIRLPOOL d3d5877814893308c0aa344740ef857d5814ec465d1f7deee73e226f4e1609ed9a75b3395c92fc382815464d1ceac3409bf09aade9f0f2f74cda93d3b2937ed8
 DIST radare2-1.4.0.tar.gz 8719644 SHA256 bf6e9ad94fd5828d3936563b8b13218433fbf44231cacfdf37a7312ae2b3e93e SHA512 5d022759e53f762094e237a29780d63dc4f39601ceacb22f58206bbb83a38a8938ea2321e49426b03421dcb0f6493a96f18905f8bf81025293f9c1a8087a4a0a WHIRLPOOL a86f5389d4905b970b22cd79b217d71a37a980b780b53078e5bcaf623d66e24999fb77a9d9b527986f5e9193b72f6b158e8dbefbed4d2557bdd9f0abffc88199
 DIST radare2-1.6.0.tar.gz 5752191 SHA256 759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787 SHA512 6e1485c4edaa007790c07a8cfe190c4ea3e4df843620e2575587478e60f1be3dacaa0c545c84e135a51d9f7aff61c27f712c0ffa6038b556d347151f2a3cd2bb WHIRLPOOL 6a35b3b58bc5ec248de53ca3970c4791a8d837b330109f832ccd12d0660537ca0fa62101b806dc29f1123bd48d4139bd7ef1856f5fdbd31afe67daea384f1872
-EBUILD radare2-0.10.6.ebuild 735 SHA256 f79177878d006c8f99296f6a807ea9347b7d7e662e3d8c3bbb96433873297a70 SHA512 9d49a23c3cccab934b84a121c6621ac1660dfb3815dadabb773bfb76ba60560d6f58d5d0b3a193f2c69f3522fd5935d2f1dab7ce37a1b5bf61eb26eb28229777 WHIRLPOOL 6fd83e33c8bba1de1d42fffd2fc9916b363fba09b552efe6eaac75ebce94330114c87a45d79817a54295fbde5afe9d97e72fd2db3f38c77a5856e804be350696
-EBUILD radare2-1.0.2.ebuild 735 SHA256 f79177878d006c8f99296f6a807ea9347b7d7e662e3d8c3bbb96433873297a70 SHA512 9d49a23c3cccab934b84a121c6621ac1660dfb3815dadabb773bfb76ba60560d6f58d5d0b3a193f2c69f3522fd5935d2f1dab7ce37a1b5bf61eb26eb28229777 WHIRLPOOL 6fd83e33c8bba1de1d42fffd2fc9916b363fba09b552efe6eaac75ebce94330114c87a45d79817a54295fbde5afe9d97e72fd2db3f38c77a5856e804be350696
+DIST radare2-2.0.0.tar.gz 6003014 SHA256 7d734cb3c047774600928110c8f8b970eb6117630b66d2c7284bc4ed68242c83 SHA512 387e08d06d017aac7ea7c1d6c6d1f761808ac689c85a5de22b796356fb5580d4cd6218a994ec86fbf9e9864def6d7d589bef290cacc2b10b241fe9681b80a985 WHIRLPOOL df8ca26f4f03ced670c6d911d1291a233aa1bf6e0236ee2ab34394f43afd49f7bf1ff9e7bbfd9b3c8853d126b2feeeaa64fe3553d2cc41504a3335b18c099164
 EBUILD radare2-1.1.0.ebuild 791 SHA256 bb682c299a3e9d5418de0f45fd7513d3b8f476f81241ee18e5e99924ea9a49cb SHA512 05f625d98263a245b72f097b3d3823c2291638fe577c9d97aefa0a1db3aba177214b73b214522b7adca1a2332f802dff77c377f00c0220699066d2ac7ceb1f8f WHIRLPOOL 3fc6021d118d162c70be8ff1aa0afe0ec8183bc61b6fd51e1d896bb16d32e87a90c605075c4d19b4be51f77b2669ae68de69d96112e56d2ac832d4a141c4ecbc
 EBUILD radare2-1.2.0.ebuild 733 SHA256 262aa204d848d6b123b3d57998ddf92c461d3ac85dba09af95f0197dac19c6f1 SHA512 09ecdc22c51553047632a38db89185ca32d1cf3597a09d12c532db56f37f4b62e6a2523222e4f78219fa761048005a8d2d27a2e5b383f5cd75b0c23b97c1e77e WHIRLPOOL a32d29b35591d22266558ea21694a72c9b11bdc5cfb7a341cbbe5504da925b5fc00207547da0ae4da689509505b93f5c11a0d4f5ca2dca224987348359a80999
 EBUILD radare2-1.3.0.ebuild 733 SHA256 262aa204d848d6b123b3d57998ddf92c461d3ac85dba09af95f0197dac19c6f1 SHA512 09ecdc22c51553047632a38db89185ca32d1cf3597a09d12c532db56f37f4b62e6a2523222e4f78219fa761048005a8d2d27a2e5b383f5cd75b0c23b97c1e77e WHIRLPOOL a32d29b35591d22266558ea21694a72c9b11bdc5cfb7a341cbbe5504da925b5fc00207547da0ae4da689509505b93f5c11a0d4f5ca2dca224987348359a80999
 EBUILD radare2-1.4.0-r1.ebuild 837 SHA256 17d601d343d2c6f1217fe81ddd96cef3240d84391557ea21d620eb6801a8a18b SHA512 e0148f02ceabc72b08617f338e64a35397081cc880974c7b5d43def77b66c46663ac5b6e5ff4825f2c64dd9e770a358f87dd70f0da849cf31730069e6da10606 WHIRLPOOL 679e214742a245a94b6eef1f41f1a76967b65e410737668d7dc2a4970e8e860d0b834fbe82363d7c5561b50191aafc720834a5d993964606ca33236f820bcb8c
 EBUILD radare2-1.4.0.ebuild 837 SHA256 17d601d343d2c6f1217fe81ddd96cef3240d84391557ea21d620eb6801a8a18b SHA512 e0148f02ceabc72b08617f338e64a35397081cc880974c7b5d43def77b66c46663ac5b6e5ff4825f2c64dd9e770a358f87dd70f0da849cf31730069e6da10606 WHIRLPOOL 679e214742a245a94b6eef1f41f1a76967b65e410737668d7dc2a4970e8e860d0b834fbe82363d7c5561b50191aafc720834a5d993964606ca33236f820bcb8c
 EBUILD radare2-1.6.0.ebuild 861 SHA256 399475512ae8f5e572c2f6e329a34192a6560926f33a76dbfa7358a8ae018be2 SHA512 b1f9c7dc798d5e47dc0ef34de6d574aceecdfd24b495ce93268ef6938ca43ea229dd2071687acab5c4e883591516300fb18157b7c24cb761a48eefc441020a45 WHIRLPOOL ad58c41e71e005272ad393388b85ba929503ad91b393e3dab765e155c0871d4a7822d054a1a53cf0b1e9d44faa642d5a99899d89f850c8ae01b566f8cc8fc6cf
-EBUILD radare2-9999.ebuild 666 SHA256 e8ab43a4f5887381d3d9d70442297185ff6785b5fe227bb87521b5d566d78bba SHA512 cafa5ff6e8d1c25371228260accf564ff3aaae72e0571a67070537aaa18add189eec8d257c238e39c4466b5b4324c34b6b846f157e96a0252c52fd062262179e WHIRLPOOL 8728c126d84b36b3f50b205c9b534dc3492f2450989937f09bd9c63f46cc92c237fd54e7c10737e36ce345efeee47ad4978be9f246f9af6f7d712c0ae3cfabc4
+EBUILD radare2-2.0.0.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
+EBUILD radare2-9999.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
 MISC ChangeLog 4607 SHA256 0849da5ab6d072ad7593d03e9b9b22d917dd2595cfbf2c13f24428ad36d2dca0 SHA512 eed5b7c00d816f0704b108ab36b69cb017ee2db9765c1faec063d4cf1d7b51d707c6d3cd94e29b754327cf9a786aa8e2337e327e1fb2b2dcce2c295307bac9d2 WHIRLPOOL 164b4dc5cd791295f748fed843fc23bb2108da6bc7d844cf83e862536ede59edcabca277462a964ae14bb373328c77ccb3f01125dd3205d0843e589d45d094e2
 MISC ChangeLog-2015 791 SHA256 4dd712e34e1b2e2ab9be03f8f9ad678dfd8e6a26da95bb9ae76c9a4f2d618430 SHA512 b618b8c70903664d4f78ce1318761460114c52a6b83320f22bef114988919a3c5a9961e01c16b40a1e0b063f4a4f7e367af93c9977dfb0c2d675e3c325541198 WHIRLPOOL 694b555dd75664961bee62ad4fe60394ad7a38e757c5d67218a174c46811557b10271575ee62c2be1617f3019b3e703dbcda281d159cb6d2c8af093ab1f60e9e
 MISC metadata.xml 472 SHA256 ca3ab277752c9a2b90825a7cdfbeb2860c69f67baa3eec158028d0c74c9e22b8 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365 WHIRLPOOL 3c1f8372953016360880cf500de78526a1ece9b5386616e740fb91ca1790db56abac41da6665b4390ae024457af4e443cc95b1f259845975b8a2981dc3afbfd0
diff --git a/dev-util/radare2/radare2-2.0.0.ebuild b/dev-util/radare2/radare2-2.0.0.ebuild
new file mode 100644
index 000000000000..cf3939d92997
--- /dev/null
+++ b/dev-util/radare2/radare2-2.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+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"
+	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl +system-capstone zsh-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
+
+	# 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-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 4c5adb60d123..cf3939d92997 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=6
 
-is_live() { [[ ${PV} == 9999* ]]; }
+inherit eutils
 
-is_live && inherit git-r3
-
-DESCRIPTION="Advanced command line hexadecimal editor and more"
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
-is_live || SRC_URI="http://www.radare.org/get/${P}.tar.xz"
-EGIT_REPO_URI="https://github.com/radare/radare2"
+
+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"
+	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ssl +system-capstone"
+IUSE="ssl +system-capstone zsh-completion"
 
 RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
@@ -29,3 +34,20 @@ src_configure() {
 		$(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
+
+	# 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/rbtools/Manifest b/dev-util/rbtools/Manifest
index 7d7ba3856eba..d3a35590e5c7 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,7 +1,5 @@
 DIST RBTools-0.7.10.tar.gz 171957 SHA256 7da97baa0dd447b3d83e1eed8ff41eee32d9195925ac08dc2c7b019b9b85ae8d SHA512 d4495cc73315e10d31d9b6c1517734fc58cc8b795a2d5eb32c9900b7108c57ad5b5f559e0fc7b13de0b00997f014a8f832183da46376f1480abaa5ebf5eb4866 WHIRLPOOL 5b0dcc0dd8fe210b6ae2cfa98729b4a7617c691687138f1879425ccf03395fece909fe675adbcc3df103475a9a545e8fdb3fd641f9feac9c19ca33f03e3801b1
-DIST RBTools-0.7.9.tar.gz 169548 SHA256 66689445e5063e3646703173d2eec459ceb68bb6ff15dbc8e84ec431ff6ee107 SHA512 d05e6ba7dc733e16d2a9795e93e0a4760875fd960a109fe3f52202cbb77883fa7f2897508b6dc827ad94c4ac96dc426638ba7aeaac7691d3692e6eb58b86a44d WHIRLPOOL e674b0e502afa7abdee6bd9e353d5a94552eb5eefba00e57e5579239819baf14d8adee6a72f7205b0091e27d17e3cf66bd5022f22fffa08938720a5be8803891
-EBUILD rbtools-0.7.10.ebuild 690 SHA256 c9a4a3e0b2f04de9e710294cf1e18f2bc90f5a9cb5ed9f834958c6a202fe60b9 SHA512 3681afe47b506897209beb40405dbd30875a4109d2857d278e071d372386ec3b0e54e60d2e0c50fb6752ad7cf0f62143f5cdd892fe42be4c4f877baaa18b0f64 WHIRLPOOL 38ad14db8770ee35f5d14e5f4eeff4bfc302cc4cf9d92fca38a8c34db3a8b2f5574cce91836c678e474c7bcd48b0373d7ba2286297370462b9f5f78dd704aebb
-EBUILD rbtools-0.7.9.ebuild 688 SHA256 4ffcc3558d462952543e329111bdb76989cc724603623f18a0dc674f4b1ac70f SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118 WHIRLPOOL 832bf0f0b7135961d7730e60ec3a9ceed945222f771bbde86ca6394bbcca631d9b37abbd32ef70867dd03c965132ae4f267009b13129115dfc7c5a01178d8168
+EBUILD rbtools-0.7.10.ebuild 688 SHA256 4ffcc3558d462952543e329111bdb76989cc724603623f18a0dc674f4b1ac70f SHA512 e24d2dfef42e07e14e1b6fbb6eb8751fdd9cbe25348a04eb6e21a6bf677c3c9db0d92f0365d33d3bce5e9b68f06f625815f50794ca7b29de0b624eaa0d794118 WHIRLPOOL 832bf0f0b7135961d7730e60ec3a9ceed945222f771bbde86ca6394bbcca631d9b37abbd32ef70867dd03c965132ae4f267009b13129115dfc7c5a01178d8168
 MISC ChangeLog 4390 SHA256 960def181e2270ded611e107cf010e53e32dae108b1feda7b313fa8bb8ea94ac SHA512 de46c3d822d46f4168bb7ec2d4b16f58e8df450ae7ba4b3ca821d7f38b6357f267ec17440cb3700de71afb8f2ef8dec25a7f9c62d607a5e7ca46f24eb4cd9ce7 WHIRLPOOL c894caabb9b0e0418d390f8c493fb28b73f973c8dd926501bc8fd3ca4ab6263c8bf16803c477a49b54148a0156a8e7998d2c47cc7fbf03e0cbbbbc705d42650a
 MISC ChangeLog-2015 6415 SHA256 680f6acfc0e3d5c5354d8006e474faa22aaef8db188537718b482cfcf8a138cc SHA512 b9f62ed8622ade4718c51c0c38f4bafcb1941c7490742d4b0f8e94a094c2566162acda1f94b83be7c0b1ab4f796436455497124565fd3c32c8728acd855ad708 WHIRLPOOL c98cb1f22883d4a17a1026e7bcf47935f1efabe96460501a33c93d1d1ec4099a32488a7881c47fbff8b7eca0b82bd8f6e6d338f604a4a5e2b505d1969915d63b
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/dev-util/rbtools/rbtools-0.7.10.ebuild b/dev-util/rbtools/rbtools-0.7.10.ebuild
index 35ccbd937ddb..4ef8e4c719f2 100644
--- a/dev-util/rbtools/rbtools-0.7.10.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compo
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="