Sync with portage [Tue Dec 13 08:43:45 MSK 2016].

7 years ago · cc6d8d5f18
parent b2da687801
commit cc6d8d5f18
484 changed files with 3745 additions and 3259 deletions
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,4 +1,4 @@
 DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
 DIST ansible-2.1.3.0.tar.gz 1851643 SHA256 a3bb0487687b70d5586277f0f0c9a419d05ad1811b81fa18535a568e5d064c0b SHA512 6a73a361a89e2785ba5157e309e18c04e2dd09a4133f9ab437d0b05f4e56790bc0430e08976638306c0254aa6b8eac4b558bbcd058f8f5bdba420de8f48c8c34 WHIRLPOOL 7dbb85ddb4533a2b4189aec7aa911a173e51646902bca71c7fdad2fadb7e3f3b88b3463dbf4a75913df0a9c72b3073dbad4b6c962dd484f638d5c58b5112ec4d
 DIST ansible-2.2.0.0.tar.gz 2441851 SHA256 d9f198d293394ce0f8ba802561b21368888e3301036a706b5584641b49408586 SHA512 8bb8360f41e920c46552ead826a342311d0acffa264334c8c8ae868f8bf45caad4ff2b9c9c0ec4e551653edaf80eb49d8dece5c2ba7e1088c2ce74d3ff0e3130 WHIRLPOOL 911ba4959fbca8527e9cf4b46c86cefc415433cab21486ff47302d02e60c4c2da1abc91c7ab564642a518acd5a5c1cbc8b3930ef7f596518c5aa358f001f4064
-DIST v2.2.1.0-0.1.rc1.tar.gz 1665098 SHA256 c0ac6f74970cb798b8ba11e0508d43cfcd623510c9075afef9db72b96734f0d9 SHA512 5e0d5e4efe1cf14c2f09a673816d9c62c19cc2d5c9ee566320fb35c72f8fd5fad608473adb5ad0fd2711bdd5deb33d2e1f00ef019c05062b5edd621fc52ce653 WHIRLPOOL 51b75cf601668344a70717184cac52f9fa0f611d631f3bd18b4b75fdc2c10d654374d79a6099c6a9db3c04124fd37adc4c3a5d2511ba2e44b7f34a0a2439bad5
+DIST ansible-2.2.1.0-0.1.rc1.tar.gz 1665098 SHA256 c0ac6f74970cb798b8ba11e0508d43cfcd623510c9075afef9db72b96734f0d9 SHA512 5e0d5e4efe1cf14c2f09a673816d9c62c19cc2d5c9ee566320fb35c72f8fd5fad608473adb5ad0fd2711bdd5deb33d2e1f00ef019c05062b5edd621fc52ce653 WHIRLPOOL 51b75cf601668344a70717184cac52f9fa0f611d631f3bd18b4b75fdc2c10d654374d79a6099c6a9db3c04124fd37adc4c3a5d2511ba2e44b7f34a0a2439bad5
--- a/app-admin/ansible/ansible-2.2.1.0_rc1.ebuild
+++ b/app-admin/ansible/ansible-2.2.1.0_rc1.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Model-driven deployment, config management, and command execution f
 HOMEPAGE="http://ansible.com/"
 # This is a release candidate, so we need to do things a little differently
 MY_PV="$(get_version_component_range 1-4)-0.1.rc1"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@ -1,3 +1,4 @@
 DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
 DIST conky-1.10.5.tar.gz 365176 SHA256 3bcf1ae93721e0575cd4ef8fd60da9e5bf1b2fbceb365fb9792f2aec6139f569 SHA512 b432e79a02954dc8b5f33e8dd2f19aaf3bb2030449329d037fd12764773bfc3521becb7699ac161bcecbbc431c2a6a8368787a1c8bbe3418ea83983df48cc6d8 WHIRLPOOL 7a1bc0e6b3445d322a7bea73a7cb952fd00926ba6d2b0a3ddaf6aca9d7be9d49b0ab614f5daa524bb24fbeed57d9a69472e2bd3eac8c3eb5e6639774d19b7890
 DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
--- a/app-admin/conky/conky-1.10.6.ebuild
+++ b/app-admin/conky/conky-1.10.6.ebuild
@ -0,0 +1,183 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit cmake-utils linux-info readme.gentoo-r1
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
 SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
 	weather-metar weather-xoap webserver wifi X xmms2"
 DEPEND_COMMON="
 	X? (
 		imlib? ( media-libs/imlib2[X] )
 		lua-cairo? (
 			>=dev-lua/toluapp-1.0.93
 			x11-libs/cairo[X] )
 		lua-imlib? (
 			>=dev-lua/toluapp-1.0.93
 			media-libs/imlib2[X] )
 		lua-rsvg? (
 			>=dev-lua/toluapp-1.0.93
 			gnome-base/librsvg )
 		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
 		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 		x11-libs/libX11
 		x11-libs/libXdamage
 		x11-libs/libXinerama
 		x11-libs/libXfixes
 		x11-libs/libXext
 		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
 		xmms2? ( media-sound/xmms2 )
 	)
 	cmus? ( media-sound/cmus )
 	curl? ( net-misc/curl )
 	eve? ( net-misc/curl dev-libs/libxml2 )
 	ical? ( dev-libs/libical )
 	iconv? ( virtual/libiconv )
 	irc? ( net-libs/libircclient )
 	mysql? ( >=virtual/mysql-5.0 )
 	ncurses? ( sys-libs/ncurses:= )
 	pulseaudio? ( media-sound/pulseaudio )
 	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
 	systemd? ( sys-apps/systemd )
 	wifi? ( net-wireless/wireless-tools )
 	weather-metar? ( net-misc/curl )
 	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
 	webserver? ( net-libs/libmicrohttpd )
 	>=dev-lang/lua-5.1.4-r8:0
 	"
 RDEPEND="
 	${DEPEND_COMMON}
 	apcupsd? ( sys-power/apcupsd )
 	hddtemp? ( app-admin/hddtemp )
 	moc? ( media-sound/moc )
 	nano-syntax? ( app-editors/nano )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 	"
 DEPEND="
 	${DEPEND_COMMON}
 	app-text/docbook2X
 	"
 CONFIG_CHECK=~IPV6
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
 To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
 and edit it to your liking.
 There are pretty html docs available at the conky homepage
 or in ${ROOT%/}/usr/share/doc/${PF}/html.
 Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
 pkg_setup() {
 	use ipv6 && linux-info_pkg_setup
 }
 src_configure() {
 	local mycmakeargs
 	if use X; then
 		mycmakeargs=(
 			-DBUILD_X11=ON
 			-DOWN_WINDOW=ON
 			-DBUILD_XDAMAGE=ON
 			-DBUILD_XINERAMA=ON
 			-DBUILD_XDBE=ON
 			-DBUILD_XFT=$(usex truetype)
 			-DBUILD_IMLIB2=$(usex imlib)
 			-DBUILD_XSHAPE=ON
 			-DBUILD_ARGB=ON
 			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
 			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
 			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 			-DBUILD_NVIDIA=$(usex nvidia)
 			-DBUILD_AUDACIOUS=$(usex audacious)
 			-DBUILD_XMMS2=$(usex xmms2)
 		)
 	else
 		mycmakeargs=(
 			-DBUILD_X11=OFF
 			-DBUILD_NVIDIA=OFF
 			-DBUILD_LUA_CAIRO=OFF
 			-DBUILD_LUA_IMLIB2=OFF
 			-DBUILD_LUA_RSVG=OFF
 			-DBUILD_AUDACIOUS=OFF
 			-DBUILD_XMMS2=OFF
 		)
 	fi
 	mycmakeargs+=(
 		-DBUILD_APCUPSD=$(usex apcupsd)
 		-DBUILD_CMUS=$(usex cmus)
 		-DBUILD_CURL=$(usex curl)
 		-DBUILD_EVE=$(usex eve)
 		-DBUILD_HDDTEMP=$(usex hddtemp)
 		-DBUILD_IOSTATS=$(usex iostats)
 		-DBUILD_ICAL=$(usex ical)
 		-DBUILD_ICONV=$(usex iconv)
 		-DBUILD_IPV6=$(usex ipv6)
 		-DBUILD_IRC=$(usex irc)
 		-DBUILD_MATH=$(usex math)
 		-DBUILD_MOC=$(usex moc)
 		-DBUILD_MPD=$(usex mpd)
 		-DBUILD_MYSQL=$(usex mysql)
 		-DBUILD_NCURSES=$(usex ncurses)
 		-DBUILD_PORT_MONITORS=$(usex portmon)
 		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_RSS=$(usex rss)
 		-DBUILD_JOURNAL=$(usex systemd)
 		-DBUILD_IBM=$(usex thinkpad)
 		-DBUILD_WEATHER_METAR=$(usex weather-metar)
 		-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
 		-DBUILD_HTTP=$(usex webserver)
 		-DBUILD_WLAN=$(usex wifi)
 		-DBUILD_BUILTIN_CONFIG=ON
 		-DBUILD_OLD_CONFIG=ON
 		-DBUILD_I18N=ON
 		-DMAINTAINER_MODE=OFF
 		-DRELEASE=ON
 		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
 	)
 	# -DMAINTAINER_MODE=OFF disables building documentation and fixes bug #486270
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
 		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
 		insinto /usr/share/vim/vimfiles/syntax
 		doins "${S}"/extras/vim/syntax/conkyrc.vim
 	fi
 	if use nano-syntax; then
 		insinto /usr/share/nano/
 		doins "${S}"/extras/nano/conky.nanorc
 	fi
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
--- a/app-admin/conky/files/conky-1.10.1-includewlan.patch
+++ b/app-admin/conky/files/conky-1.10.1-includewlan.patch
@ -1,13 +0,0 @@
 diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
 --- a/cmake/ConkyPlatformChecks.cmake	2015-11-18 20:47:45.000000000 +0500
 +++ b/cmake/ConkyPlatformChecks.cmake	2016-01-31 20:04:58.036144590 +0500
@@ -141,7 +141,8 @@
 endif(BUILD_MYSQL)
 if(BUILD_WLAN)
 -	check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE)
 +	set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) 
 +	check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE)
 	if(NOT IWLIB_H)
 		message(FATAL_ERROR "Unable to find iwlib.h")
 	endif(NOT IWLIB_H)
--- a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
+++ b/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch
@ -1,35 +0,0 @@
 From dbf26f0a42a7f46d363abb150192bfcd1ccb204b Mon Sep 17 00:00:00 2001
 From: Laurent Georget <laurent@lgeorget.eu>
 Date: Sat, 14 May 2016 19:38:55 +0200
 Subject: [PATCH] Fix the `symbol stdscr not found` compilation error (#254)
 The compilation fails when the symbols of terminfo are not present in
 the libncurses.so. This can happen when the terminfo library libtinfo.so
 is compiled separately. Using pkg_config is the correct approach to
 handle all cases.
 ---
 cmake/ConkyPlatformChecks.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
 index 05d8bbd..f19ac24 100644
 --- a/cmake/ConkyPlatformChecks.cmake
 +++ b/cmake/ConkyPlatformChecks.cmake
@@ -119,12 +119,12 @@ if(BUILD_HTTP)
 endif(BUILD_HTTP)
 if(BUILD_NCURSES)
 -	check_include_files(ncurses.h NCURSES_H)
 -	find_library(NCURSES_LIB NAMES ncurses)
 -	if(NOT NCURSES_H OR NOT NCURSES_LIB)
 +	pkg_check_modules(NCURSES ncurses)
 +	if(NOT NCURSES_FOUND)
 		message(FATAL_ERROR "Unable to find ncurses library")
 -	endif(NOT NCURSES_H OR NOT NCURSES_LIB)
 -	set(conky_libs ${conky_libs} ${NCURSES_LIB})
 +	endif(NOT NCURSES_FOUND)
 +	set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
 +	set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
 endif(BUILD_NCURSES)
 if(BUILD_MYSQL)
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,4 +1,3 @@
 DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f
 DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4
-DIST nano-2.7.0.tar.gz 2019889 SHA256 5dd1e9cf8e3de676c141a0b23f312e68380ef049926e2913e2114bbe32fbeac3 SHA512 d70719b9623e3b3c5f43dbf4dd1d53be5d498b28416d1c6bc4459887d34531222827dfb23bc6932a6304fe59df8d278810de813b4bc08b38c03f1badeddad12f WHIRLPOOL 5470eb106671d8b483fd7349d01d52c107082bf8bd67d03ff9cec3f656a9e280d1eda97befcf42067dc8732009fe9fcaaadbfa00af98be3ddbe073bd133d6386
+DIST nano-2.7.2.tar.gz 2050098 SHA256 89cc45dd630c6fb7276a14e1b3436a9972cf6d66eed15b14c3583af99070353c SHA512 faff964fda141c925f04528bd1f759b7cc16aec4642549134ab199850bd21e5d0d42bc564ce13bd9660f24bb6d2e5790185c8652b416dcd042b6ac9085f2acff WHIRLPOOL 43a1c6920e1c8e344192118eb826b0f0f00627ea8a98c760d997caf42e164ec3fb72fbabbdd5a672827da83f4ce83aa40def9b3c57f857a1ea562eff9f716ffb
 DIST nano-2.7.1.tar.gz 2032955 SHA256 81547310d3ab7a220426c9c2f2435a372fb43d4b27818f016de25698862ae118 SHA512 4cd87ad4c19ac6dad6894b35f15ae6794da488a075a374687ae7e950194c355dbf2c120744af9185bd10f722ecf0780525be2525c3e396113ed61f2e64af7d26 WHIRLPOOL 2be75c370c98d1f0b659ef73b37f553d5546eb08b72c6b0e539c43d971fa20c880ef81697ed5c6c74eba14393518e905f1aa1449ca7423e8242287b513c1e408
--- a/app-editors/nano/nano-2.7.0.ebuild
+++ b/app-editors/nano/nano-2.7.0.ebuild
@ -1,82 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="5"
 inherit eutils flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
 	inherit git-r3 autotools
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
 HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
 LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	sys-libs/ncurses:0=[static-libs(+)]
 	magic? ( sys-apps/file[static-libs(+)] )
 	nls? ( virtual/libintl )
 	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautoreconf
 	fi
 	epatch_user
 }
 src_configure() {
 	use static && append-ldflags -static
 	local myconf=()
 	case ${CHOST} in
 	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
 	esac
 	econf \
 		--bindir="${EPREFIX}"/bin \
 		--htmldir=/trash \
 		$(use_enable !minimal color) \
 		$(use_enable !minimal multibuffer) \
 		$(use_enable !minimal nanorc) \
 		--disable-wrapping-as-root \
 		$(use_enable magic libmagic) \
 		$(use_enable spell speller) \
 		$(use_enable justify) \
 		$(use_enable debug) \
 		$(use_enable nls) \
 		$(use_enable unicode utf8) \
 		$(use_enable minimal tiny) \
 		$(usex ncurses --without-slang $(use_with slang)) \
 		"${myconf[@]}"
 }
 src_install() {
 	default
 	rm -rf "${D}"/trash
 	dodoc doc/nanorc.sample
 	dohtml doc/faq.html
 	insinto /etc
 	newins doc/nanorc.sample nanorc
 	if ! use minimal ; then
 		# Enable colorization by default.
 		sed -i \
 			-e '/^# include /s:# *::' \
 			"${ED}"/etc/nanorc || die
 	fi
 	dodir /usr/bin
 	dosym /bin/nano /usr/bin/nano
 }
--- a/app-editors/nano/nano-2.7.2.ebuild
+++ b/app-editors/nano/nano-2.7.2.ebuild
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@ -1,4 +1,2 @@
 DIST hercules-3.06.tar.gz 2658262 SHA256 fa00b17c86a47133108c49973ba343d589f0e8777a115d827ef3da9aafbda22b SHA512 a938c2be64094ca412fb9094942088e344aa67b0af324af674d4fff73c6e936ffc6e384a5edcb48d1c31439c55322bf5e6b2e7ea36e7e7c9e416d8522240b1c5 WHIRLPOOL dbebb54e19ea5016d576153a0818ff5ce8e7114449837f127ad1c0ea82c561306a443dee2bd47d9a8c4afbd6ca257ca350348e773def86eccac76d3c754ea29c
 DIST hercules-3.08.tar.gz 2684844 SHA256 85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d SHA512 6fe8da6e0462f4b27f987c86b2de769e6a1a9eb3389bb612b59931590f75e7dd9d4a8456b5f36209aadf433dfe2e48686f2cda8e95b7480b9bdb971247e1eae5 WHIRLPOOL 833b2ba21a17d70cd3ba9a4f88fdaaec288acf471d43fd9c660e55c7c48f7a34b46b1defd7ffb699ed3f34af1fca9484303a09f3a020fa06367cdd291a675f5b
 DIST hercules-3.09.tar.gz 2567052 SHA256 98a6029d908943451635ba53acf97ed61fdf6ebafc4402be7137c620851fe4e7 SHA512 0c972f62de6f780608adff3fdb614b0c6fe46349da73ec2225d809786fd5188f9e9fbb0ee5858a75cb156071c0e976d37997547d23c939aa48c3b727c5680c0a WHIRLPOOL f9eee4c11855ac08f20423f4b864b2d41315ce445af4f844b644a0399e83535442cb697571e0956ba53deae3cb755956f3cdf0a323efd07afb4be8bc8dd1c145
 DIST hercules-3.10.tar.gz 2608321 SHA256 26264569b7d78bbc3b6221926051ac3761c4a792dfc84d591d3230de40aa46fa SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1 WHIRLPOOL 5233ededd4ef42e201216a11b2a09ee6c59a678771aaa9bc78ab4b87f459addc5c0b4ffd4bd2ec98d15a461565db6a354cc1ac846f800b98e86e93e51b263b4a
 DIST hercules-3.12.tar.gz 2569617 SHA256 aefbe9d2f09372a530c17c177b7d2a0f4bcf8cfd28474672935b067e5f9ee373 SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef WHIRLPOOL 03817954f281b545a1e431e3b2cbc11c97c2c636a63a8ca5a22b9a046ee9f286ec922798e38b7874c5b5b9a8f8fcfe59d8e7cac7f03bf880265937a53f43f4ef
--- a/app-emulation/hercules/files/hercules-3.06-build.patch
+++ b/app-emulation/hercules/files/hercules-3.06-build.patch
@ -1,18 +0,0 @@
 --- Makefile.in
 +++ Makefile.in
@@ -2010,14 +2010,13 @@
 tar: dist
 -install-exec-local:
 +install-exec-hook:
 @SETUID_HERCIFC_TRUE@	chown root $(DESTDIR)$(bindir)/hercifc
 @HERCIFC_GROUPSET_TRUE@@SETUID_HERCIFC_TRUE@	chgrp $(HERCIFC_GROUPNAME) $(DESTDIR)$(bindir)/hercifc
 @SETUID_HERCIFC_TRUE@	chmod 0750 $(DESTDIR)$(bindir)/hercifc
 @SETUID_HERCIFC_TRUE@	chmod +s   $(DESTDIR)$(bindir)/hercifc
 @SETUID_HERCIFC_TRUE@	rm                             hercifc
 -install-exec-hook:
 	rm -f $(DESTDIR)$(libdir)/libherc*.a
 	rm -f $(DESTDIR)$(modexecdir)/dyn*.a
 	rm -f $(DESTDIR)$(modexecdir)/hdt*.a
--- a/app-emulation/hercules/files/hercules-3.06-gcc44.patch
+++ b/app-emulation/hercules/files/hercules-3.06-gcc44.patch
@ -1,12 +0,0 @@
 diff -ur hercules-3.06.orig/hsccmd.c hercules-3.06/hsccmd.c
 --- hercules-3.06.orig/hsccmd.c	2009-01-10 02:18:33.000000000 +0200
 +++ hercules-3.06/hsccmd.c	2009-08-10 14:59:34.000000000 +0300
@@ -7676,7 +7676,7 @@
         break;
       }
     }
 -#elif // OPTION_CMDTGT
 +#else // OPTION_CMDTGT
 #ifdef _FEATURE_SYSTEM_CONSOLE
     if ('.' == cmd[0] || '!' == cmd[0])
     {
--- a/app-emulation/hercules/hercules-3.06.ebuild
+++ b/app-emulation/hercules/hercules-3.06.ebuild
@ -1,45 +0,0 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 inherit eutils flag-o-matic
 DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
 HOMEPAGE="http://www.hercules-390.org/"
 SRC_URI="http://www.hercules-390.org/${P}.tar.gz"
 LICENSE="QPL-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="custom-cflags"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 	sed -i \
 		-e 's:@modexecdir@:$(libdir)/$(PACKAGE):' \
 		-e '/^AM_CPPFLAGS/s:=:= -DMODULESDIR=\\"$(modexecdir)\\" :' \
 		$(find -name Makefile.in)
 	sed -i '/MODULESDIR/d' config.h.in
 }
 src_compile() {
 	use custom-cflags || strip-flags
 	econf \
 		--enable-cckd-bzip2 \
 		--enable-het-bzip2 \
 		--enable-setuid-hercifc \
 		--enable-custom="Gentoo Linux ${PF}.ebuild" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die
 	insinto /usr/share/hercules
 	doins hercules.cnf
 	dodoc README.* RELEASE.NOTES CHANGES
 	dohtml -r html
 }
--- a/app-emulation/hercules/hercules-3.08.ebuild
+++ b/app-emulation/hercules/hercules-3.08.ebuild
@ -1,39 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="4"
 inherit flag-o-matic
 DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
 HOMEPAGE="http://www.hercules-390.eu/"
 SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
 LICENSE="QPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="bzip2 custom-cflags +suid"
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 src_configure() {
 	use custom-cflags || strip-flags
 	ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2) \
 	econf \
 		$(use_enable bzip2 cckd-bzip2) \
 		$(use_enable bzip2 het-bzip2) \
 		$(use_enable suid setuid-hercifc) \
 		--enable-custom="Gentoo ${PF}.ebuild" \
 		--disable-optimization
 }
 src_install() {
 	default
 	insinto /usr/share/hercules
 	doins hercules.cnf
 	dodoc README.* RELEASE.NOTES
 	dohtml -r html
 }
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.10.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x64-macos ~x86-macos"
 IUSE="bzip2 custom-cflags +suid"
 RDEPEND="bzip2? ( app-arch/bzip2 )
@ -21,6 +21,11 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.09-aliasing.patch
 	# The local modules need local libs, so when doing a parallel install
 	# of the modules and libs breaks during relinking.  Force the libs to
 	# install first, and then the modules that use those libs.  #488126
 	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in
 }
 src_configure() {
--- a/app-emulation/hercules/hercules-3.12.ebuild
+++ b/app-emulation/hercules/hercules-3.12.ebuild
@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="4"
+EAPI="5"
 inherit flag-o-matic eutils
@ -20,7 +19,12 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 DEPEND="${RDEPEND}"
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-aliasing.patch
+	epatch "${FILESDIR}"/${PN}-3.09-aliasing.patch
 	# The local modules need local libs, so when doing a parallel install
 	# of the modules and libs breaks during relinking.  Force the libs to
 	# install first, and then the modules that use those libs.  #488126
 	echo "install-modexecLTLIBRARIES: install-libLTLIBRARIES" >> Makefile.in
 }
 src_configure() {
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@ -0,0 +1 @@
 DIST kompose-0.1.2_p20161207.tar.gz 4931237 SHA256 d4e008f6b9e5086365bc2cfb9a0883026cb6e8bb925612e31dc2112498c10bc0 SHA512 6dc5b047fdc56e368508338975221644219b820d90960c726a601ac0c33e637a25e4c98cd3ec8438d5fe7c7e30bb554fa89c43805668f0189d1b59e0785d5361 WHIRLPOOL 6a96698a786b87309e334c5ab69681002e232118e64bdd5778fa42ef2f02b993459e6bc1b9e40c84c0a3b5398569b3dcd2ef01479f64ecda68b15cae96020fa6
--- a/app-emulation/kompose/kompose-0.1.2_p20161207.ebuild
+++ b/app-emulation/kompose/kompose-0.1.2_p20161207.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/kubernetes-incubator/kompose/..."
 EGIT_COMMIT="04a3131834cddfb1af42b63b21641fbbf84a4a9d"
 ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="Tool to move from docker-compose to Kubernetes"
 HOMEPAGE="https://github.com/kubernetes-incubator/kompose"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0/${PVR}"
 IUSE="hardened"
 src_prepare() {
 	default
 	sed -i -e "s/HEAD/${EGIT_COMMIT:0:7}/" src/${EGO_PN%/*}/version/version.go || die
 }
 src_compile() {
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
 	GOPATH="${S}" go build -o bin/kompose src/${EGO_PN%/*}/main.go || die
 }
 src_install() {
 	dobin bin/*
 	dodoc -r src/${EGO_PN%/*}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
 }
--- a/app-emulation/kompose/metadata.xml
+++ b/app-emulation/kompose/metadata.xml
@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">kubernetes-incubator/kompose</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc5.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc5.patch
@ -0,0 +1,27 @@
 Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
 build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined
 reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0):
 undefined reference to `CloseLogosWindow'".
 --- gnokii-0.6.31/xgnokii/xgnokii.c		2011-12-02 15:53:04.000000000 +0100
 +++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5	2015-06-20 15:49:59.000000000 +0200
@@ -798,7 +798,7 @@
 }
 -inline void GUI_HideAbout(void)
 +void GUI_HideAbout(void)
 {
 	gtk_widget_hide(AboutDialog);
 }
 --- gnokii-0.6.31/xgnokii/xgnokii_logos.c	2011-12-02 15:53:04.000000000 +0100
 +++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5	2015-06-20 15:50:15.000000000 +0200
@@ -1304,7 +1304,7 @@
 	return 0;
 }
 -inline void CloseLogosWindow(void)
 +void CloseLogosWindow(void)
 {
 	gtk_widget_hide(GUI_LogosWindow);
 }
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
@ -0,0 +1,139 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit autotools eutils linux-info
 HOMEPAGE="http://www.gnokii.org/"
 if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="
 		git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 DESCRIPTION="User space driver and tools for use with mobile phones"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
 RDEPEND="
 	!app-mobilephone/smstools
 	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
 	ical? ( dev-libs/libical:= )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	sms? (
 		dev-libs/glib:2
 		postgres? ( dev-db/postgresql:* )
 		mysql? ( virtual/mysql:= )
 	)
 	usb? ( virtual/libusb:0 )
 	X? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	irda? ( virtual/os-headers )
 	nls? ( sys-devel/gettext )"
 CONFIG_CHECK="~UNIX98_PTYS"
 S="${WORKDIR}/${PN}-${PV%.1}"
 # Supported languages and translated documentation
 # Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 PATCHES=(
 	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
 	"${FILESDIR}"/${P}-gcc5.patch
 )
 src_prepare() {
 	[[ $PV == *9999 ]] && \
 		PATCHES=(
 			"${FILESDIR}"/${P}-icon.patch
 			"${FILESDIR}"/${P}-translations.patch
 		)
 	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
 	default
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 src_configure() {
 	strip-linguas ${MY_AVAILABLE_LINGUAS}
 	local config_xdebug
 	if use X && use debug; then
 		config_xdebug="--enable-xdebug"
 	else
 		config_xdebug="--disable-xdebug"
 	fi
 	econf \
 		--disable-static \
 		--enable-security \
 		--disable-unix98test \
 		$(use_enable bluetooth) \
 		${config_xdebug} \
 		$(use_enable debug fulldebug) \
 		$(use_enable debug rlpdebug) \
 		$(use_enable ical libical) \
 		$(use_enable irda) \
 		$(use_enable mysql) \
 		$(use_enable nls) \
 		$(use_enable pcsc-lite libpcsclite) \
 		$(use_enable postgres) \
 		$(use_enable sms smsd) \
 		$(use_enable usb libusb) \
 		$(use_with X x)
 }
 src_test() {
 	echo common/phones/fake.c >> po/POTFILES.in || die
 	default
 }
 src_install() {
 	default
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
 	insinto /etc
 	doins Docs/sample/gnokiirc
 	# only one file needs suid root to make a pseudo device
 	fperms 4755 /usr/sbin/mgnokiidev
 	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	if use sms; then
 		cd smsd || die
 		docinto smsd
 		use mysql && dodoc sms.tables.mysql.sql README.MySQL
 		use postgres && dodoc sms.tables.pq.sql
 		dodoc README ChangeLog README.Tru64 action
 	fi
 }
 pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
 	if [[ $PV == *9999 ]]; then
 		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
 		elog "You can keep track of the most recent commits at:"
 		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
 		elog "Whenever there is a change you are interested in, you can re-emerge ${P}."
 	fi
 }
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@ -1,58 +1,68 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=4
+EAPI=6
-inherit eutils linux-info autotools
+inherit autotools eutils linux-info
 HOMEPAGE="http://www.gnokii.org/"
-if [ "$PV" != "9999" ]; then
+if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="
 		git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 else
 	SRC_URI=""
 	KEYWORDS=""
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/${PN}.git
 		http://git.savannah.gnu.org/r/${PN}.git"
 	inherit git-2
 fi
-DESCRIPTION="user space driver and tools for use with mobile phones"
+DESCRIPTION="User space driver and tools for use with mobile phones"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite"
+IUSE="bluetooth debug ical irda mysql nls +pcsc-lite postgres sms usb X"
-RDEPEND="!app-mobilephone/smstools
+RDEPEND="
-	pcsc-lite? ( sys-apps/pcsc-lite )
+	!app-mobilephone/smstools
 	X? ( x11-libs/gtk+:2 )
 	bluetooth? ( kernel_linux? ( net-wireless/bluez ) )
 	ical? ( dev-libs/libical:= )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	sms? (
-		!app-mobilephone/smstools
+		dev-libs/glib:2
-		>=dev-libs/glib-2
+		postgres? ( dev-db/postgresql:* )
-		postgres? ( >=dev-db/postgresql-8.0 )
+		mysql? ( virtual/mysql:= )
 		mysql? ( >=virtual/mysql-4.1 )
 	)
-	ical? ( dev-libs/libical )
+	usb? ( virtual/libusb:0 )
-	usb? ( =virtual/libusb-0* )"
+	X? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
+	nls? ( sys-devel/gettext )"
 	dev-util/intltool"
 CONFIG_CHECK="~UNIX98_PTYS"
 S="${WORKDIR}/${PN}-${PV%.1}"
 # Supported languages and translated documentation
 # Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" cs de et fi fr it nl pl pt sk sl sv zh_CN"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 PATCHES=(
 	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
 	"${FILESDIR}"/${P}-gcc5.patch
 )
 src_prepare() {
-	if [ "$PV" = "9999" ]; then
+	[[ $PV == *9999 ]] && \
-		epatch "${FILESDIR}"/${P}-icon.patch
+		PATCHES=(
-		epatch "${FILESDIR}"/${P}-translations.patch
+			"${FILESDIR}"/${P}-icon.patch
-		intltoolize --force --copy --automake || die "intltoolize error"
+			"${FILESDIR}"/${P}-translations.patch
-	fi
+		)
 	sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
 	default
 	eautoreconf
 }
@ -60,48 +70,57 @@ src_prepare() {
 src_configure() {
 	strip-linguas ${MY_AVAILABLE_LINGUAS}
-	local config_xdebug="--disable-xdebug"
+	local config_xdebug
-	use X && use debug && config_xdebug="--enable-xdebug"
+	if use X && use debug; then
 		config_xdebug="--enable-xdebug"
 	else
 		config_xdebug="--disable-xdebug"
 	fi
 	econf \
-		$(use_enable nls) \
+		--disable-static \
 		--disable-unix98test \
 		$(use_enable bluetooth) \
 		${config_xdebug} \
 		$(use_enable debug fulldebug) \
 		$(use_enable debug rlpdebug) \
 		$(use_enable ical libical) \
 		$(use_enable usb libusb) \
 		$(use_enable irda) \
 		$(use_enable bluetooth) \
 		$(use_with X x) \
 		$(use_enable sms smsd) \
 		$(use_enable mysql) \
 		$(use_enable nls) \
 		$(use_enable pcsc-lite libpcsclite) \
 		$(use_enable postgres) \
-		$(use_enable debug fulldebug) \
+		$(use_enable sms smsd) \
-		${config_xdebug} \
+		$(use_enable usb libusb) \
-		$(use_enable debug rlpdebug) \
+		$(use_with X x)
-		--enable-security \
+}
-		--disable-unix98test \
+
-		$(use_enable pcsc-lite libpcsclite)
+src_test() {
 	echo common/phones/fake.c >> po/POTFILES.in || die
 	default
 }
 src_install() {
 	default
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
 	insinto /etc
 	doins Docs/sample/gnokiirc
 	sed -i -e 's:/usr/local:'"${EPREFIX}"'/usr:' "${ED}/etc/gnokiirc"
 	# only one file needs suid root to make a pseudo device
 	fperms 4755 /usr/sbin/mgnokiidev
-	if use X; then
+	use X && newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 	if use sms; then
-		pushd "${S}/smsd"
+		cd smsd || die
-		insinto /usr/share/doc/${PN}/smsd
+
-		use mysql && doins sms.tables.mysql.sql README.MySQL
+		docinto smsd
-		use postgres && doins sms.tables.pq.sql
+		use mysql && dodoc sms.tables.mysql.sql README.MySQL
-		doins README ChangeLog README.Tru64 action
+		use postgres && dodoc sms.tables.pq.sql
-		popd
+		dodoc README ChangeLog README.Tru64 action
 	fi
 }
@ -109,7 +128,7 @@ pkg_postinst() {
 	elog "Make sure the user that runs gnokii has read/write access to the device"
 	elog "which your phone is connected to."
 	elog "The simple way of doing that is to add your user to the uucp group."
-	if [ "$PV" == "9999" ]; then
+	if [[ $PV == *9999 ]]; then
 		elog "This is the GIT version of ${PN}. It is experimental but may have important bug fixes."
 		elog "You can keep track of the most recent commits at:"
 		elog "    http://git.savannah.gnu.org/cgit/gnokii.git/"
--- a/app-portage/repoman/repoman-2.3.1.ebuild
+++ b/app-portage/repoman/repoman-2.3.1.ebuild
@ -9,13 +9,20 @@ PYTHON_REQ_USE='bzip2(+)'
 inherit distutils-r1
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND="
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@ -2,63 +2,47 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 	pypy
 	python3_3 python3_4 python3_5
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+)'
-inherit distutils-r1 git-r3 multilib
+inherit distutils-r1
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
 IUSE=""
 DEPEND="
 	dev-lang/python-exec:2
 	=sys-apps/portage-9999
 	"
 RDEPEND="
-	dev-lang/python-exec:2
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
 	=sys-apps/portage-9999[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	"
+"
-
+DEPEND="${RDEPEND}"
 SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git
 	https://github.com/gentoo/portage.git"
 prefix_src_archives() {
 	local x y
 	for x in ${@}; do
 		for y in ${SRC_ARCHIVES}; do
 			echo ${y}/${x}
 		done
 	done
 }
 TARBALL_PV=${PV}
 SRC_URI=""
 S="${WORKDIR}/${P}/repoman"
 python_prepare_all() {
 	distutils-r1_python_prepare_all
-	if [[ -n ${EPREFIX} ]] ; then
+	if [[ -n "${EPREFIX}" ]] ; then
 		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
+
-			local shebang=$(head -n1 "$REPLY")
+		local file
 		while read -r -d $'\0' file; do
 			local shebang=$(head -n1 "${file}")
 			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
 					die "sed failed"
 			fi
 		done < <(find . -type f -print0)
@ -82,10 +66,6 @@ python_install() {
 		"${@}"
 }
 python_install_all() {
 	distutils-r1_python_install_all
 }
 pkg_postinst() {
 	einfo ""
 	einfo "This release of repoman is from the new portage/repoman split"
--- a/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
@ -70,10 +70,9 @@ src_install() {
 }
 src_test() {
-	cd tests || die
+	local -x ASCIIDOC_PY=asciidoc.py
-	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" tests/test${PN}.py update || die
-	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" tests/test${PN}.py run || die
 	"${PYTHON}" test${PN}.py run || die
 }
 pkg_postinst() {
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@ -1,18 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
-[ "$PV" == "9999" ] && inherit mercurial autotools
+[ "$PV" == "9999" ] && inherit git-r3 autotools
-inherit readme.gentoo python-single-r1
+inherit readme.gentoo-r1 python-single-r1
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
 if [ "$PV" == "9999" ]; then
-	EHG_REPO_URI="https://asciidoc.googlecode.com/hg/"
+	EGIT_REPO_URI="https://github.com/asciidoc/asciidoc.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
@ -52,12 +52,13 @@ REQUISITES for a list of runtime dependencies.
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
 		dev-util/aap
 		www-client/lynx
 		dev-util/source-highlight"
 fi
 src_prepare() {
 	default
 	# Only needed for prefix - harmless (does nothing) otherwise
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		"${S}/asciidoc.py" || die
@ -73,8 +74,12 @@ src_compile() {
 	default
 	if [ "$PV" == "9999" ]; then
-		cd doc || die
+		# replicate build rules from doc/main.aap; this avoids a dependency on
-		aap -f main.aap ../{CHANGELOG,README,BUGS} || die
+		# the A-A-P build tool
 		for f in CHANGELOG.txt BUGS.txt README.asciidoc; do
 			${PYTHON} asciidoc.py -f text.conf -n -b html4 -o - "$f" | \
 				lynx -dump -stdin > "${f%.*}" || die
 		done
 	fi
 }
@ -98,8 +103,11 @@ src_install() {
 }
 src_test() {
-	cd tests || die
+	local -x ASCIIDOC_PY=asciidoc.py
-	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" tests/test${PN}.py update || die
-	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" tests/test${PN}.py run || die
-	"${PYTHON}" test${PN}.py run || die
+}
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@ -1,2 +1,2 @@
 DIST itexToMML-1.5.3.tar.gz 136968 SHA256 9b6fff992546efebff72ede2c17dcbee630312bfa3050f92ca4598b4b98a0dd3 SHA512 7fbd1fdf4d245500561ba1405d5c91d14b08c207c5f8ea7ef8dc45ab4aadd61a15e96cd2748b98bca59b4891505db1420feec59412258605116fb75df065e2a3 WHIRLPOOL a8a48c2415a0f2002ec0b642a732a6461deddf94598a94026a28eacd125da874dfd089553e1bdd393693107b0354fd6725246d2c7309c14923b9e8e771fa52a5
 DIST itexToMML-1.5.4.tar.gz 136951 SHA256 39be9e60a5167d2525947fa38a97fea049db99dd484aa3de472e0bb90162182e SHA512 7c974eb8b9a7f12aa87f2243a6608ac509a7e4bb8b2c2164065cea67c7e50e2f22f6d5fc829f629389ce603e70cca72e13060b03180a81de36338a66ea699e54 WHIRLPOOL b53f6d3346051af466130c67c2cf30d9cf521056ab9e2dfd36f636d541ae6f775894795a208be391cc7bd7cdd2fed77fefb8e9eba6809a9ef66090f931bc16ea
 DIST itexToMML-1.5.5.tar.gz 155205 SHA256 c25e5ca7b8739e12cdeeeb8a62ea1a2f29831cc9fd97f62ec13eecd2feb389eb SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d WHIRLPOOL a016a5d890f13eb4fd272a4bec667cd1c4f0bd687523fbde116f2b21ad6a1ed19f719803214e1138e4409bfa0238a27eb4a57244414a6e5f52887975078f9f83
--- a/app-text/itex2mml/itex2mml-1.5.5.ebuild
+++ b/app-text/itex2mml/itex2mml-1.5.5.ebuild
--- a/dev-cpp/pstreams/Manifest
+++ b/dev-cpp/pstreams/Manifest
@ -1,4 +1,6 @@
 DIST pstreams-0.7.0.tar.gz 55536 SHA256 dc3850460a2ba7ff17969969e202d2c4241d250a1383b8093c961118e0b631bb SHA512 287a7503f25ad70c477b51f7c4af4c54947c1abc6c213371cdc7fc4ccdc20bf79b51959c0b482ae2fa9354e529036b2b53ca8ae5cbf8cd82ad43054856e5e00d WHIRLPOOL 884e363a5f61b45f06e277675a6c4195d9cf85d4e30d7de70099b2969311fb689061f233efcc3248e3ea2b84090102c0825729c8ff843e47066da7a030664883
 DIST pstreams-0.8.1.tar.gz 58588 SHA256 b60d2e9b7466a27c43911de09311ab1936c09b9f48039347b2a430e91871dd7a SHA512 edb6fa30e0a77c4a83bbb7a15c427376d39d73db17112cc5888c404fa1e99407c42c09c9ca072027ac52c753071fb7d7333237bd49aa44488512ce64de22d8f3 WHIRLPOOL aebc0e6808ecc1255a6c5ca7bca38fe40ba192367ac0d7695bb8c2eb31f7cd3257b616d4b73c17f67a6b94623a02a5e16a073fc9129acc04b130c9af3fbba0e7
 DIST pstreams-1.0.0.tar.gz 68207 SHA256 7d24e35d26675a8d474afb45cd88694b0b9e39f01107e4ec200b1f7eb9d215f9 SHA512 172ce79431d00d9fd17af610dfb41580a522480265d58531413da1cd950caa00d5cdb8ee12e2888cfa8b93e475cdf8946be9dcc3d02cbda7eba0034e66566b56 WHIRLPOOL 95f51447f025a36c78ec4e3459fa4bd0cca194c259ee5b78e088e5821e0ea48cbaf9cdbad5cb96ecfe9e3b446009f3c673dc3fe907498b00a2fce09077e0579b
 DIST pstreams-docs-0.7.0.tar.gz 102315 SHA256 e6894752ee59a9a7b09b3fdab13ceec7f67b73418485f20cde62f4e845194e7b SHA512 d7bccd0e2c83c694ff0c9ddc3ae173b4bdbae19f95c42dcc398e6dab25ea4076fda154ed84bc9b9f2872e468ad60f61a3cb20795b0c17e4bc297e4f425139f75 WHIRLPOOL 063faa1fb78abe87ac828b15b278c01362ce8b1c5459c342a2e5556eeb9c38b8b2e010c5b59ecf03e300dcaa5be04b2e1e562bd7dd9fddd92a252944734e5e05
 DIST pstreams-docs-0.8.1.tar.gz 169559 SHA256 6325a97aacf079f15c535fe9cb8871af06be465f3a1324f341401c8ecea1ba35 SHA512 4b42950831bb9a092ca5eeadceded57888306f6ed24d2bd6c486b890d38b42e241f4430a7411a182d5d59b01a1fe0972d3816ec9510c9e2e50812cf390bc68be WHIRLPOOL 6709631b0aa99f99195b69e9ae8ded7bfec9e8809a16d146c6600e3884881b1a44bdf2158a2c6491ccd0fbe2d6f01ebda245778247656fb05e8cb57b0ad5a8e8
 DIST pstreams-docs-1.0.0.tar.gz 174207 SHA256 2c41135daea79a8d3cef1ae43f14cd08404a45e94b169b3bf85074896c238677 SHA512 44ad649bec3e9b02a52eb9c942842f19700cd3ebb4d7de47dd7887106ab07ab456b477815c90377dd0d92724f6144b88c4a9be89328921a675a4f263d40d4872 WHIRLPOOL c58c45bb8e7ab2b589a2f8980e081a14fd349dbe8a3e5b9f35c93974afbb819a99323e49642749376a023d72ad7cf28ded4b7fd76a3ec8f540a569503414f943
--- a/dev-cpp/pstreams/pstreams-1.0.0.ebuild
+++ b/dev-cpp/pstreams/pstreams-1.0.0.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit toolchain-funcs
 DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
 HOMEPAGE="http://pstreams.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
 SLOT="0"
 LICENSE="LGPL-3"
 IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 src_compile() {
 	if use doc; then
 		doxygen -u || die
 		emake
 	fi
 }
 src_test() {
 	emake \
 		CXX="$(tc-getCXX)" \
 		CXXFLAGS="${CXXFLAGS}" \
 		check
 }
 src_install() {
 	doheader pstream.h
 	dodoc AUTHORS ChangeLog README
 	use doc && dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/*
 }
--- a/dev-db/postgresql/postgresql-9.1.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.24.ebuild
@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 SLOT="$(get_version_component_range 1-2)"
--- a/dev-db/postgresql/postgresql-9.2.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.19.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 SLOT="$(get_version_component_range 1-2)"
--- a/dev-db/postgresql/postgresql-9.3.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.15.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 SLOT="$(get_version_component_range 1-2)"
--- a/dev-db/postgresql/postgresql-9.4.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.10.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 SLOT="$(get_version_component_range 1-2)"
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@ -1 +1,2 @@
 DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece
 DIST onig-5.9.6_p1.tar.gz 605920 SHA256 ac34ae0624296b59ff9ad9a2e93f2b1cdd775ca87057a42d27e551b7a76ff7b4 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48 WHIRLPOOL be0f030469cbaef0f196190a18725eb4f516b3b78c1a3484fe602462df1ada48fa848fc59f619f0089a352293825f809034c18e5964802fc964032d94e10f03b
--- a/dev-libs/oniguruma/oniguruma-5.9.6_p1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.6_p1.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 # Needed for a sane .so versionning on fbsd, please dont drop
 inherit autotools multilib-minimal
 MY_P=onig-${PV}
 DESCRIPTION="a regular expression library for different character encodings"
 HOMEPAGE="https://github.com/kkos/oniguruma"
 SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 PATCHES=( "${FILESDIR}"/${PN}-5.9.3-makefile.patch )
 DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
 S=${WORKDIR}/${MY_P/_p1/}
 src_prepare() {
 	default
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable combination-explosion-check) \
 		$(use_enable crnl-as-line-terminator)
 }
 multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@ -1 +1,2 @@
 DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca
 DIST eliom-6.0.0.tar.gz 722673 SHA256 ec5636481be9cccc8256b13a5e551f6a8c32662e1c3211887a22eedf5c8958f9 SHA512 c59261bb6ba2303a7951de2e689abcb55af92b53a145d42054244d253b6757d72ba3f937772219b2b0aa5bccfe1a74baf62c938f40c1cce90720b6efe7be3b63 WHIRLPOOL e4f8c44c16dbc33c7576a117a25cb2f709a893ad82baa517fb2d5a776b0838affbef56aba84a977903c71d32987f3d16af485c5cf8dddd1cc39395025d996226
--- a/dev-ml/eliom/eliom-6.0.0.ebuild
+++ b/dev-ml/eliom/eliom-6.0.0.ebuild
@ -0,0 +1,67 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit eutils multilib findlib
 DESCRIPTION="A web framework to program client/server applications"
 HOMEPAGE="http://ocsigen.org/eliom/"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 IUSE="doc +ocamlopt +ppx"
 RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
 	>=dev-ml/js_of_ocaml-2.8.2:=
 	>=www-servers/ocsigenserver-2.8:=
 	>=dev-ml/tyxml-4:=
 	>=dev-ml/deriving-0.6:=
 	>=dev-ml/reactiveData-0.2.1:=
 	dev-ml/ocaml-ipaddr:=
 	dev-ml/react:=
 	dev-ml/ocaml-ssl:=
 	>=dev-ml/lwt-2.5.0:=
 	dev-ml/calendar:=
 	dev-ml/camlp4:=
 	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
 DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/opam"
 src_compile() {
 	if use ocamlopt ; then
 		emake PPX=$(usex ppx true false) all
 	else
 		emake PPX=$(usex ppx true false) byte
 	fi
 	use doc && emake doc
 	emake man
 }
 src_install() {
 	opam-installer \
 		--prefix="${ED}/usr" \
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		--mandir="${ED}/usr/share/man" \
 		|| die
 	dodoc CHANGES README.md
 	if use doc ; then
 		docinto client/html
 		dodoc -r _build/src/lib/client/api.docdir/*
 		docinto server/html
 		dodoc -r _build/src/lib/server/api.docdir/*
 	fi
 }
--- a/dev-ml/ocsigen-toolkit/Manifest
+++ b/dev-ml/ocsigen-toolkit/Manifest
@ -0,0 +1 @@
 DIST ocsigen-toolkit-0.99.tar.gz 68978 SHA256 fd42765a5f0d9297607160523bb99c4a6b2b6ef25b4c1464b6065bc98caea54b SHA512 a46577b4627a19a85c4f628dc47bfb81ba8da641dcf08e97df02f236e0a328086d8395aa165a9e82b42b3254c7d04f7d763c12cd7495f427a6d681544ad7963b WHIRLPOOL a496e41ec1974c0c841f4e154182a407326884067ffd389a83824b5957fe1f320643856acf422239e67d4a7a5dace1ab1f703c869b87feb6f8c16855cc78ce36
--- a/dev-ml/ocsigen-toolkit/metadata.xml
+++ b/dev-ml/ocsigen-toolkit/metadata.xml
@ -0,0 +1,8 @@
 <?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>
 </pkgmetadata>
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-0.99.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-0.99.ebuild
@ -0,0 +1,52 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit findlib
 DESCRIPTION="User interface widgets for Ocsigen applications"
 HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt debug"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]
 	>dev-ml/js_of_ocaml-2.7:=
 	>=dev-ml/eliom-5.1:=[ppx]
 	dev-ml/ppx_deriving:=
 	dev-ml/calendar:=
 	dev-ml/lwt:="
 DEPEND="${RDEPEND}
 	dev-ml/opam"
 src_compile() {
 	emake \
 		DEBUG="$(usex debug yes no)" \
 		NATIVE="$(usex ocamlopt yes no)" \
 		all
 }
 src_install() {
 	findlib_src_preinst
 	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
 	opam-installer -i \
 		--prefix="${ED}/usr" \
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
 	dodoc README.md
 }
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
@ -0,0 +1,52 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit findlib
 DESCRIPTION="User interface widgets for Ocsigen applications"
 HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt debug"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]
 	>dev-ml/js_of_ocaml-2.7:=
 	>=dev-ml/eliom-5.1:=[ppx]
 	dev-ml/ppx_deriving:=
 	dev-ml/calendar:=
 	dev-ml/lwt:="
 DEPEND="${RDEPEND}
 	dev-ml/opam"
 src_compile() {
 	emake \
 		DEBUG="$(usex debug yes no)" \
 		NATIVE="$(usex ocamlopt yes no)" \
 		all
 }
 src_install() {
 	findlib_src_preinst
 	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
 	opam-installer -i \
 		--prefix="${ED}/usr" \
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
 	dodoc README.md
 }
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 # embedded=on disables ssl support
 # https://metacpan.org/source/MICHIELB/DBD-mysql-4.036/dbdimp.c#L1886
--- a/dev-php/igbinary/igbinary-2.0.0-r1.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.0-r1.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PHP_EXT_NAME="${PN}"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( ChangeLog NEWS README.md)
 PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 USE_PHP="php5-6 php7-0 php7-1"
 inherit php-ext-source-r3
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/${PN}/${PN}"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 DEPEND=""
 RDEPEND=""
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@ -1 +1,2 @@
 DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a
 DIST pecl-memcached-3.0.0_alpha1_pre20161206.tar.gz 82102 SHA256 c9f158b8cb978495c89b615eb06098b24be0c501e757522dcc5357aeda6cb326 SHA512 c72c58223c8e780496f2fdfc727661efd5b5f3ae2a6bd2efa582591a9a8fae092ae5b89cac08e285bbe5175cb21f03168a605ad8bfefe9d290e97c613d2ba242 WHIRLPOOL cf3c8240982b26248079ceae96f56c906d9b741ec1b76d03ad4bad04a0598beea884dd0f89dbf9c12ffa487fc97062741a3ab69157440415e42367f02a2d7daa
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
@ -0,0 +1,55 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PHP_EXT_NAME="memcached"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( ChangeLog README.markdown )
 USE_PHP="php5-6 php7-0"
 inherit php-ext-pecl-r3
 USE_PHP="php5-6"
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
 SLOT="0"
 IUSE="+session igbinary json sasl"
 DEPEND="php_targets_php5-6? (
 		>=dev-libs/libmemcached-1.0[sasl?]
 		sys-libs/zlib
 		dev-lang/php:5.6[session?,json?]
 		igbinary? ( dev-php/igbinary[php_targets_php5-6?] )
 	)"
 RDEPEND="${DEPEND}"
 PDEPEND="php_targets_php7-0? ( dev-php/pecl-memcached:7[php_targets_php7-0] )"
 src_prepare(){
 	if use php_targets_php5-6 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
 	fi
 }
 src_configure() {
 	local PHP_EXT_ECONF_ARGS="--enable-memcached
 		$(use_enable session memcached-session)
 		$(use_enable sasl memcached-sasl)
 		$(use_enable json memcached-json)
 		$(use_enable igbinary memcached-igbinary)"
 	php-ext-source-r3_src_configure
 }
 src_install() {
 	if use php_targets_php5-6 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }
--- a/dev-php/pecl-memcached/pecl-memcached-3.0.0_alpha1_pre20161206.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.0_alpha1_pre20161206.ebuild
@ -0,0 +1,65 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PHP_EXT_NAME="memcached"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( ChangeLog README.markdown )
 USE_PHP="php5-6 php7-0 php7-1"
 inherit php-ext-source-r3 vcs-snapshot
 USE_PHP="php7-0"
 SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/e65be324557eda7167c4831b4bfb1ad23a152beb.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="http://pecl.php.net/package/memcached"
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3"
 SLOT="7"
 IUSE="+session igbinary json sasl"
 COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
 	sys-libs/zlib
 	igbinary? ( dev-php/igbinary[php_targets_php7-0?] )"
 DEPEND="php_targets_php7-0? ( ${COMMON_DEPEND} dev-lang/php:7.0[session?,json?] )
 	php_targets_php7-1? ( ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?] )"
 RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6] )"
 src_unpack(){
 	if use php_targets_php7-0 || use php_targets_php7-1 ; then
 		vcs-snapshot_src_unpack
 		php-ext-source-r3_src_unpack
 	else
 		S="${WORKDIR}"
 	fi
 }
 src_prepare(){
 	if use php_targets_php7-0 || use php_targets_php7-1 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
 	fi
 }
 src_configure() {
 	local PHP_EXT_ECONF_ARGS="--enable-memcached
 		$(use_enable session memcached-session)
 		$(use_enable sasl memcached-sasl)
 		$(use_enable json memcached-json)
 		$(use_enable igbinary memcached-igbinary)"
 	php-ext-source-r3_src_configure
 }
 src_install(){
 	if use php_targets_php7-0 || use php_targets_php7-1 ; then
 		php-ext-source-r3_src_install
 	fi
 }
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@ -1,105 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_4 pypy )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 inherit bash-completion-r1 distutils-r1 eutils git-r3 versionator webapp
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
 SRC_URI=""
 EGIT_REPO_URI="
 	https://github.com/django/django.git
 	"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc sqlite test"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/numpy[$(python_gen_usedep 'python*')]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		)"
 S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
 )
 pkg_setup() {
 	webapp_pkg_setup
 }
 python_prepare_all() {
 	# Prevent d'loading in the doc build
 	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
 	# and don't work with ${BUILD_DIR}/lib.
 	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 src_install() {
 	distutils-r1_src_install
 	webapp_src_install
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
 	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	echo
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "Extended templating support" dev-python/jinja
 	echo ""
 }
 python_install_all() {
 	newbashcomp extras/django_bash_completion ${PN}-admin
 	bashcomp_alias ${PN}-admin django-admin.py
 	if use doc; then
 		rm -fr docs/_build/html/_sources || die
 		local HTML_DOCS=( docs/_build/html/. )
 	fi
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
 	doins -r django/contrib/admin/static/admin/.
 	distutils-r1_python_install_all
 }
 pkg_postinst() {
 	elog "A copy of the admin media is available to webapp-config for installation in a"
 	elog "webroot, as well as the traditional location in python's site-packages dir"
 	elog "for easy development."
 	webapp_pkg_postinst
 }
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@ -1,2 +1,3 @@
 DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
 DIST python-openstackclient-3.2.0.tar.gz 431887 SHA256 4f66ccbdb2b3de71d69fee305a9585435cdaa0f9e523240c2f6c756555283c7a SHA512 819e4de30322c3c057799467eb2d9ffa3ef5c5060e49d7fb2c023a077f49c86e6c5626acfd01288cfc5dfdc551ef2702cd61c7c10721c00af579aaee72182f99 WHIRLPOOL 0aaccf7f460e5932257208aec64824271af70db0f64ec44f1f0c644962c77788afc61d7c5e7777d6fd65bdaa45c3c339e8a682b8705cc668473e2d15167c6ec2
 DIST python-openstackclient-3.2.1.tar.gz 433929 SHA256 29b221fb34d347a167037e64619f9d6c2d7f13fe60ba17a43272d686e16d69f5 SHA512 a7c20713e357112f68021cbb4d031b32c16a82622a112241f2b9c3e2b815ec56582ce2a088b99bdef1447698f5c67accce412710238be674cdbb8442126dd31d WHIRLPOOL 1e39f70c9f9a4ef2a64ca03ca8756cc7c8e43ad6e39311a31621fa481bc5a759b6903da11f5ef7240c35f30a4dd00d91650709cf0f39205166362ba7521dabcb
--- a/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
@ -0,0 +1,86 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 inherit distutils-r1
 DESCRIPTION="A client for the OpenStack APIs"
 HOMEPAGE="https://github.com/openstack/python-openstackclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
 		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
 		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
 		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
 		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
 		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
 		!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
 		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
 	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
 	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
 	>=dev-python/openstacksdk-0.9.4[${PYTHON_USEDEP}]
 	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
 	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
 	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
 	>=dev-python/python-cinderclient-1.6.1[${PYTHON_USEDEP}]
 	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
 	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
 	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
 "
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
 	# clients aren't actually needed
 	sed -i '/client\>/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	testr init
 	testr run || die "testsuite failed under python2.7"
 }
 python_install_all() {
 	distutils-r1_python_install_all
 }
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@ -2,3 +2,4 @@ DIST spyder-2.3.4.zip 3707063 SHA256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f
 DIST spyder-2.3.5.2.zip 3039104 SHA256 40e589467b561af534aac6d8cc2ea0dc244d3ae4457afb41b3aec6db6f8b2336 SHA512 ac8e078991b2889c3359e700bd89d4c8487eeba412512bc9bd7685214f687001bcc411016283bcde4eb73f6186ffc5cadc9614d911acd8b788899ef5aafd66e1 WHIRLPOOL e2b2bca44bd2ec1461875a358868ab34c60f30ac5164ff6312302b495e859000b97afc78ce12c69dbc328fdcbead247a9defce9e29c08de367fc7d3a321ff007
 DIST spyder-2.3.8.zip 3043528 SHA256 99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e SHA512 7d40e081ce2ea579d8d98e58e31b53afc04360bebcd52a226adc5ed387ed94d1aa24d0372c2e3594689d0f44a81df9986d8c3fbe4ccbae7a493ad039aaba3acc WHIRLPOOL dfd1edb2006c89df1a5bbc9d42a5e4e0042691fbcef71f855af6c0111f2b38bb88aef61ac00cfe8fed574e631af295aacb6d784d184ddb107e46616ce3a65e01
 DIST spyder-2.3.9.zip 3043753 SHA256 9b69df9abc7805fead522a8a1fe5b680bd0d07922564dde51c040e9f3fcb7349 SHA512 8808e0680779ffd0d3fad628bb9675babbede4ff92673786a8f4258ed5a0903a314c8db217e3f7aea0232282548c622df44541e14daa57b167732ff787a96166 WHIRLPOOL 8f8aa136216fe42d3d454211a9f8cf1f69dabce535f8a4fb5841fff3919141f957d90543e21c6809df2d0629e5011a66b5c1bdb6e1fe7fadb95a3081ef3a604e
 DIST spyder-3.0.2.tar.gz 3207709 SHA256 c308cae5d963a7332548db2dd91ebf105263eb493ce208221a59ad77592399c1 SHA512 7f3723bd98876aa4769877327a93aa02510689708012afc72148c67acd91ab134501ae57471d9cf0e17c9e3892a541b7730a2392ace3c6525443058d0ed01612 WHIRLPOOL 5f1f278fa3c6a98b8d7050bb32e9186cd7053e21d9050bf92b29088154ea3494995bf9953e04d63db4c71ccc37d3a2cdd7e38222b1f82decc2b763144cdf3642
--- a/dev-python/spyder/files/spyder-3.0.2-build.patch
+++ b/dev-python/spyder/files/spyder-3.0.2-build.patch
@ -0,0 +1,140 @@
 diff -r -U3 spyder-3.0.2.orig/setup.py spyder-3.0.2/setup.py
 --- spyder-3.0.2.orig/setup.py	2016-10-25 07:05:22.000000000 +0700
 +++ spyder-3.0.2/setup.py	2016-12-12 19:44:13.840412632 +0700
@@ -77,12 +77,7 @@
 def get_data_files():
     """Return data_files in a platform dependent manner"""
     if sys.platform.startswith('linux'):
 -        if PY3:
 -            data_files = [('share/applications', ['scripts/spyder3.desktop']),
 -                          ('share/pixmaps', ['img_src/spyder3.png'])]
 -        else:
 -            data_files = [('share/applications', ['scripts/spyder.desktop']),
 -                          ('share/pixmaps', ['img_src/spyder.png'])]
 +        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
     elif os.name == 'nt':
         data_files = [('scripts', ['img_src/spyder.ico',
                                    'img_src/spyder_reset.ico'])]
@@ -105,111 +100,9 @@
 #==============================================================================
 -# Make Linux detect Spyder desktop file
 -#==============================================================================
 -class MyInstallData(install_data):
 -    def run(self):
 -        install_data.run(self)
 -        if sys.platform.startswith('linux'):
 -            try:
 -                subprocess.call(['update-desktop-database'])
 -            except:
 -                print("ERROR: unable to update desktop database",
 -                      file=sys.stderr)
 -CMDCLASS = {'install_data': MyInstallData}
 -
 -
 -#==============================================================================
 -# Sphinx build (documentation)
 -#==============================================================================
 -def get_html_help_exe():
 -    """Return HTML Help Workshop executable path (Windows only)"""
 -    if os.name == 'nt':
 -        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
 -        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
 -            if osp.isfile(hhc_exe):
 -                return hhc_exe
 -        else:
 -            return
 -
 -try:
 -    from sphinx import setup_command
 -
 -    class MyBuild(build):
 -        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
 -                       + build.user_options
 -        def __init__(self, *args, **kwargs):
 -            build.__init__(self, *args, **kwargs)
 -            self.no_doc = False
 -        def with_doc(self):
 -            setup_dir = os.path.dirname(os.path.abspath(__file__))
 -            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
 -            install_obj = self.distribution.get_command_obj('install')
 -            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
 -        sub_commands = build.sub_commands + [('build_doc', with_doc)]
 -    CMDCLASS['build'] = MyBuild
 -
 -
 -    class MyInstall(install):
 -        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
 -                       + install.user_options
 -        def __init__(self, *args, **kwargs):
 -            install.__init__(self, *args, **kwargs)
 -            self.no_doc = False
 -    CMDCLASS['install'] = MyInstall
 -
 -
 -    class MyBuildDoc(setup_command.BuildDoc):
 -        def run(self):
 -            build = self.get_finalized_command('build')
 -            sys.path.insert(0, os.path.abspath(build.build_lib))
 -            dirname = self.distribution.get_command_obj('build').build_purelib
 -            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
 -
 -            if not osp.exists(self.builder_target_dir):
 -                os.mkdir(self.builder_target_dir)
 -
 -            hhc_exe = get_html_help_exe()
 -            self.builder = "html" if hhc_exe is None else "htmlhelp"
 -
 -            try:
 -                setup_command.BuildDoc.run(self)
 -            except UnicodeDecodeError:
 -                print("ERROR: unable to build documentation because Sphinx "\
 -                      "do not handle source path with non-ASCII characters. "\
 -                      "Please try to move the source package to another "\
 -                      "location (path with *only* ASCII characters).",
 -                      file=sys.stderr)
 -            sys.path.pop(0)
 -
 -            # Building chm doc, if HTML Help Workshop is installed
 -            if hhc_exe is not None:
 -                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
 -                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
 -                if osp.isfile(fname):
 -                    dest = osp.join(dirname, 'spyder')
 -                    try:
 -                        shutil.move(fname, dest)
 -                    except shutil.Error:
 -                        print("Unable to replace %s" % dest)
 -                    shutil.rmtree(self.builder_target_dir)
 -
 -    CMDCLASS['build_doc'] = MyBuildDoc
 -except ImportError:
 -    print('WARNING: unable to build documentation because Sphinx '\
 -          'is not installed', file=sys.stderr)
 -
 -
 -#==============================================================================
 # Main scripts
 #==============================================================================
 -# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
 -# platforms due to a bug in pip installation process (see Issue 1158)
 -SCRIPTS = ['%s_win_post_install.py' % NAME]
 -if PY3 and sys.platform.startswith('linux'):
 -    SCRIPTS.append('spyder3')
 -else:
 -    SCRIPTS.append('spyder')
 +SCRIPTS = ['spyder']
 #==============================================================================
@@ -259,8 +152,7 @@
                    'Programming Language :: Python :: 3',
                    'Development Status :: 5 - Production/Stable',
                    'Topic :: Scientific/Engineering',
 -                   'Topic :: Software Development :: Widget Sets'],
 -      cmdclass=CMDCLASS)
 +                   'Topic :: Software Development :: Widget Sets'])
 #==============================================================================
--- a/dev-python/spyder/spyder-3.0.2.ebuild
+++ b/dev-python/spyder/spyder-3.0.2.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 inherit eutils distutils-r1
 DESCRIPTION="Python IDE with matlab-like features"
 HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc hdf5"
 RDEPEND="
 	|| ( dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
 		dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
 		dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
 	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
 	dev-python/qtconsole[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7)
 	$(python_gen_cond_dep 'dev-python/rope_py3k[${PYTHON_USEDEP}]' python3_4 python3_5)
 	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
 	dev-python/pep8[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/qtawesome[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 # Courtesy of Arfrever
 PATCHES=( "${FILESDIR}"/${P}-build.patch )
 python_compile_all() {
 	if use doc; then
 		sphinx-build doc doc/html || die "Generation of documentation failed"
 	fi
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/html/. )
 	distutils-r1_python_install_all
 	doicon spyder/images/spyder.svg
 	make_desktop_entry spyder Spyder spyder "Development;IDE"
 }
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@ -1,3 +1,4 @@
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
--- a/dev-ros/combined_robot_hw/combined_robot_hw-0.11.3.ebuild
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.11.3.ebuild
@ -0,0 +1,22 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 inherit ros-catkin
 DESCRIPTION="Combined Robot HW class"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	>=dev-ros/hardware_interface-0.11
 	dev-ros/pluginlib
 	dev-ros/roscpp
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@ -1,3 +1,4 @@
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.11.3.ebuild
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.11.3.ebuild
@ -0,0 +1,26 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 inherit ros-catkin
 DESCRIPTION="Combined Robot HW class tests"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/combined_robot_hw
 	dev-ros/controller_manager
 	dev-ros/controller_manager_tests
 	dev-ros/hardware_interface
 	dev-ros/roscpp
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/controller_interface/controller_interface-0.11.3.ebuild
+++ b/dev-ros/controller_interface/controller_interface-0.11.3.ebuild
@ -0,0 +1,22 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 inherit ros-catkin
 DESCRIPTION="Interface base class for controllers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
 	dev-ros/pluginlib
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/controller_manager/controller_manager-0.11.3.ebuild
+++ b/dev-ros/controller_manager/controller_manager-0.11.3.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 inherit ros-catkin
 DESCRIPTION="The controller manager"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/controller_interface
 	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
 	>=dev-ros/hardware_interface-0.10.0
 	dev-ros/realtime_tools
 	dev-ros/pluginlib
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rosparam[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.11.3.ebuild
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.11.3.ebuild
@ -0,0 +1,21 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 inherit ros-catkin
 DESCRIPTION="The controller manager"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="dev-ros/rospy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.11.3.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.11.3.ebuild
@ -0,0 +1,28 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 inherit ros-catkin
 DESCRIPTION="Tests for the controller manager"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/controller_manager[${PYTHON_USEDEP}]
 	dev-ros/controller_interface
 	dev-ros/control_toolbox
 "
 DEPEND="${RDEPEND}
 	test? (
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/rosservice[${PYTHON_USEDEP}]
 	)"
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/hardware_interface/hardware_interface-0.11.3.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-0.11.3.ebuild
@ -0,0 +1,19 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 inherit ros-catkin
 DESCRIPTION="Hardware Interface base class"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="dev-ros/roscpp"
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@ -1,3 +1,4 @@
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.11.3.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.11.3.ebuild
@ -0,0 +1,25 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 inherit ros-catkin
 DESCRIPTION="Interface for enforcing joint limits"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
 	dev-libs/urdfdom
 	dev-ros/urdf
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
--- a/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -19,6 +19,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
 	dev-libs/urdfdom
 	dev-ros/urdf
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.11.3.ebuild
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.11.3.ebuild
@ -0,0 +1,22 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 inherit ros-catkin
 DESCRIPTION="RQT control manager plugin"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/controller_manager[${PYTHON_USEDEP}]
 	dev-ros/rqt_gui[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@ -3,4 +3,5 @@ DIST ros_control-0.10.1.tar.gz 621418 SHA256 2469f75eeeb46d3f68a1096864f91ea0599
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 DIST ros_control-0.11.2.tar.gz 647175 SHA256 bccce5003243031dd815d5210f84117ff3765e81c23f6acb4941dc31fe2f753a SHA512 b08da45ec9a1468f2b2204074487306f108f17f5745b04f701fbb97c0bbe123635b9ceac53afc5a28ed8d6a1c4a6e61d43ab5733c9a36edafac384a568af2674 WHIRLPOOL 30fa2a8af7529707994d420294ce0e8ff19cce230fb01df21b4ba50ffd3ed300ec35e59b6ef428dc7d12eaf430bb0cb9437c2eb17002e776e0bf7cff8f10d8bb
 DIST ros_control-0.11.3.tar.gz 647204 SHA256 0312a13acd3a23bf9dc17594fd38ca8701917e3d458d867da9f82467f9f4c8f3 SHA512 24ef9d17c921a59e771c7089bb98385dd3cb35e1ff85187555d9b3851fd7c354c6d6e0156c62b024343e2fcf5be5dc52ad6a9b2489e94f6dc1bf672995d35f6a WHIRLPOOL 2569d04d98ee3eb7d72fc3d09234c960928c8f2089a7edd3b5210cca0386ad5ce3a15e86e969f369f943f79d878d3fd99e1ec3c511d554a6bd4b84bbebd8ea57
 DIST ros_control-0.9.3.tar.gz 593174 SHA256 51e5e58e2010f668c136fd6178f83747af643fe5cf170484ce449c7e4e219a4e SHA512 37537de9cbee4702515f1db62980975c5d37c952e338bf1ffacf84722c605ad9f6bd660d8b6005e701fcb935f96b6adf1f28375640f14a2227703644b55e90fb WHIRLPOOL 1077031ba3511ef293a280af62afd237ca5da97140083dd396a34bc93d752be29d1599090fb8336627be85d9ee6d66231829d7af9fdd2214fd21535dad4e0abf
--- a/dev-ros/transmission_interface/transmission_interface-0.11.3.ebuild
+++ b/dev-ros/transmission_interface/transmission_interface-0.11.3.ebuild
@ -0,0 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 ROS_REPO_URI="https://github.com/ros-controls/ros_control"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 inherit ros-catkin
 DESCRIPTION="Transmission Interface"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RDEPEND="
 	dev-ros/hardware_interface
 	dev-ros/pluginlib
 	dev-ros/resource_retriever
 	dev-ros/roscpp
 	dev-libs/tinyxml
 "
 DEPEND="${RDEPEND}"
--- a/dev-vcs/git-spindle/Manifest
+++ b/dev-vcs/git-spindle/Manifest
@ -0,0 +1 @@
 DIST git-spindle-3.3.tar.gz 1854895 SHA256 4bfad8e716e16e267c1297bb66b563a5eb4a3f90d618338442529a9c773bd4d1 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8 WHIRLPOOL dc3286136e08a9a75764183f780834d9dfe7bfd7c49d7e97084405399c7e02bcb3402b71672b5dc3b439b6f64fe8732c8e459a4884bbe1aabaa2ae99c5c98166
--- a/dev-vcs/git-spindle/git-spindle-3.3.ebuild
+++ b/dev-vcs/git-spindle/git-spindle-3.3.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 DESCRIPTION="Git subcommands for interacting with central services"
 HOMEPAGE="http://seveas.github.io/git-spindle/"
 SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	dev-vcs/git
 	${PYTHON_DEPS}"
 DEPEND="
 	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-vcs/git-spindle/metadata.xml
+++ b/dev-vcs/git-spindle/metadata.xml
@ -0,0 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Nicolas Bock</name>
 		<email>nicolasbock@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Many central git hosting services, such as GitHub and GitLab, provide
 		an API to perform actions such as creating repositories and filing
 		pull requests. git-spindle is a collection of git subcommands to make
 		using these services easier.
 	</longdescription>
 </pkgmetadata>
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@ -1,2 +1,3 @@
 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496 WHIRLPOOL 7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
 DIST puzzles-20161207.b958129.tar.gz 2897516 SHA256 d8b93252c06a1fb25e0888e67b9e92a435a02fc746c89149e9cff77b44760ec3 SHA512 d937ebcf9aa7d4aa603a5ffec8bb2b3c533df855718288d380072b5e2518ed791eb5b23388c489e31decc9c25ef6a7b42b26fae5b76f1e75df246487d05a8d78 WHIRLPOOL 06f98af4e476421d3a6207f98de0851cdf4dae3446568c10808326acde24de8b54afb03c3667bef88ebdd3fba1d693993a64c0f2d6a2eeb8e43ff2ca32dc2c50
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
@ -0,0 +1,107 @@
 Based on http://sources.debian.net/patches/sgt-puzzles/20160429.b31155b-1/202_online-help.diff/
 Simply opens HTML help files with xdg-open
 Author: Ben Hutchings <ben@decadent.org.uk>
 Description: Add HTML-based online help
 This works along the same lines as the Windows implementation,
 though we have to try a bit harder to find a help browser.
 --- a/gtk.c	2016-12-08 07:53:06.812409184 -0500
 +++ b/gtk.c	2016-12-08 07:58:06.426415886 -0500
@@ -2,6 +2,10 @@
  * gtk.c: GTK front end for my puzzle collection.
  */
 +#ifndef _POSIX_C_SOURCE
 +#define _POSIX_C_SOURCE 1 /* for PATH_MAX */
 +#endif
 +
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -10,6 +14,9 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
 +#include <limits.h>
 +#include <unistd.h>
 +#include <locale.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -2270,6 +2277,37 @@
     resize_fe(fe);
 }
 +static void show_help(frontend *fe, const char *topic)
 +{
 +    char path[PATH_MAX + 1];
 +
 +    sprintf(path, "%s/%s.html", HTMLDIR, topic);
 +    if (access(path, R_OK) != 0) {
 +        error_box(fe->window, "Help file could not be found");
 +        return;
 +    }
 +
 +    const char *argv[3];
 +
 +    argv[0] = "xdg-open";
 +    argv[1] = path;
 +    argv[2] = NULL;
 +    if (! g_spawn_async(NULL, (char **)argv, NULL,
 +                      G_SPAWN_SEARCH_PATH,
 +                      NULL, NULL, NULL, NULL))
 +        error_box(fe->window, "Failed to open help file");
 +}
 +
 +static void menu_help_contents_event(GtkMenuItem *menuitem, gpointer data)
 +{
 +    show_help((frontend *)data, "index");
 +}
 +
 +static void menu_help_specific_event(GtkMenuItem *menuitem, gpointer data)
 +{
 +    show_help((frontend *)data, thegame.htmlhelp_topic);
 +}
 +
 static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
 {
     frontend *fe = (frontend *)data;
@@ -2590,6 +2628,25 @@
     menu = gtk_menu_new();
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
 +    menuitem = gtk_menu_item_new_with_label("Contents");
 +    gtk_container_add(GTK_CONTAINER(menu), menuitem);
 +    g_signal_connect(G_OBJECT(menuitem), "activate",
 +                     G_CALLBACK(menu_help_contents_event), fe);
 +    gtk_widget_show(menuitem);
 +
 +    if (thegame.htmlhelp_topic) {
 +        char *item;
 +        assert(thegame.name);
 +        item = snewn(9+strlen(thegame.name), char); /*ick*/
 +        sprintf(item, "Help on %s", thegame.name);
 +        menuitem = gtk_menu_item_new_with_label(item);
 +        sfree(item);
 +        gtk_container_add(GTK_CONTAINER(menu), menuitem);
 +        g_signal_connect(G_OBJECT(menuitem), "activate",
 +                         G_CALLBACK(menu_help_specific_event), fe);
 +        gtk_widget_show(menuitem);
 +    }
 +
     menuitem = gtk_menu_item_new_with_label("About");
     gtk_container_add(GTK_CONTAINER(menu), menuitem);
     g_signal_connect(G_OBJECT(menuitem), "activate",
 --- a/Recipe
 +++ b/Recipe
@@ -95,6 +95,7 @@ Puzzles.dmg: Puzzles
 !begin am
 bin_PROGRAMS = $(GAMES)
 +GTK_CFLAGS += -DHTMLDIR="\"$(htmldir)\""
 !end
 !begin am_begin
 GAMES =
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
@ -0,0 +1,4 @@
 [Desktop Entry]
 Type=Directory
 Name=Puzzles
 Icon=sgt-puzzles_map
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
@ -0,0 +1,18 @@
 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
 "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
 <Menu>
  <Name>Applications</Name>
  <Menu>
    <Name>Games</Name>
    <Menu>
      <Name>Puzzles</Name>
      <Directory>sgt-puzzles.directory</Directory>
      <Include>
      	<And>
 	  <All></All>
          <Category>sgt-puzzles</Category>
 	</And>
      </Include>
    </Menu> <!-- End Puzzles -->
  </Menu> <!-- End Games -->
 </Menu> <!-- End Applications -->
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
@ -0,0 +1,114 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit eutils gnome2-utils toolchain-funcs autotools
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
 	GENTOO_ICONS="20160315"
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
 	MAGIC=b958129
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="+doc gtk3"
 COMMON_DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils" # Used by builtin help patch
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.0 )"
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 src_unpack() {
 	default
 	if [[ ${PV} == "99999999" ]]; then
 		git-r3_src_unpack
 	fi
 }
 src_prepare() {
 	default
 	sed -i \
 		-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
 		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
 		mkfiles.pl || die
 	./mkfiles.pl || die
 	eautoreconf
 	# Import icons from latest Gentoo tarball for live
 	if [[ ${PV} == "99999999" ]]; then
 		cp -R ../${PN}-icons/icons . || die
 	fi
 }
 src_configure() {
 	econf \
 		--program-prefix="${PN}_" \
 		--with-gtk=$(usex gtk3 3 2)
 }
 src_compile() {
 	emake CC="$(tc-getCC)"
 	if use doc ; then
 		halibut --text --html --info --pdf --ps puzzles.but || die
 	fi
 }
 src_install() {
 	default
 	local file name
 	for file in *.R ; do
 		[[ ${file} == "nullgame.R" ]] && continue
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
 		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
 		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
 	done
 	if use doc ; then
 		DOCS=( puzzles.{pdf,ps,txt} )
 		HTML_DOCS=( *.html )
 		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
 	fi
 	insinto /etc/xdg/menus/applications-merged
 	doins "${FILESDIR}/${PN}.menu"
 	insinto /usr/share/desktop-directories
 	doins "${FILESDIR}/${PN}.directory"
 }
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 }
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@ -2,49 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
-inherit eutils gnome2-utils toolchain-funcs games autotools
+inherit eutils gnome2-utils toolchain-funcs autotools
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
 	inherit git-r3
-	SRC_URI=""
+	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
 	GENTOO_ICONS="20160315"
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=c0bc13c
+	MAGIC=b958129
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 GENTOO_ICONS="20160315"
 SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz
 "
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc gtk3 icons"
+IUSE="+doc gtk3"
-RDEPEND="
+COMMON_DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk3? ( x11-libs/gtk+:3 )"
-"
+
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils" # Used by builtin help patch
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.0 )"
 PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
 src_unpack() {
-	[[ ${PV} == "99999999" ]] && git-r3_src_unpack
+	default
-	unpack ${A}
+	if [[ ${PV} == "99999999" ]]; then
 		git-r3_src_unpack
 	fi
 }
 src_prepare() {
 	default
 	sed -i \
 		-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
 		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
@ -52,14 +57,16 @@ src_prepare() {
 	./mkfiles.pl || die
 	eautoreconf
-	# Import icons from latest Gentoo tarball
+	# Import icons from latest Gentoo tarball for live
-	if [[ ${PV} == "99999999" ]] || use icons; then
+	if [[ ${PV} == "99999999" ]]; then
 		cp -R ../${PN}-icons/icons . || die
 	fi
 }
 src_configure() {
-	econf --with-gtk=$(usex gtk3 3 2)
+	econf \
 		--program-prefix="${PN}_" \
 		--with-gtk=$(usex gtk3 3 2)
 }
 src_compile() {
@ -70,35 +77,35 @@ src_compile() {
 }
 src_install() {
-	dodir "${GAMES_BINDIR}"
+	default
 	emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install
 	dodoc README
 	local file name
 	for file in *.R ; do
 		[[ ${file} == "nullgame.R" ]] && continue
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
+		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
 	done
 	if use doc ; then
-		dohtml *.html
+		DOCS=( puzzles.{pdf,ps,txt} )
 		HTML_DOCS=( *.html )
 		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
 		dodoc puzzles.pdf puzzles.ps puzzles.txt
 	fi
-	prepgamesdirs
+	insinto /etc/xdg/menus/applications-merged
 	doins "${FILESDIR}/${PN}.menu"
 	insinto /usr/share/desktop-directories
 	doins "${FILESDIR}/${PN}.directory"
 }
 pkg_preinst() {
 	games_pkg_preinst
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	games_pkg_postinst
 	gnome2_icon_cache_update
 }
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@ -1,2 +1,2 @@
 DIST attica-5.26.0.tar.xz 60212 SHA256 8cc602d96a7e650771630e72a7102efdc9c3fb99004ed23f2de2daf9370ae7fc SHA512 54d0fddc8c5f33a906b24feb5006e389778869c15c248ff4170dc4934557c3a6671a3e8434a96cbd897404cea49aa71c65557e15ae7a73ed9df78f5741927f51 WHIRLPOOL 7c6823e1a6682aa2f484583b6dce8a2e8783bfa3a8b7a7ec361d503337e2fd7307f0e969318fac5197fac4ca1c4bd0c0ebcd418f53bb1f82386ac10a057cfd69
-DIST attica-5.28.0.tar.xz 60172 SHA256 7a527c59a8137c7d759bcbbdad3e8dd5b4c94869f26e9d282a354cae50dc6693 SHA512 a5a1eaa470a90d27364710b14f0d88789b8a35e0eb91ff588821299894f01b19be2eb0002ddfca665eaa3edefab38271bb8e07f44d5d25b79efe6e0798e081c7 WHIRLPOOL 4cc7f070577b55cba6bfb64093a91b52bd20838ce812e87460fcdab60ca74c753e473022bde44975a4094caf8994d77a93a3fd5c7484b03673b61bc653ff92fb
+DIST attica-5.29.0.tar.xz 60196 SHA256 a195e8ef4ae8dfb586c3c0a012797f5d4c358bdf3dde9c4eee10f07330c62af6 SHA512 14263ef7d6fda74b53bef615674c210737cc943b5d9024ed6fcd66bb4ec4fe7ef4fd91ab7ac7ca174b067cb16fe553a47eba5c83b91216ca6669e0a94112b49c WHIRLPOOL 9a06f701dc079e2c70458c1e505fa9b7ba9569abf769233e766375efcec96d2d033c2f2bfa59d144da51277bf27c9f36883979c9784237512ed0b67f4b47dce0
--- a/kde-frameworks/attica/attica-5.29.0.ebuild
+++ b/kde-frameworks/attica/attica-5.29.0.ebuild
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@ -1,3 +1,3 @@
 DIST baloo-4.14.3.tar.xz 145604 SHA256 9edcd2bf9fcb4f42959087c954e533bf3345d0971b7402f04c0703c1b2e66a5c SHA512 ce46abee6edfea333fe2b361418ee92e1e7e4b252c4cb9a48f302ff906b3dc49d78c4e55c69de09b0085e03fe87e978b90c2896f7492b940550fda9766679218 WHIRLPOOL a7e80983830419c796d18e72df64d08bb51aebda29c527bf6a65c61c233d80ca7ab6c784255949bd0697f67637cb37fe3bffc15fd5dd9253e185f6194221ebc9
 DIST baloo-5.26.0.tar.xz 187444 SHA256 dedd54b468e799cf0fc6e4f69e05659605907a026ec02895fc3bc250ab13f331 SHA512 bec8591648c0e3af7e96e2097725383195fd21fbb7d973738e2ff0caff9fd631b336bccca5ac9d3bc135fda00d2e2edcd9e0d26213f8a0cd1ea88588bc97d2d2 WHIRLPOOL f33b1d5ba9fc2250586f437bc613c3088a18058594f64f80d2b23665c83aa8c15e7167f5cd60dbf8405439e374e55b2a20f92bfb8567c0da17788d47ed75357a
-DIST baloo-5.28.0.tar.xz 200232 SHA256 059e6cc6ba23f1089a59adbfe2e6a6fbb3babe8b5557974aa517075fd0b1311c SHA512 3a3e4af9d85159efde0562ecbc6ce182edc0299e5c22b9310685eb046208103a23e92f62d5cde85744e383dd5c7b7681e41410e82aafb311e47731aa70f91eff WHIRLPOOL 3aaddbaf471f5e4b8680f018d80f1840beb3d34ac8777de2e9957dcbf2020155f0306909a9443077f853624fc1a6128a287fca292aac550f28a49ca502dc8a3f
+DIST baloo-5.29.0.tar.xz 201068 SHA256 76c0079d965b9a095a396b0e46e257de4458a2288922527a231aa38aad05f81b SHA512 fbaa00b38da33d9ebd635def1d7da180f86cf4e9a90fe42839d8b90c27f173e722fcabfcb29e7cd96cc80a8dc33f1c1637d0120512c504827fb1f0fd89110c41 WHIRLPOOL 2fc86132faf4f3f2f68d5f5bfb69ae6d1dcd38a65d39e31c75c3d13b929e4d452460fff077e9a9a81670c64eccda390209b2843b8ba55a8ddd719ce4a2119d1c
--- a/kde-frameworks/baloo/baloo-5.29.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.29.0.ebuild
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@ -1,2 +1,2 @@
 DIST bluez-qt-5.26.0.tar.xz 73512 SHA256 67205efeac8579a2ff0f8de7fdb61a8510e8ca8f6bc2e147d8846fd3b52c4358 SHA512 3823fab44a3a07cbad01186a45d66b6e5f7b2f907112b04040701e9ea5b009981b0bd58ab03afb97afd67acd8760cdc31c74c3595bd8590693ae2d622c00871d WHIRLPOOL 80ec7e0e228185d503e0861ed0af7830cc297dec9625cdb5a20a8c7d220e7bdd6a1d524d36a0fb2da2c7ba0bdb2d7c34c60ab00d6954a938955430d66d36bbf2
-DIST bluez-qt-5.28.0.tar.xz 73776 SHA256 296245b290aa01b0cde88e702fed6138daf6ca1099b8411225aeb0b977e6dfe5 SHA512 5442ec24d0ceb471ea07e9c987800ccf140fc3e50225b97704b74c09065e4ae3c8ff531bd840c135c70526b2dcc2ac073fd0e3a8e2c65803e23a21dcfab87834 WHIRLPOOL 954585db01d959a26792ad3fa1c167a82ab48a606ebf15e98139fd103ea2d9a4b33f719bdbea5ad14766469eb4e9a55bfd063c094c105d08d1b2efb22764eb54
+DIST bluez-qt-5.29.0.tar.xz 73792 SHA256 6f8fc96f2b0961d2516b94fc90728674e97d93e9e78db9e13538f76a37823697 SHA512 3e08ee36f5c86ce8be069f88803a8b38a8447b7c30e877a1857d23ee49712f664ef855f51d70b4b0ab8578e731f63666eae2a5ddb1d3ba964f6fd32f2fedfaae WHIRLPOOL 1e0509d8d86b629a9921c59655352ec971e05d6909d7e5d684bd816b197499c4b23291577bb63d9eadd91f85fa40aebb2eeb40b46510dd2902072d4f9d544f5d
--- a/kde-frameworks/bluez-qt/bluez-qt-5.29.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.29.0.ebuild
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@ -1 +1 @@
-DIST breeze-icons-5.28.0.tar.xz 1454088 SHA256 02fa95a016cf8ae72a8ea7003fa480194d1d347245f7a7bb61ea94009e78fc1b SHA512 521a45eed2d1010d770e7c8b793c294764f12bb90000f165bd6271ded7892d0fdc392571f9b607c36d9e6b61705b7874f2f12ef554f85bbf67b3208a366fc2f2 WHIRLPOOL cdd43333b34d586c1915278e234292675b2d970429229741c82d4f0623d4b6109d3d54905d26a4f82fa3a38d03993a7a62364e7fafe031c81586e81d1d360cdf
+DIST breeze-icons-5.29.0.tar.xz 1467464 SHA256 0bad6cad78f948fd73fc89ae2566b59b6859a752e95eb348ce735408d4bffbae SHA512 8da8bb7df7e18a7216465a1d79f0da1930834b49e008f777157177ea1b8de0f8b1a12346067d919dd75fbc6023f5b6587f5eabda4dbae2e6f56cdb6079c86ac3 WHIRLPOOL ed0f50285a6d9f90635be396a46b1a803bb3324c1b026376c6f2cb5a46b9513843f4a20f24cce48f61c4da0d6edcf37271bf240c42dee5f657b9c1d64cf248c0
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.29.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.29.0.ebuild
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@ -1,2 +1,2 @@
 DIST breeze-icons-5.26.0.tar.xz 1370236 SHA256 a9c0d742a37ef3b3b2dae5a5bb97aee2927dd613c17c606f3bcbc6845a8c6bcd SHA512 3edfd8f56548e61e6bebf21f711797bedeae91c0a8a3f1e4cade79d1d53cf7e9f5fa8cc154d62d3a33b6765c35ac1df252f45de0e00567624710b6149d0fe497 WHIRLPOOL 50a9860fd6ed5f97e7c2f239df954e372d441ed671b522e02570f0fa15506df59b16d0475ebffbb6357a79cf2a8a1658a2e5ea9cea7f3d4bd9dac03c646be049
-DIST breeze-icons-5.28.0.tar.xz 1454088 SHA256 02fa95a016cf8ae72a8ea7003fa480194d1d347245f7a7bb61ea94009e78fc1b SHA512 521a45eed2d1010d770e7c8b793c294764f12bb90000f165bd6271ded7892d0fdc392571f9b607c36d9e6b61705b7874f2f12ef554f85bbf67b3208a366fc2f2 WHIRLPOOL cdd43333b34d586c1915278e234292675b2d970429229741c82d4f0623d4b6109d3d54905d26a4f82fa3a38d03993a7a62364e7fafe031c81586e81d1d360cdf
+DIST breeze-icons-5.29.0.tar.xz 1467464 SHA256 0bad6cad78f948fd73fc89ae2566b59b6859a752e95eb348ce735408d4bffbae SHA512 8da8bb7df7e18a7216465a1d79f0da1930834b49e008f777157177ea1b8de0f8b1a12346067d919dd75fbc6023f5b6587f5eabda4dbae2e6f56cdb6079c86ac3 WHIRLPOOL ed0f50285a6d9f90635be396a46b1a803bb3324c1b026376c6f2cb5a46b9513843f4a20f24cce48f61c4da0d6edcf37271bf240c42dee5f657b9c1d64cf248c0
--- a/kde-frameworks/breeze-icons/breeze-icons-5.29.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.29.0.ebuild
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@ -1,2 +1,2 @@
 DIST extra-cmake-modules-5.26.0.tar.xz 286496 SHA256 cd529cc10cc4a4fc20a962329ffc8cc93cc200b7dc681aa4ddfc9e9cc88f79ec SHA512 66d2b21df46ddb022976c90e7b930709dc076c092545e4681a60ee4883622bc8561247486c90d266b0186d99379e6d2bd6ab0bb6e9b5d25ea6824c7203a4ccbf WHIRLPOOL 532ab9d161716e34a6605db3c39c02b9b3bd3545eeac62ae9f8518983a55d159c8b5c17800221690668f0acdd9721b9b3189f79915ad6b8eef6b27be8f893f3d
-DIST extra-cmake-modules-5.28.0.tar.xz 301880 SHA256 50b40f7e755aa727d2b38a7d48885d4a457046676937b4f848a074041a06267a SHA512 96ef800f5e8c16f2433747da899969ca1cbea1b69d8d6a4c2c97a67daffd8d337f5e924d78685df6870539cafa22964ea88aebf9ed55da5db12fbfca7904e0ce WHIRLPOOL 7895b9a20432e15f77ad7a14ba80e0b8106c84876bc34b155a68a7448519ae479f168b10ff00aeb133b7f045d41dcf69933a4ab851aa54bd4030ad56259798f9
+DIST extra-cmake-modules-5.29.0.tar.xz 303064 SHA256 48f76e626e2235bd4b64aeea9bbbcb803eb8966a6d020d0ab8ddbe81930e98d8 SHA512 2c82252acf67f82ad4678633c4ce8167dd85ddda9420221c9c26a374b9391e2ddba2fc4e92cf502e790348405aedbda68bbb527ad5c104d35ba7a0473ad86da2 WHIRLPOOL 441b6a44012df0cb8f988dd4c6ae8b092b66fd9525367c32e63b64bf2bf1a101555f9004ffc729f90d802c64a3cadacd44ae1be7f12b5dc1427aa19d9e1983b5
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.29.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.29.0.ebuild
@ -5,6 +5,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 CMAKE_MIN_VERSION="3.2"
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
 KDE_TEST="false"
@ -18,7 +19,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 DEPEND="
 	>=dev-util/cmake-2.8.12
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
@ -28,7 +28,6 @@ DEPEND="
 		$(add_qt_dep linguist-tools)
 	)
 "
 RDEPEND="
 	app-arch/libarchive[bzip2]
 "
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@ -1,2 +1,2 @@
 DIST frameworkintegration-5.26.0.tar.xz 1749228 SHA256 374db7d9b69486aa16fccf1391869f058679bf2aa7adf6f109ba29d3f4e31653 SHA512 a3211cff802a0d616d45952659c03cd515c4318b329344dc3b93eb2d2dfcc877fbe07cc88d96f1cf5c0184c596bce733593f5b97fe7bb8c6453643207111386a WHIRLPOOL 0fcc5e6f5b0b3272ddd8faea68396781f7c91325fa457f23a9196e3505c5e239b857849083b0e30a482e23340dff220f039cdf105c703157759a44aade33d00f
-DIST frameworkintegration-5.28.0.tar.xz 1749760 SHA256 161fc7576315d314d5f8f19e6fbc7723c4fc7c697ff8d2b455d9d7faaccf92ad SHA512 633b57ef335e7d4652c8a69d8c8d26da7def8ca32b3b5237d23c4d4cde04ec757b303b6417d88f90c53094259be48701028a0b4882d2ca685aa56f6e588b5982 WHIRLPOOL 4f6a70448d0b933d8c3f14a363412aa4cab806271bbdb8cd2fb6c29b060d6969816fe448c59a5f7da836d827c9a33a7a879491127cec3699cc50892e2fd0b81a
+DIST frameworkintegration-5.29.0.tar.xz 1750692 SHA256 ebb89e4b236163c067402cf78d67cddc443ef4fda0778001980948efc3cf5a52 SHA512 07cc7665a3604cbfae827cc28c64a966c7c62558903c40f1ce61be588d016de77e011489978ee3aa2b2583e061bbe37af0067d811b79dfddf5887113a3a56565 WHIRLPOOL d9da119a97fb0804d405208a823aa6f55f84f45891ddd322f508efca542dcd5e259aa89d0104eea46093e28e8eeee57ed1b589bc1f11312e6d4ddd1beea4245f
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.29.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.29.0.ebuild
@ -7,7 +7,7 @@ EAPI=6
 VIRTUALX_REQUIRED="test"
 inherit kde5
-DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="X"
@ -17,6 +17,7 @@ RDEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kpackage)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
@ -30,10 +31,19 @@ DEPEND="${RDEPEND}"
 # requires running kde environment
 RESTRICT+=" test"
 src_prepare() {
 	punt_bogus_dep Qt5 DBus
 	kde5_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X XCB)
 		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
 	)
 	# appstream requires app-admin/packagekit-qt and
 	# not yet packaged AppStreamQt 0.10
 	kde5_src_configure
 }
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@ -1,2 +1,2 @@
 DIST kactivities-stats-5.26.0.tar.xz 58456 SHA256 683b0ba5b55e523c93d5fab8866582d5c721d054e65e4fba1a5c712dcdd3eb6e SHA512 8ba49ef08d5f9014cd135128684a7be1b2bce11037a807b6772f2ac1c36a54e7152f02cb8b3c5855d1577c0fd7ebc0781f0688807e5b21411b7a36aa0fc9b89f WHIRLPOOL 2e1f4b9900c81193011307391b5ee4feebb12667792082e0e1211fec4c2c58407e2df08ed26c3d472d834f9e8ae06a5789fa040c424e83c863bba43eb64b542d
-DIST kactivities-stats-5.28.0.tar.xz 58676 SHA256 9bd4755b653acd63e8d0236bbeed8ada8940d6b812336e87b00057be0a954f5e SHA512 6a4bca4c125251f2833ebccd8ccc32cb10ba21107aec581836ec981aac09061ce5d7c66ff3a9873efecf6afa470f03b2f48eca6543498a9e9afea317c1c02abd WHIRLPOOL 8e656e6d4da27a73e7ff2c7887813d24cb88b0a0b4c24a583f5b3e5281666b6931c54e4b39ad19283820ba64794dfa818a7a3edd9a5ee28f8d8f917c86297c6f
+DIST kactivities-stats-5.29.0.tar.xz 58676 SHA256 0041d3586645376481c4c832f8a86ed494ab64479d3227c4b98ad57fd3ad9d99 SHA512 ea09835554efcde43f909ac2f92d088a18efa622325896ac57d53179bc81c2d8ebd7a83c1cd12d6cad6404c828c361e888f1cd7e63308cd3ff7476079266b11c WHIRLPOOL 4bf547f155150b8353f298bdeb88fb2259917bdf2c109ed2e031b073b40ecbeaa8e4725cdf9410b01c9b2e3a02b27ffea9d054db43458a824fdd68625e9f57af
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.29.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.29.0.ebuild
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@ -1,3 +1,3 @@
 DIST kactivities-4.13.3.tar.xz 87476 SHA256 c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a SHA512 1d248ae6045a7ae8d54ce5355100cd76be954c2a57be3abaab968d8ff2693d09aa9b1d0242266de4eedf6005bedfde38df69a84a9a5a0b16606fe958159b31bc WHIRLPOOL 0056402e851cda3c5930ed2440d259b9b23750f9356e9598e4ef17c6be38265bc4ebfeb43ac568636ff92399e3f560afa547977ad24f54f4eb4fad4df283cc0d
 DIST kactivities-5.26.0.tar.xz 60844 SHA256 e1b85b999fd36470e1c0fe84ec09d7473ce3bb603826f37b0bd652576f8ccc32 SHA512 f490f590f040bd6b9ed6a7883c0c0d9928b68dfc9874338ab18695433fb728031d3c10435057e79f486a044a78a0fc824c3461c61c89e66de8e4c30f9c9000da WHIRLPOOL ec6169087c64d2524cd6abb2efc02f81c19d017abf4f60d748feecc9aebbfc88c016561dc5ee3fbc9d073c86846ddcb858d20fe75e625d996c70c7667922a240
-DIST kactivities-5.28.0.tar.xz 61220 SHA256 eba9db7aecd916df45803c566fa2b11f377d2f497cfdfbc6a263a1eb18a65198 SHA512 416502e6bbf5305e2218e2750f827fe0776a4f5f36fd833c9ebdcdcf30015b001bc7842432519e7148fafcd94e2004b99fcbf676d1765b70981dc158a1a9ccd1 WHIRLPOOL db6ea6d75461505fe9e5d00c35751de782557efeb4d0cf46c399ee1628d0c530f88df20bdabb9616f94da03f8bb6208613a1ef058ed61294c1d6feee0295d807
+DIST kactivities-5.29.0.tar.xz 61236 SHA256 39cb0d7e9e64fe50ac935549b4c495ed02d7bb1397b176ab3b60bb6c3ec7d7d6 SHA512 a77180e2f33bceb3eff0f871dcced23bc7a30b674646661f08b3308a58277b232befea62061c8bbaa9b19a21bfbf55d81376bb95f25f4471e9c02a1468126bed WHIRLPOOL fb228679868e4efb557f833ca667f81465f50e9c3a854b7fc24e093c233a4762d396b15ce5e191d3077ec25caa9427cbe38707405a0bd61a6c7fddd4e82665e1
--- a/Show More
+++ b/Show More
		`@ -0,0 +1 @@`
							`DIST kompose-0.1.2_p20161207.tar.gz 4931237 SHA256 d4e008f6b9e5086365bc2cfb9a0883026cb6e8bb925612e31dc2112498c10bc0 SHA512 6dc5b047fdc56e368508338975221644219b820d90960c726a601ac0c33e637a25e4c98cd3ec8438d5fe7c7e30bb554fa89c43805668f0189d1b59e0785d5361 WHIRLPOOL 6a96698a786b87309e334c5ab69681002e232118e64bdd5778fa42ef2f02b993459e6bc1b9e40c84c0a3b5398569b3dcd2ef01479f64ecda68b15cae96020fa6`
`@ -1 +1,2 @@`
	`DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece`	`DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece`
		`DIST onig-5.9.6_p1.tar.gz 605920 SHA256 ac34ae0624296b59ff9ad9a2e93f2b1cdd775ca87057a42d27e551b7a76ff7b4 SHA512 5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48 WHIRLPOOL be0f030469cbaef0f196190a18725eb4f516b3b78c1a3484fe602462df1ada48fa848fc59f619f0089a352293825f809034c18e5964802fc964032d94e10f03b`
`@ -1 +1,2 @@`
	`DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca`	`DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca`
		`DIST eliom-6.0.0.tar.gz 722673 SHA256 ec5636481be9cccc8256b13a5e551f6a8c32662e1c3211887a22eedf5c8958f9 SHA512 c59261bb6ba2303a7951de2e689abcb55af92b53a145d42054244d253b6757d72ba3f937772219b2b0aa5bccfe1a74baf62c938f40c1cce90720b6efe7be3b63 WHIRLPOOL e4f8c44c16dbc33c7576a117a25cb2f709a893ad82baa517fb2d5a776b0838affbef56aba84a977903c71d32987f3d16af485c5cf8dddd1cc39395025d996226`
		`@ -0,0 +1 @@`
							`DIST ocsigen-toolkit-0.99.tar.gz 68978 SHA256 fd42765a5f0d9297607160523bb99c4a6b2b6ef25b4c1464b6065bc98caea54b SHA512 a46577b4627a19a85c4f628dc47bfb81ba8da641dcf08e97df02f236e0a328086d8395aa165a9e82b42b3254c7d04f7d763c12cd7495f427a6d681544ad7963b WHIRLPOOL a496e41ec1974c0c841f4e154182a407326884067ffd389a83824b5957fe1f320643856acf422239e67d4a7a5dace1ab1f703c869b87feb6f8c16855cc78ce36`
`@ -1 +1,2 @@`
	`DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a`	`DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a`
		`DIST pecl-memcached-3.0.0_alpha1_pre20161206.tar.gz 82102 SHA256 c9f158b8cb978495c89b615eb06098b24be0c501e757522dcc5357aeda6cb326 SHA512 c72c58223c8e780496f2fdfc727661efd5b5f3ae2a6bd2efa582591a9a8fae092ae5b89cac08e285bbe5175cb21f03168a605ad8bfefe9d290e97c613d2ba242 WHIRLPOOL cf3c8240982b26248079ceae96f56c906d9b741ec1b76d03ad4bad04a0598beea884dd0f89dbf9c12ffa487fc97062741a3ab69157440415e42367f02a2d7daa`
		`@ -0,0 +1 @@`
							`DIST git-spindle-3.3.tar.gz 1854895 SHA256 4bfad8e716e16e267c1297bb66b563a5eb4a3f90d618338442529a9c773bd4d1 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8 WHIRLPOOL dc3286136e08a9a75764183f780834d9dfe7bfd7c49d7e97084405399c7e02bcb3402b71672b5dc3b439b6f64fe8732c8e459a4884bbe1aabaa2ae99c5c98166`
`@ -1,2 +1,2 @@`
	`DIST attica-5.26.0.tar.xz 60212 SHA256 8cc602d96a7e650771630e72a7102efdc9c3fb99004ed23f2de2daf9370ae7fc SHA512 54d0fddc8c5f33a906b24feb5006e389778869c15c248ff4170dc4934557c3a6671a3e8434a96cbd897404cea49aa71c65557e15ae7a73ed9df78f5741927f51 WHIRLPOOL 7c6823e1a6682aa2f484583b6dce8a2e8783bfa3a8b7a7ec361d503337e2fd7307f0e969318fac5197fac4ca1c4bd0c0ebcd418f53bb1f82386ac10a057cfd69`	`DIST attica-5.26.0.tar.xz 60212 SHA256 8cc602d96a7e650771630e72a7102efdc9c3fb99004ed23f2de2daf9370ae7fc SHA512 54d0fddc8c5f33a906b24feb5006e389778869c15c248ff4170dc4934557c3a6671a3e8434a96cbd897404cea49aa71c65557e15ae7a73ed9df78f5741927f51 WHIRLPOOL 7c6823e1a6682aa2f484583b6dce8a2e8783bfa3a8b7a7ec361d503337e2fd7307f0e969318fac5197fac4ca1c4bd0c0ebcd418f53bb1f82386ac10a057cfd69`
	`DIST attica-5.28.0.tar.xz 60172 SHA256 7a527c59a8137c7d759bcbbdad3e8dd5b4c94869f26e9d282a354cae50dc6693 SHA512 a5a1eaa470a90d27364710b14f0d88789b8a35e0eb91ff588821299894f01b19be2eb0002ddfca665eaa3edefab38271bb8e07f44d5d25b79efe6e0798e081c7 WHIRLPOOL 4cc7f070577b55cba6bfb64093a91b52bd20838ce812e87460fcdab60ca74c753e473022bde44975a4094caf8994d77a93a3fd5c7484b03673b61bc653ff92fb`	`DIST attica-5.29.0.tar.xz 60196 SHA256 a195e8ef4ae8dfb586c3c0a012797f5d4c358bdf3dde9c4eee10f07330c62af6 SHA512 14263ef7d6fda74b53bef615674c210737cc943b5d9024ed6fcd66bb4ec4fe7ef4fd91ab7ac7ca174b067cb16fe553a47eba5c83b91216ca6669e0a94112b49c WHIRLPOOL 9a06f701dc079e2c70458c1e505fa9b7ba9569abf769233e766375efcec96d2d033c2f2bfa59d144da51277bf27c9f36883979c9784237512ed0b67f4b47dce0`
`@ -1,2 +1,2 @@`
	`DIST bluez-qt-5.26.0.tar.xz 73512 SHA256 67205efeac8579a2ff0f8de7fdb61a8510e8ca8f6bc2e147d8846fd3b52c4358 SHA512 3823fab44a3a07cbad01186a45d66b6e5f7b2f907112b04040701e9ea5b009981b0bd58ab03afb97afd67acd8760cdc31c74c3595bd8590693ae2d622c00871d WHIRLPOOL 80ec7e0e228185d503e0861ed0af7830cc297dec9625cdb5a20a8c7d220e7bdd6a1d524d36a0fb2da2c7ba0bdb2d7c34c60ab00d6954a938955430d66d36bbf2`	`DIST bluez-qt-5.26.0.tar.xz 73512 SHA256 67205efeac8579a2ff0f8de7fdb61a8510e8ca8f6bc2e147d8846fd3b52c4358 SHA512 3823fab44a3a07cbad01186a45d66b6e5f7b2f907112b04040701e9ea5b009981b0bd58ab03afb97afd67acd8760cdc31c74c3595bd8590693ae2d622c00871d WHIRLPOOL 80ec7e0e228185d503e0861ed0af7830cc297dec9625cdb5a20a8c7d220e7bdd6a1d524d36a0fb2da2c7ba0bdb2d7c34c60ab00d6954a938955430d66d36bbf2`
	`DIST bluez-qt-5.28.0.tar.xz 73776 SHA256 296245b290aa01b0cde88e702fed6138daf6ca1099b8411225aeb0b977e6dfe5 SHA512 5442ec24d0ceb471ea07e9c987800ccf140fc3e50225b97704b74c09065e4ae3c8ff531bd840c135c70526b2dcc2ac073fd0e3a8e2c65803e23a21dcfab87834 WHIRLPOOL 954585db01d959a26792ad3fa1c167a82ab48a606ebf15e98139fd103ea2d9a4b33f719bdbea5ad14766469eb4e9a55bfd063c094c105d08d1b2efb22764eb54`	`DIST bluez-qt-5.29.0.tar.xz 73792 SHA256 6f8fc96f2b0961d2516b94fc90728674e97d93e9e78db9e13538f76a37823697 SHA512 3e08ee36f5c86ce8be069f88803a8b38a8447b7c30e877a1857d23ee49712f664ef855f51d70b4b0ab8578e731f63666eae2a5ddb1d3ba964f6fd32f2fedfaae WHIRLPOOL 1e0509d8d86b629a9921c59655352ec971e05d6909d7e5d684bd816b197499c4b23291577bb63d9eadd91f85fa40aebb2eeb40b46510dd2902072d4f9d544f5d`
`@ -1 +1 @@`
	`DIST breeze-icons-5.28.0.tar.xz 1454088 SHA256 02fa95a016cf8ae72a8ea7003fa480194d1d347245f7a7bb61ea94009e78fc1b SHA512 521a45eed2d1010d770e7c8b793c294764f12bb90000f165bd6271ded7892d0fdc392571f9b607c36d9e6b61705b7874f2f12ef554f85bbf67b3208a366fc2f2 WHIRLPOOL cdd43333b34d586c1915278e234292675b2d970429229741c82d4f0623d4b6109d3d54905d26a4f82fa3a38d03993a7a62364e7fafe031c81586e81d1d360cdf`	`DIST breeze-icons-5.29.0.tar.xz 1467464 SHA256 0bad6cad78f948fd73fc89ae2566b59b6859a752e95eb348ce735408d4bffbae SHA512 8da8bb7df7e18a7216465a1d79f0da1930834b49e008f777157177ea1b8de0f8b1a12346067d919dd75fbc6023f5b6587f5eabda4dbae2e6f56cdb6079c86ac3 WHIRLPOOL ed0f50285a6d9f90635be396a46b1a803bb3324c1b026376c6f2cb5a46b9513843f4a20f24cce48f61c4da0d6edcf37271bf240c42dee5f657b9c1d64cf248c0`
`@ -1,2 +1,2 @@`
	`DIST breeze-icons-5.26.0.tar.xz 1370236 SHA256 a9c0d742a37ef3b3b2dae5a5bb97aee2927dd613c17c606f3bcbc6845a8c6bcd SHA512 3edfd8f56548e61e6bebf21f711797bedeae91c0a8a3f1e4cade79d1d53cf7e9f5fa8cc154d62d3a33b6765c35ac1df252f45de0e00567624710b6149d0fe497 WHIRLPOOL 50a9860fd6ed5f97e7c2f239df954e372d441ed671b522e02570f0fa15506df59b16d0475ebffbb6357a79cf2a8a1658a2e5ea9cea7f3d4bd9dac03c646be049`	`DIST breeze-icons-5.26.0.tar.xz 1370236 SHA256 a9c0d742a37ef3b3b2dae5a5bb97aee2927dd613c17c606f3bcbc6845a8c6bcd SHA512 3edfd8f56548e61e6bebf21f711797bedeae91c0a8a3f1e4cade79d1d53cf7e9f5fa8cc154d62d3a33b6765c35ac1df252f45de0e00567624710b6149d0fe497 WHIRLPOOL 50a9860fd6ed5f97e7c2f239df954e372d441ed671b522e02570f0fa15506df59b16d0475ebffbb6357a79cf2a8a1658a2e5ea9cea7f3d4bd9dac03c646be049`
	`DIST breeze-icons-5.28.0.tar.xz 1454088 SHA256 02fa95a016cf8ae72a8ea7003fa480194d1d347245f7a7bb61ea94009e78fc1b SHA512 521a45eed2d1010d770e7c8b793c294764f12bb90000f165bd6271ded7892d0fdc392571f9b607c36d9e6b61705b7874f2f12ef554f85bbf67b3208a366fc2f2 WHIRLPOOL cdd43333b34d586c1915278e234292675b2d970429229741c82d4f0623d4b6109d3d54905d26a4f82fa3a38d03993a7a62364e7fafe031c81586e81d1d360cdf`	`DIST breeze-icons-5.29.0.tar.xz 1467464 SHA256 0bad6cad78f948fd73fc89ae2566b59b6859a752e95eb348ce735408d4bffbae SHA512 8da8bb7df7e18a7216465a1d79f0da1930834b49e008f777157177ea1b8de0f8b1a12346067d919dd75fbc6023f5b6587f5eabda4dbae2e6f56cdb6079c86ac3 WHIRLPOOL ed0f50285a6d9f90635be396a46b1a803bb3324c1b026376c6f2cb5a46b9513843f4a20f24cce48f61c4da0d6edcf37271bf240c42dee5f657b9c1d64cf248c0`