Merge remote-tracking branch 'remotes/jasom/add-mongrel2'

This passes minimum requirements. Users jasom and Coacher will further work and improve the ebuild shortly Pull request: https://github.com/gentoo/gentoo/pull/737
2026-09-24 17:09:10 -07:00 · 2016-01-29 16:46:59 +08:00
parent 57ac6ef6b5 0527ba7e6e
commit d905a1d4ec
208 changed files with 6556 additions and 2558 deletions
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${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 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -5,3 +5,4 @@ DIST keybase-0.8.23.tar.gz 7101472 SHA256 20e7e7e7a125ddb3b0e7023c3dcaf12f12c7b1
 DIST keybase-0.8.24.tar.gz 7109062 SHA256 680eaadbae16724912c4bbbd916b20a116fb5d290e4f8e91d2c7093261a26856 SHA512 65b2a4a21f814617363615153bc034c94854297d0b53cd538cc90320fc48ae8e6c9c13e3c06ae729a4fbe035b6cbbb5020d6a0618aed2c94b0ee858f8b919cd2 WHIRLPOOL 889b90879b1f18650c13c048bf888aca85c4ca162d85cd60ba527eccfe3d8da9b9a313f7d6c6cd757feb949f200dbb2021daa2b45af70ad99403826241f0773a
 DIST keybase-0.8.25.tar.gz 7109238 SHA256 e34b128f48e27a1c3066b5f3f19d99df735f9be4f1c867d1d3d408c8e12983fd SHA512 b6986063c34a18bd91148e588d43545f8baf7849cf80ea03b88d26e1f3dd6684cc9e5ebd5e10ff5ac0639fa308c2e07f577b6a7ded6f5bf4bd4510e64bb31025 WHIRLPOOL 1413eed7f26ec6b2d17f63d6315baac48d6a7f0935c3608e4ffcd5cd8df7f13db01e8d93ce76b33b4e0ceb322f508a3601e37be6cad86c20e976bb33012f28db
 DIST keybase-1.0.8.0.tar.gz 42949716 SHA256 b43fc29e9ec6d06fb7371a597ad7a2f28ee8e125ae8b9c9c34d1c4d176b6a76d SHA512 a4030d00415961d2c7d5d65ca682a11f6cd82b0d64bcbf9de6e4ce8f969faea05f3fc8a0084def9bd39528a75dfd80dcb6bbdae16e73d71b1c9dc6a7ece58771 WHIRLPOOL f8a59464759875e195068fe7422962ad570794442c408e99a55c4f4724108a086727c67fe753e698f3d653f1101278d1be657ca2889d7aaa878489f232574745
+DIST keybase-1.0.9.0.tar.gz 43337746 SHA256 01999048454877bc3b6a2934a8c1bfda4ebef31400698627a23b94450d5b2409 SHA512 7b6e0defe378fd3fa7d4577f95484947c6898079541448cb0f8c180fe5efdc43da42bd6b67c350c38701a01e62802041c5840315be877ace88e8d1f26d667c7f WHIRLPOOL f63c07b79eb9a96673cd5b909ce1c1877a4d5ff45a2275a8dfc9a6262c8a6f2784b05301023f9fce6b98044d4703721513751aec31bc4fa99dafc27e0deca04a
--- a/app-crypt/keybase/keybase-1.0.9.0.ebuild
+++ b/app-crypt/keybase/keybase-1.0.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.5:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GO15VENDOREXPERIMENT=1 \
+		GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+}
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,2 +1 @@
-DIST hdapsd-20090401.tar.gz 95058 SHA256 32979d58de4c54a7cc5671e7e7b4f0b653b659104faa9610433f8bb5dd4cef7a SHA512 4984a6c636d3447051ca5629fec89f08eee3773750f9623b80d7c0d4af65dcf9868392f2e93f5d13ac329d311ec2ebcdddf3e438007d1f851a920137c6903c96 WHIRLPOOL 9c3822acb39ff1f10e47604725bf6e42546b95ba9db26ebd751b69c4162e3df4f33d177a2a0b7a764c5e0f2478f470595cda304221a0ec165b07ef183b6ea9be
 DIST hdapsd-20141203.tar.gz 128818 SHA256 6650db6b2251b9774bdfba34dd58f712de4c761e6c78eb61ea3b82b694cbef5e SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178 WHIRLPOOL befbcbbdcfc5ae9a844f0a96703a7c9a7d43bf4c5d6d9735412efc136d9e20aff6a4dc3e5755cfa9837122b4f7890b00be53a21237838b078271ba7c9650589c
--- a/app-laptop/hdapsd/files/hdapsd.conf.3
+++ b/app-laptop/hdapsd/files/hdapsd.conf.3
@@ -1,12 +0,0 @@
-# The list of the disk devices that hdapsd should monitor.
-# Usually this is 'hda', 'sda' or 'hda sda'.
-# hdaps will auto-devices if empty
-#DISKLIST="sda"
-
-# hdapsd sensitivity 
-# The lower the threshold is the earlier 
-# the heads are parked when the laptop is shaked
-THRESHOLD="10"
-
-# Set any extra options here, like -a for Adaptive mode
-OPTIONS="-a"
--- a/app-laptop/hdapsd/files/hdapsd.init.3
+++ b/app-laptop/hdapsd/files/hdapsd.init.3
@@ -1,69 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-depend() {
-    need localmount
-}
-
-checkconfig() {
-    if [ -n "${DISK}" ]; then
-	ewarn "Please migrate DISK to DISKLIST in /etc/conf.d/hdapsd."
-	DISKLIST=${DISK}
-    fi
-
-    if [ -z "${THRESHOLD}" ] ; then
-	eerror "You should setup THRESHOLD in /etc/conf.d/hdapsd."
-	return 1
-    fi
-
-    #empty DISKLIST is allowed as well
-    for DISK in ${DISKLIST}; do
-        if [ ! -b /dev/${DISK} ]; then
-            eerror "Could not find disk /dev/${DISK}!"
-            eerror "Adjust the DISK setting in /etc/conf.d/hdapsd"
-            return 1
-        fi
-
-        if [ ! -e /sys/block/${DISK}/queue/protect ] && [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
-            eerror "No protect entry for ${DISK}!"
-            eerror "Make sure your kernel is patched with the blk_freeze patch"
-            return 1
-        fi
-    done
-
-    # Load the tp_smapi module first
-    # This is not a requirement, but it helps hdapsd adaptive mode
-    if [ ! -e /sys/devices/platform/smapi ] ; then
-	modprobe tp_smapi 2>/dev/null
-    fi
-	
-    if [ ! -d /sys/devices/platform/hdaps ] ; then
-	ebegin "Loading hdaps module"
-        modprobe hdaps
-	eend $? || return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    local DISKOPTS DISK
-    for DISK in ${DISKLIST}; do
-	DISKOPTS="${DISKOPTS} -d ${DISK}"
-    done
-
-    ebegin "Starting Hard Drive Active Protection System daemon"
-    start-stop-daemon --start --exec /usr/sbin/hdapsd \
-	--pidfile /var/run/hdapsd.pid \
-	-- --syslog --background --pidfile \
-	${DISKOPTS} --sensitivity "${THRESHOLD}" ${OPTIONS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping Hard Drive Active Protection System daemon"
-    start-stop-daemon --stop --exec /usr/sbin/hdapsd \
-	--pidfile /var/run/hdapsd.pid
-    eend $?
-}
--- a/app-laptop/hdapsd/hdapsd-20090401-r2.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20090401-r2.ebuild
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit linux-info readme.gentoo
-
-DESCRIPTION="IBM ThinkPad Harddrive Active Protection disk head parking daemon"
-HOMEPAGE="http://hdaps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hdaps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-pkg_setup() {
-	# We require the hdaps module which can either come from kernel sources
-	# or from the tp_smapi package.
-	if ! has_version app-laptop/tp_smapi[hdaps]; then
-		CONFIG_CHECK="~SENSORS_HDAPS"
-		ERROR_SENSORS_HDAPS="${P} requires app-laptop/tp_smapi (with hdaps USE enabled) or support for CONFIG_SENSORS_HDAPS enabled"
-		linux-info_pkg_setup
-	fi
-
-	DOC_CONTENTS="You can change the default frequency by modifing /sys/devices/platform/hdaps/sampling_rate.
-		You might need to enable shock protection manually by running:\n
-		# echo -1 > /sys/block/DEVICE/device/unload_heads"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	rm -rf "${ED}"/usr/share/doc/hdapsd
-	dodoc ChangeLog README AUTHORS
-	newconfd "${FILESDIR}"/hdapsd.conf.3 hdapsd
-	newinitd "${FILESDIR}"/hdapsd.init.3 hdapsd
-	readme.gentoo_create_doc
-}
-
-pkg_postinst(){
-	[[ -z $(ls ${EROOT}/sys/block/*/queue/protect 2>/dev/null) ]] && \
-	[[ -z $(ls ${EROOT}/sys/block/*/device/unload_heads 2>/dev/null) ]] && \
-		ewarn "Your kernel does NOT support shock protection. Kernel 2.6.28 and above is recommended!"
-
-	if ! has_version app-laptop/tp_smapi[hdaps]; then
-		ewarn "Using the hdaps module provided by app-laptop/tp_smapi instead"
-		ewarn "of the in-kernel driver is strongly recommended!"
-	fi
-
-	readme.gentoo_print_elog
-}
--- a/app-text/zathura/files/zathura-9999-synctex.patch
+++ b/app-text/zathura/files/zathura-9999-synctex.patch
@@ -1,51 +0,0 @@
-From f0a86c6ef7c43eec07b0ddc7c002dba506ca1e26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz>
-Date: Sat, 9 Jan 2016 09:48:53 +0100
-Subject: [PATCH] Use synctex_editor only if WITH_SYNCTEX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without installed synctex, the build fails like:
-
-zathura/main.c: In function ‘main’:
-zathura/main.c:254:26: error: ‘synctex_editor’ undeclared (first use in this function)
-       plugin_path, argv, synctex_editor, embed);
-                          ^
-zathura/main.c:254:26: note: each undeclared identifier is reported only once for each function it appears in
-Makefile:103: recipe for target 'build/release/zathura/main.o' failed
-
-This patch fixes it.
-
-<https://bugs.gentoo.org/show_bug.cgi?id=571346>
---
- zathura/main.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/zathura/main.c b/zathura/main.c
-index 060382a..9c0d0d3 100644
--- a/zathura/main.c
-+++ b/zathura/main.c
-@@ -250,11 +250,16 @@ main(int argc, char* argv[])
- 
-   /* Create zathura session */
-   zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir,
-#ifdef GDK_WINDOWING_X11
-      plugin_path, argv, synctex_editor, embed);
-+      plugin_path, argv,
-+#ifdef WITH_SYNCTEX
-+      synctex_editor
- #else
-      plugin_path, argv, synctex_editor);
-+      NULL
-+#endif
-+#ifdef GDK_WINDOWING_X11
-+      , embed
- #endif
-+  );
-   if (zathura == NULL) {
-     girara_error("Could not initialize zathura.");
-     return -1;
-- 
-2.4.10
-
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -52,10 +52,6 @@ pkg_setup() {
 	)
 }

-src_prepare() {
-	epatch "${FILESDIR}"/${P}-synctex.patch
-}
-
 src_compile() {
 	emake "${myzathuraconf[@]}"
 }
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -16,4 +16,11 @@
 	<upstream>
 		<remote-id type="sourceforge">firebird</remote-id>
 	</upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bear1650@mail.ru></email>
+	</maintainer>
 </pkgmetadata>
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1 +1,2 @@
 DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
+DIST gettext-0.19.7.tar.gz 19235781 SHA256 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d WHIRLPOOL eb51c4be7c0a92c5c33c16329003e21947e0b9d1583c4a785ae6836f81273ea7ec2823a0a28ae81c3b977f2148c0f3bd524949484383ff87510e1d2bc642a786
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI="5"
+
+MY_P="gettext-${PV}"
+
+inherit multilib-minimal toolchain-funcs libtool
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="${DEPEND}
+	!sys-libs/glibc
+	!<sys-devel/gettext-0.19.6-r1"
+
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+src_prepare() {
+	# The libtool files are stored higher up, so make sure we run in the
+	# whole tree and not just the subdir we build.
+	elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# Emacs support is now in a separate package.
+		--without-emacs
+		--without-lispdir
+		# Normally this controls nls behavior in general, but the libintl
+		# subdir is skipped unless this is explicitly set.  ugh.
+		--enable-nls
+		# This magic flag enables libintl.
+		--with-included-gettext
+		# The gettext package provides this library.
+		--disable-c++
+		--disable-libasprintf
+		# No java until someone cares.
+		--disable-java
+
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# We only need things in the intl/ subdir.
+	emake -C intl
+}
+
+multilib_src_install() {
+	# We only need things in the intl/ subdir.
+	emake DESTDIR="${D}" install -C intl
+
+	gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files --all
+
+	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,3 +1,3 @@
-DIST libressl-2.2.4.tar.gz 2966157 SHA256 6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5 WHIRLPOOL 44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43
 DIST libressl-2.2.5.tar.gz 2966527 SHA256 e3caded0469d8dc64f4ca2fe8e499ada4dd014e84d1c5a71818d39e54e6c914b SHA512 501d04cb966260854082d374e60aabde21bcd65a331ff7c76044f2053b22ddab4914710b223b400a3a181873c6af5e2e7da5f04bdd9028fddbf420e259a2863a WHIRLPOOL 47f7d35ceff5004af0c2f79509678c4826eabe05225dbcf5cbe1f9cb358d1657ff288a702e14bfd578fd03e38256d2aa2c79ec724a05c98aa91317e6a9a5f9d4
-DIST libressl-2.3.1.tar.gz 3014881 SHA256 410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e SHA512 ac70d2f09035d63765bb980422c6c6b55ef07f6af4a93fce54748ff3621cf08ef87acfd438797d562dc21ab9b4862992876792deef9310aafdb927e20e27d453 WHIRLPOOL 52f46016cf07e598b7117de1cc90617982de0ad020b55c4a2b402de317d8b52f8a381c9ebdff787421dccd3e47294305863ceb9f2c1c2a9080818fec16e7e177
+DIST libressl-2.2.6.tar.gz 2965531 SHA256 1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f SHA512 41e29431ad9e8b18e2dbc30fe9df1d7be3ca372d5d7757b5b01f8904515bafd5333446957fbc9874f64f384dae56cf6bf29d6808a7c0df1836b55ea64804a4bf WHIRLPOOL 49b6efa211ea4789e51388d3ebfec941dfedad427b806b33d439a7639e09d16e5c9004edc4a4c8e3de63040ebc2fe0a3a3819c68ed674e3bb36bb52b49e75ce5
+DIST libressl-2.3.2.tar.gz 3063638 SHA256 80f45fae4859f161b1980cad846d4217417d0c89006ad29c0ea8c88da564a96a SHA512 619acf3e9c670cc5f32aa9e0064e8b72297bfc05c68743c5cb9f7b7332207d05fc43f44ea9652db9b651b301e8ce5dd90777a20a4a25e8145d1f7fa977d782c1 WHIRLPOOL 41a1fb795c05202d03d40d6b7e30831684d659eb970620d410c63d5158320eadec707721b30e29afa6c0c72dbe90d17234f82f34873646f98f83e63baeae093c
--- a/dev-libs/libressl/files/libressl-2.2.4-clientcert.patch
+++ b/dev-libs/libressl/files/libressl-2.2.4-clientcert.patch
@@ -1,35 +0,0 @@
-untrusted comment: signature from openbsd 5.8 base secret key
-RWQNNZXtC/MqP8u13/pPZfTpPeHhU93PG0DBihXvQ7lB0CvONLwoTfHr9f40s515bidPGcGLAH4xu+yz3skT6b3tKETEWZw8BgA=
-
-OpenBSD 5.8 errata 9, Dec 3, 2015:
-
-CVE-2015-3194 - NULL pointer dereference in client certificate validation
-
-Apply by doing:
-    signify -Vep /etc/signify/openbsd-58-base.pub -x 009_clientcert.patch.sig \
-        -m - | (cd /usr/src && patch -p0)
-
-And then rebuild and install libcrypto:
-    cd /usr/src/lib/libcrypto
-    make obj
-    make depend
-    make
-    make install
-
-Index: lib/libssl/src/crypto/rsa/rsa_ameth.c
-===================================================================
-RCS file: /cvs/src/lib/libssl/src/crypto/rsa/rsa_ameth.c,v
-retrieving revision 1.14
-retrieving revision 1.14.6.1
-diff -u -p -u -p -r1.14 -r1.14.6.1
--- lib/libssl/src/crypto/rsa/rsa_ameth.c	11 Feb 2015 04:05:14 -0000	1.14
-+++ lib/libssl/src/crypto/rsa/rsa_ameth.c	4 Dec 2015 04:13:43 -0000	1.14.6.1
-@@ -298,7 +298,7 @@ rsa_pss_decode(const X509_ALGOR *alg, X5
- 	if (pss->maskGenAlgorithm) {
- 		ASN1_TYPE *param = pss->maskGenAlgorithm->parameter;
- 		if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1 &&
-		    param->type == V_ASN1_SEQUENCE) {
-+		    param && param->type == V_ASN1_SEQUENCE) {
- 			p = param->value.sequence->data;
- 			plen = param->value.sequence->length;
- 			*pmaskHash = d2i_X509_ALGOR(NULL, &p, plen);
--- a/dev-libs/libressl/libressl-2.2.4-r1.ebuild
+++ b/dev-libs/libressl/libressl-2.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -21,9 +21,6 @@ PDEPEND="app-misc/ca-certificates"

 src_prepare() {
 	touch crypto/Makefile.in
-
-	epatch "${FILESDIR}"/${P}-clientcert.patch
-
 	sed -i \
 		-e '/^[ \t]*CFLAGS=/s#-g ##' \
 		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
--- a/dev-libs/libressl/libressl-2.3.2-r1.ebuild
+++ b/dev-libs/libressl/libressl-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libressl.org/"
 SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"

 LICENSE="ISC openssl"
-SLOT="0/36" # reflects ABI of libcrypto.so and libssl.so
+SLOT="0/37" # reflects ABI of libcrypto.so and libssl.so
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="+asm static-libs"

@@ -22,8 +22,6 @@ PDEPEND="app-misc/ca-certificates"
 src_prepare() {
 	touch crypto/Makefile.in

-	epatch "${FILESDIR}"/${PN}-2.2.4-clientcert.patch
-
 	sed -i \
 		-e '/^[ \t]*CFLAGS=/s#-g ##' \
 		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,9 +1,7 @@
 DIST openssl-0.9.8zg.tar.gz 3826891 SHA256 06500060639930e471050474f537fcd28ec934af92ee282d78b52460fbe8f580 SHA512 c757454de321d168ac6d89fe2859966a9f07a8b28305bf697af9018db13fc457e0883346b3d35977461ab058442375563554ecb2a8756a687ff9fc2fdd9103c9 WHIRLPOOL 55ecf50a264a2ddd9b5755b5d90b9b736d2f27e0ba2fd529ccff3b68bbd726d1f60460182a0d215ae6712dbc4d3ef2df11339fb2d8424e049f54c3e904fcfab0
 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
 DIST openssl-1.0.1p.tar.gz 4560208 SHA256 bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 SHA512 64e475c53a85b78de7c5aa71a22d4bb3a456142842373ebf8f22e9857cb0352b646e591b21af866933baecdbdb5ac4a22aeb64914440c53a0f30cd25914029e5 WHIRLPOOL 2a81f3b9274e3fef37a2a88e3084d8283159b3a61db08e7805879905c87a74faa85bc6e570d18525741bd5c27c34fe09eeb58b2bfe500545d0f304716e14f819
-DIST openssl-1.0.2a.tar.gz 5262089 SHA256 15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a SHA512 02d228578824add52b73433d64697706e6503c2334933fe8dd6b477f59c430977012c3c34da207096229a425e1dcb6f3ae806043894b5ac98c27bbcddb794dd4 WHIRLPOOL a590c71794f5d29b80afa28b18621b7535e96b714b3690d793c1422a90b09a89cbcb912841d400c5982a8197bb02c13051190e96ba0e4d530509b48b43067cd7
-DIST openssl-1.0.2b.tar.gz 5281009 SHA256 d5d488cc9f0a07974195a7427094ea3cab9800a4e90178b989aa621fbc238e3f SHA512 563eb662113668bb9ccf17a6e36697ad6392321ac1a32aa2cada9d8f4047651c2fa4da61f508ee3e1834fea343dbba189e09c1d6cabe5d1de5e3e6d022c31f4f WHIRLPOOL d828dc76842d25f02f211031b3ab9a2a8fd44975e9aaf87d0fd5fca9935a27b61c3e4f896a2186194f1a7b4d668fc48cafc5be9f7c670017ba342ce40113935f
-DIST openssl-1.0.2c.tar.gz 5280670 SHA256 0038ba37f35a6367c58f17a7a7f687953ef8ce4f9684bbdec63e62515ed36a83 SHA512 2a68e8b017d0d3e34e4f9d33b77abd960b3d04e418f106e852684a2ff247dc8ea390b7d6a42d130fd84d821a15e84e77b68b3677433433ef5c10d156333b9dae WHIRLPOOL c59878c3bd5e8904913b97d71a15ef1eaafcfb4eb58c691ba4fb38bf81752308d0ef4a902e53aec4c6e7585677f2404d29cdea0832d14206fabf28d744af2622
-DIST openssl-1.0.2d.tar.gz 5295447 SHA256 671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8 SHA512 68a051e92aaed0e7a8b218c185427c534c32f30f50c45f5d2c1f5b7a26d1416e83863d2953c77486acde3b636a148f39faf48246d28a207607ec069f62b13d75 WHIRLPOOL e3d8f0784903c8d6aa05ada7b8b410517c99157a3c2f4ac34c8a9d80c77408bd6ff9e820ded47f6223ccac4a77413174aa625303166ec28fdbf8374a7d4659ec
+DIST openssl-1.0.1r.tar.gz 4547786 SHA256 784bd8d355ed01ce98b812f873f8b2313da61df7c7b5677fcf2e57b0863a3346 SHA512 7a5a2efe5d9421ea6f4f86f75ed40b4459b3825355ad18da3bdba28393bc50a6f457b2e1f11a31828f1af0d62a716d258ac7868fb719c9997f3bc750a1723e86 WHIRLPOOL de9c92f5ddb9bcaac967ac735696e739f5762b7d3a0b2430dbfa0c6cd7ac021fdf3c3257255a2fe995f24aa3550d59ce3067f030f09acc5d43b61dfda627686a
 DIST openssl-1.0.2e.tar.gz 5256555 SHA256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f WHIRLPOOL 8e1c1800a66f57fa78dc391e717e4b2bdf0e6e37a837c5ac033d7a4b1a6437451c7e7540c4ec2f75f936a2d2ef4f9293b42c76f51b0c9c93706639589612f196
+DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9
 DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
--- a/dev-libs/openssl/files/openssl-1.0.1r-x32.patch
+++ b/dev-libs/openssl/files/openssl-1.0.1r-x32.patch
@@ -0,0 +1,66 @@
+--- openssl-1.0.1r/Configure
+++ openssl-1.0.1r/Configure
+@@ -368,6 +368,7 @@
+ "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ "linux-x86_64-clang","clang: -m64 -DL_ENDIAN -O3 -Wall -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-x32",   "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux64-s390x",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+ #### So called "highgprs" target for z/Architecture CPUs
+ # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
+--- openssl-1.0.1r/crypto/bn/asm/x86_64-gcc.c
+++ openssl-1.0.1r/crypto/bn/asm/x86_64-gcc.c
+@@ -55,7 +55,7 @@
+  *    machine.
+  */
+ 
+-# ifdef _WIN64
+# ifdef _WIN64 || !defined __LP64__
+ #  define BN_ULONG unsigned long long
+ # else
+ #  define BN_ULONG unsigned long
+@@ -211,9 +211,9 @@
+ 
+     asm volatile ("       subq    %2,%2           \n"
+                   ".p2align 4                     \n"
+-                  "1:     movq    (%4,%2,8),%0    \n"
+-                  "       adcq    (%5,%2,8),%0    \n"
+-                  "       movq    %0,(%3,%2,8)    \n"
+                  "1:     movq    (%q4,%2,8),%0    \n"
+                  "       adcq    (%q5,%2,8),%0    \n"
+                  "       movq    %0,(%q3,%2,8)    \n"
+                   "       leaq    1(%2),%2        \n"
+                   "       loop    1b              \n"
+                   "       sbbq    %0,%0           \n":"=&a" (ret), "+c"(n),
+@@ -235,9 +235,9 @@
+ 
+     asm volatile ("       subq    %2,%2           \n"
+                   ".p2align 4                     \n"
+-                  "1:     movq    (%4,%2,8),%0    \n"
+-                  "       sbbq    (%5,%2,8),%0    \n"
+-                  "       movq    %0,(%3,%2,8)    \n"
+                  "1:     movq    (%q4,%2,8),%0    \n"
+                  "       sbbq    (%q5,%2,8),%0    \n"
+                  "       movq    %0,(%q3,%2,8)    \n"
+                   "       leaq    1(%2),%2        \n"
+                   "       loop    1b              \n"
+                   "       sbbq    %0,%0           \n":"=&a" (ret), "+c"(n),
+--- openssl-1.0.1r/crypto/bn/bn.h
+++ openssl-1.0.1r/crypto/bn/bn.h
+@@ -174,6 +174,16 @@
+ # endif
+ 
+ /*
+ * Address type.
+ */
+#ifdef _WIN64
+#define BN_ADDR unsigned long long
+#else
+#define BN_ADDR unsigned long
+#endif
+
+
+/*
+  * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
+  * 64 bits :-(, don't define BN_LLONG for the DEC Alpha
+  */
--- a/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/472584
-http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest
-
-fix verification handling in s_client.  when loading paths, make sure
-we properly fallback to setting the default paths.
-
--- openssl-1.0.2/apps/s_client.c
-+++ openssl-1.0.2/apps/s_client.c
-@@ -1337,7 +1337,7 @@
- 
-     SSL_CTX_set_verify(ctx, verify, verify_callback);
- 
-    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-+    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) &&
-         (!SSL_CTX_set_default_verify_paths(ctx))) {
-         /*
-          * BIO_printf(bio_err,"error setting default verify locations\n");
--- a/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch
@@ -1,38 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3758
-
-From 7b4152089fe39c3495508076ab81ed4aca3d65ba Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 21 Mar 2015 05:08:41 -0400
-Subject: [PATCH] fix malloc define typo
-
-Reported-by: Conrad Kostecki <ck+gentoobugzilla@bl4ckb0x.de>
-URL: https://bugs.gentoo.org/543828
---
- crypto/bio/bss_dgram.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
-index aef8149..ed275d1 100644
--- a/crypto/bio/bss_dgram.c
-+++ b/crypto/bio/bss_dgram.c
-@@ -1338,7 +1338,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
-                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
-             authchunks = OPENSSL_malloc(optlen);
-             if (!authchunks) {
-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
-+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
-                 return -1;
-             }
-             memset(authchunks, 0, optlen);
-@@ -1410,7 +1410,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
-         char *tmp;
-         data->saved_message.bio = b;
-         if(!(tmp = OPENSSL_malloc(inl))) {
-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
-+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
-             return -1;
-         }
-         if (data->saved_message.data)
-- 
-2.3.3
-
--- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch
@@ -1,314 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
-https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
-
--- openssl-1.0.2a/crypto/Makefile
-+++ openssl-1.0.2a/crypto/Makefile
-@@ -85,11 +85,11 @@
- 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
- 
- subdirs:
-	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
-	@target=files; $(RECURSIVE_MAKE)
-+	+@target=files; $(RECURSIVE_MAKE)
- 
- links:
- 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib:	$(LIB)
- 	@touch lib
-$(LIB):	$(LIBOBJ)
-+$(LIB):	$(LIBOBJ) | subdirs
- 	$(AR) $(LIB) $(LIBOBJ)
- 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
- 	$(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
- 	fi
- 
- libs:
-	@target=lib; $(RECURSIVE_MAKE)
-+	+@target=lib; $(RECURSIVE_MAKE)
- 
- install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
-	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- lint:
- 	@target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.2a/engines/Makefile
-+++ openssl-1.0.2a/engines/Makefile
-@@ -72,7 +72,7 @@
- 
- all:	lib subdirs
- 
-lib:	$(LIBOBJ)
-+lib:	$(LIBOBJ) | subdirs
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
- 		for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
- 
- subdirs:
- 	echo $(EDIRS)
-	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
-	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- tags:
- 	ctags $(SRC)
--- openssl-1.0.2a/Makefile.org
-+++ openssl-1.0.2a/Makefile.org
-@@ -274,17 +274,17 @@
- build_libs: build_crypto build_ssl build_engines
- 
- build_crypto:
-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
-+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl:
-+build_ssl: build_crypto
-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines:
-+build_engines: build_crypto
-	@dir=engines; target=all; $(BUILD_ONE_CMD)
-+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps:
-+build_apps: build_libs
-	@dir=apps; target=all; $(BUILD_ONE_CMD)
-+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests:
-+build_tests: build_libs
-	@dir=test; target=all; $(BUILD_ONE_CMD)
-+	+@dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools:
-+build_tools: build_libs
-	@dir=tools; target=all; $(BUILD_ONE_CMD)
-+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -555,7 +555,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- 	do \
- 		if [ -f "$$i" ]; then \
--- openssl-1.0.2a/Makefile.shared
-+++ openssl-1.0.2a/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
- 			done; \
- 		fi; \
- 		if [ -n "$$SHLIB_SOVER" ]; then \
-+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- 		fi; \
--- openssl-1.0.2a/test/Makefile
-+++ openssl-1.0.2a/test/Makefile
-@@ -133,7 +133,7 @@
- tags:
- 	ctags $(SRC)
- 
-tests:	exe apps $(TESTS)
-+tests:	exe $(TESTS)
- 
- apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
-@@ -402,121 +402,121 @@
- 		link_app.$${shlib_target}
- 
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-	@target=$(RSATEST); $(BUILD_CMD)
-+	+@target=$(RSATEST); $(BUILD_CMD)
- 
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-	@target=$(BNTEST); $(BUILD_CMD)
-+	+@target=$(BNTEST); $(BUILD_CMD)
- 
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-	@target=$(ECTEST); $(BUILD_CMD)
-+	+@target=$(ECTEST); $(BUILD_CMD)
- 
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-	@target=$(EXPTEST); $(BUILD_CMD)
-+	+@target=$(EXPTEST); $(BUILD_CMD)
- 
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-	@target=$(IDEATEST); $(BUILD_CMD)
-+	+@target=$(IDEATEST); $(BUILD_CMD)
- 
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-	@target=$(MD2TEST); $(BUILD_CMD)
-+	+@target=$(MD2TEST); $(BUILD_CMD)
- 
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-	@target=$(SHATEST); $(BUILD_CMD)
-+	+@target=$(SHATEST); $(BUILD_CMD)
- 
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-	@target=$(SHA1TEST); $(BUILD_CMD)
-+	+@target=$(SHA1TEST); $(BUILD_CMD)
- 
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-	@target=$(SHA256TEST); $(BUILD_CMD)
-+	+@target=$(SHA256TEST); $(BUILD_CMD)
- 
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-	@target=$(SHA512TEST); $(BUILD_CMD)
-+	+@target=$(SHA512TEST); $(BUILD_CMD)
- 
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-	@target=$(RMDTEST); $(BUILD_CMD)
-+	+@target=$(RMDTEST); $(BUILD_CMD)
- 
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-	@target=$(MDC2TEST); $(BUILD_CMD)
-+	+@target=$(MDC2TEST); $(BUILD_CMD)
- 
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-	@target=$(MD4TEST); $(BUILD_CMD)
-+	+@target=$(MD4TEST); $(BUILD_CMD)
- 
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-	@target=$(MD5TEST); $(BUILD_CMD)
-+	+@target=$(MD5TEST); $(BUILD_CMD)
- 
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-	@target=$(HMACTEST); $(BUILD_CMD)
-+	+@target=$(HMACTEST); $(BUILD_CMD)
- 
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-	@target=$(WPTEST); $(BUILD_CMD)
-+	+@target=$(WPTEST); $(BUILD_CMD)
- 
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-	@target=$(RC2TEST); $(BUILD_CMD)
-+	+@target=$(RC2TEST); $(BUILD_CMD)
- 
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-	@target=$(BFTEST); $(BUILD_CMD)
-+	+@target=$(BFTEST); $(BUILD_CMD)
- 
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-	@target=$(CASTTEST); $(BUILD_CMD)
-+	+@target=$(CASTTEST); $(BUILD_CMD)
- 
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-	@target=$(RC4TEST); $(BUILD_CMD)
-+	+@target=$(RC4TEST); $(BUILD_CMD)
- 
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-	@target=$(RC5TEST); $(BUILD_CMD)
-+	+@target=$(RC5TEST); $(BUILD_CMD)
- 
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-	@target=$(DESTEST); $(BUILD_CMD)
-+	+@target=$(DESTEST); $(BUILD_CMD)
- 
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-	@target=$(RANDTEST); $(BUILD_CMD)
-+	+@target=$(RANDTEST); $(BUILD_CMD)
- 
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-	@target=$(DHTEST); $(BUILD_CMD)
-+	+@target=$(DHTEST); $(BUILD_CMD)
- 
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-	@target=$(DSATEST); $(BUILD_CMD)
-+	+@target=$(DSATEST); $(BUILD_CMD)
- 
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-	@target=$(METHTEST); $(BUILD_CMD)
-+	+@target=$(METHTEST); $(BUILD_CMD)
- 
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
- 
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-	@target=$(ENGINETEST); $(BUILD_CMD)
-+	+@target=$(ENGINETEST); $(BUILD_CMD)
- 
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-	@target=$(EVPTEST); $(BUILD_CMD)
-+	+@target=$(EVPTEST); $(BUILD_CMD)
- 
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
-+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
- 
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-	@target=$(ECDSATEST); $(BUILD_CMD)
-+	+@target=$(ECDSATEST); $(BUILD_CMD)
- 
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-	@target=$(ECDHTEST); $(BUILD_CMD)
-+	+@target=$(ECDHTEST); $(BUILD_CMD)
- 
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-	@target=$(IGETEST); $(BUILD_CMD)
-+	+@target=$(IGETEST); $(BUILD_CMD)
- 
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-	@target=$(JPAKETEST); $(BUILD_CMD)
-+	+@target=$(JPAKETEST); $(BUILD_CMD)
- 
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-	@target=$(ASN1TEST); $(BUILD_CMD)
-+	+@target=$(ASN1TEST); $(BUILD_CMD)
- 
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-	@target=$(SRPTEST); $(BUILD_CMD)
-+	+@target=$(SRPTEST); $(BUILD_CMD)
- 
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
-	@target=$(V3NAMETEST); $(BUILD_CMD)
-+	+@target=$(V3NAMETEST); $(BUILD_CMD)
- 
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
- 
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
-+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
- 
- #$(AESTEST).o: $(AESTEST).c
- #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -529,7 +529,7 @@
- #	fi
- 
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-	@target=dummytest; $(BUILD_CMD)
-+	+@target=dummytest; $(BUILD_CMD)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
--- a/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch
@@ -1,309 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
-https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
-
--- openssl-1.0.2d/crypto/Makefile
-+++ openssl-1.0.2d/crypto/Makefile
-@@ -85,11 +85,11 @@
- 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
- 
- subdirs:
-	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
-	@target=files; $(RECURSIVE_MAKE)
-+	+@target=files; $(RECURSIVE_MAKE)
- 
- links:
- 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib:	$(LIB)
- 	@touch lib
-$(LIB):	$(LIBOBJ)
-+$(LIB):	$(LIBOBJ) | subdirs
- 	$(AR) $(LIB) $(LIBOBJ)
- 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
- 	$(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
- 	fi
- 
- libs:
-	@target=lib; $(RECURSIVE_MAKE)
-+	+@target=lib; $(RECURSIVE_MAKE)
- 
- install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
-	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- lint:
- 	@target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.2d/engines/Makefile
-+++ openssl-1.0.2d/engines/Makefile
-@@ -72,7 +72,7 @@
- 
- all:	lib subdirs
- 
-lib:	$(LIBOBJ)
-+lib:	$(LIBOBJ) | subdirs
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
- 		for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
- 
- subdirs:
- 	echo $(EDIRS)
-	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
-	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- tags:
- 	ctags $(SRC)
--- openssl-1.0.2d/Makefile.org
-+++ openssl-1.0.2d/Makefile.org
-@@ -274,17 +274,17 @@
- build_libs: build_crypto build_ssl build_engines
- 
- build_crypto:
-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
-+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
-	@dir=engines; target=all; $(BUILD_ONE_CMD)
-+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
-	@dir=apps; target=all; $(BUILD_ONE_CMD)
-+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
-	@dir=test; target=all; $(BUILD_ONE_CMD)
-+	+@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
-	@dir=tools; target=all; $(BUILD_ONE_CMD)
-+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -555,7 +555,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- 	do \
- 		if [ -f "$$i" ]; then \
--- openssl-1.0.2d/Makefile.shared
-+++ openssl-1.0.2d/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
- 			done; \
- 		fi; \
- 		if [ -n "$$SHLIB_SOVER" ]; then \
-+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- 		fi; \
--- openssl-1.0.2d/test/Makefile
-+++ openssl-1.0.2d/test/Makefile
-@@ -133,7 +133,7 @@
- tags:
- 	ctags $(SRC)
- 
-tests:	exe apps $(TESTS)
-+tests:	exe $(TESTS)
- 
- apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
-@@ -402,121 +402,121 @@
- 		link_app.$${shlib_target}
- 
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-	@target=$(RSATEST); $(BUILD_CMD)
-+	+@target=$(RSATEST); $(BUILD_CMD)
- 
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-	@target=$(BNTEST); $(BUILD_CMD)
-+	+@target=$(BNTEST); $(BUILD_CMD)
- 
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-	@target=$(ECTEST); $(BUILD_CMD)
-+	+@target=$(ECTEST); $(BUILD_CMD)
- 
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-	@target=$(EXPTEST); $(BUILD_CMD)
-+	+@target=$(EXPTEST); $(BUILD_CMD)
- 
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-	@target=$(IDEATEST); $(BUILD_CMD)
-+	+@target=$(IDEATEST); $(BUILD_CMD)
- 
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-	@target=$(MD2TEST); $(BUILD_CMD)
-+	+@target=$(MD2TEST); $(BUILD_CMD)
- 
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-	@target=$(SHATEST); $(BUILD_CMD)
-+	+@target=$(SHATEST); $(BUILD_CMD)
- 
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-	@target=$(SHA1TEST); $(BUILD_CMD)
-+	+@target=$(SHA1TEST); $(BUILD_CMD)
- 
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-	@target=$(SHA256TEST); $(BUILD_CMD)
-+	+@target=$(SHA256TEST); $(BUILD_CMD)
- 
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-	@target=$(SHA512TEST); $(BUILD_CMD)
-+	+@target=$(SHA512TEST); $(BUILD_CMD)
- 
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-	@target=$(RMDTEST); $(BUILD_CMD)
-+	+@target=$(RMDTEST); $(BUILD_CMD)
- 
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-	@target=$(MDC2TEST); $(BUILD_CMD)
-+	+@target=$(MDC2TEST); $(BUILD_CMD)
- 
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-	@target=$(MD4TEST); $(BUILD_CMD)
-+	+@target=$(MD4TEST); $(BUILD_CMD)
- 
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-	@target=$(MD5TEST); $(BUILD_CMD)
-+	+@target=$(MD5TEST); $(BUILD_CMD)
- 
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-	@target=$(HMACTEST); $(BUILD_CMD)
-+	+@target=$(HMACTEST); $(BUILD_CMD)
- 
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-	@target=$(WPTEST); $(BUILD_CMD)
-+	+@target=$(WPTEST); $(BUILD_CMD)
- 
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-	@target=$(RC2TEST); $(BUILD_CMD)
-+	+@target=$(RC2TEST); $(BUILD_CMD)
- 
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-	@target=$(BFTEST); $(BUILD_CMD)
-+	+@target=$(BFTEST); $(BUILD_CMD)
- 
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-	@target=$(CASTTEST); $(BUILD_CMD)
-+	+@target=$(CASTTEST); $(BUILD_CMD)
- 
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-	@target=$(RC4TEST); $(BUILD_CMD)
-+	+@target=$(RC4TEST); $(BUILD_CMD)
- 
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-	@target=$(RC5TEST); $(BUILD_CMD)
-+	+@target=$(RC5TEST); $(BUILD_CMD)
- 
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-	@target=$(DESTEST); $(BUILD_CMD)
-+	+@target=$(DESTEST); $(BUILD_CMD)
- 
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-	@target=$(RANDTEST); $(BUILD_CMD)
-+	+@target=$(RANDTEST); $(BUILD_CMD)
- 
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-	@target=$(DHTEST); $(BUILD_CMD)
-+	+@target=$(DHTEST); $(BUILD_CMD)
- 
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-	@target=$(DSATEST); $(BUILD_CMD)
-+	+@target=$(DSATEST); $(BUILD_CMD)
- 
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-	@target=$(METHTEST); $(BUILD_CMD)
-+	+@target=$(METHTEST); $(BUILD_CMD)
- 
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
- 
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-	@target=$(ENGINETEST); $(BUILD_CMD)
-+	+@target=$(ENGINETEST); $(BUILD_CMD)
- 
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-	@target=$(EVPTEST); $(BUILD_CMD)
-+	+@target=$(EVPTEST); $(BUILD_CMD)
- 
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
-	@target=$(EVPEXTRATEST); $(BUILD_CMD)
-+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
- 
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-	@target=$(ECDSATEST); $(BUILD_CMD)
-+	+@target=$(ECDSATEST); $(BUILD_CMD)
- 
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-	@target=$(ECDHTEST); $(BUILD_CMD)
-+	+@target=$(ECDHTEST); $(BUILD_CMD)
- 
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-	@target=$(IGETEST); $(BUILD_CMD)
-+	+@target=$(IGETEST); $(BUILD_CMD)
- 
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-	@target=$(JPAKETEST); $(BUILD_CMD)
-+	+@target=$(JPAKETEST); $(BUILD_CMD)
- 
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-	@target=$(ASN1TEST); $(BUILD_CMD)
-+	+@target=$(ASN1TEST); $(BUILD_CMD)
- 
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-	@target=$(SRPTEST); $(BUILD_CMD)
-+	+@target=$(SRPTEST); $(BUILD_CMD)
- 
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
-	@target=$(V3NAMETEST); $(BUILD_CMD)
-+	+@target=$(V3NAMETEST); $(BUILD_CMD)
- 
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
-	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
- 
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
-	@target=$(CONSTTIMETEST) $(BUILD_CMD)
-+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
- 
- #$(AESTEST).o: $(AESTEST).c
- #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -529,7 +529,7 @@
- #	fi
- 
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-	@target=dummytest; $(BUILD_CMD)
-+	+@target=dummytest; $(BUILD_CMD)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
--- a/dev-libs/openssl/openssl-1.0.1r.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1r.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI=5

 inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal

 REV="1.7"
-MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
 HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+SRC_URI="mirror://openssl/source/${P}.tar.gz
 	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"

 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"

 # The blocks are temporary just to make sure people upgrade to a
@@ -26,7 +25,7 @@ RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r3
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)
 	!<net-misc/openssh-5.9_p1-r4
@@ -34,12 +33,9 @@ RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	sys-apps/diffutils
 	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
 	test? ( sys-devel/bc )"
 PDEPEND="app-misc/ca-certificates"

-S="${WORKDIR}/${MY_P}"
-
 MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )
@@ -59,13 +55,12 @@ src_prepare() {
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
 		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-
+		epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1p-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1r-x32.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1m-ipv6.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086
+		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
 		epatch_user #332661
 	fi

@@ -100,7 +95,6 @@ src_prepare() {

 	append-flags -fno-strict-aliasing
 	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS

 	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
@@ -122,7 +116,7 @@ multilib_src_configure() {
 	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
 	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
 	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5

 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 	echoit() { echo "$@" ; "$@" ; }
@@ -154,13 +148,11 @@ multilib_src_configure() {
 		${ec_nistp_64_gcc_128} \
 		enable-idea \
 		enable-mdc2 \
-		enable-rc5 \
+		$(use_ssl !bindist rc5) \
 		enable-tlsext \
-		$(use_ssl asm) \
 		$(use_ssl gmp gmp -lgmp) \
 		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
 		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
 		--prefix="${EPREFIX}"/usr \
--- a/dev-libs/openssl/openssl-1.0.2a.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2a.ebuild
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-REV="1.7"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-# The blocks are temporary just to make sure people upgrade to a
-# version that lack runtime version checking.  We'll drop them in
-# the future.
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!<net-misc/openssh-5.9_p1-r4
-	!<net-libs/neon-0.29.6-r1"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? ( sys-devel/bc )"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	SSL_CNF_DIR="/etc/ssl"
-	sed \
-		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
-		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
-		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
-		> "${WORKDIR}"/c_rehash || die #416717
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2-s_client-verify.patch #472584
-		epatch "${FILESDIR}"/${P}-malloc-typo.patch #543828
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	dobin "${WORKDIR}"/c_rehash #333117
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
--- a/dev-libs/openssl/openssl-1.0.2b.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2b.ebuild
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-REV="1.7"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-# The blocks are temporary just to make sure people upgrade to a
-# version that lack runtime version checking.  We'll drop them in
-# the future.
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!<net-misc/openssh-5.9_p1-r4
-	!<net-libs/neon-0.29.6-r1"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? ( sys-devel/bc )"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	SSL_CNF_DIR="/etc/ssl"
-	sed \
-		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
-		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
-		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
-		> "${WORKDIR}"/c_rehash || die #416717
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	dobin "${WORKDIR}"/c_rehash #333117
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -1,267 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-REV="1.7"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-# The blocks are temporary just to make sure people upgrade to a
-# version that lack runtime version checking.  We'll drop them in
-# the future.
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!<net-misc/openssh-5.9_p1-r4
-	!<net-libs/neon-0.29.6-r1"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	SSL_CNF_DIR="/etc/ssl"
-	sed \
-		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
-		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
-		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
-		> "${WORKDIR}"/c_rehash || die #416717
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
-		epatch "${FILESDIR}"/${PN}-1.0.2d-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	dobin "${WORKDIR}"/c_rehash #333117
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-
-	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
--- a/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI=5

 inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal

@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"

 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"

@@ -56,7 +56,7 @@ src_prepare() {
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
 		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
-		epatch "${FILESDIR}"/${PN}-1.0.2d-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch
 		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
 		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
 		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
--- a/dev-libs/sdformat/sdformat-4.0.0.ebuild
+++ b/dev-libs/sdformat/sdformat-4.0.0.ebuild
@@ -13,8 +13,7 @@ SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.b
 LICENSE="Apache-2.0"
 # subslot = libsdformat major
 SLOT="0/4"
-# breaks gazebo
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 IUSE=""

 RDEPEND="
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -117,7 +117,9 @@ python_prepare_all() {
 }

 python_compile() {
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+	distutils-r1_python_compile \
+		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		${NUMPY_FCONFIG}
 }

 python_test() {
--- a/dev-ros/gazebo_plugins/files/gazebo6.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo6.patch
@@ -0,0 +1,44 @@
+commit 04855dc0fd2d82d6fe72c0b54ae66a5f86c5ceb4
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Tue Jan 12 17:36:06 2016 -0800
+
+    Fix gazebo6 deprecation warnings
+    
+    Several RaySensor functions are deprecated in gazebo6
+    and are removed in gazebo7.
+    The return type is changed to use ignition math
+    and the function name is changed.
+    This adds ifdef's to handle the changes.
+
+diff --git a/gazebo_plugins/src/gazebo_ros_block_laser.cpp b/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+index d8f40bc..76e0206 100644
+--- a/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+++ b/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+@@ -230,8 +230,13 @@ void GazeboRosBlockLaser::PutLaserData(common::Time &_updateTime)
+ 
+   this->parent_ray_sensor_->SetActive(false);
+ 
+#if GAZEBO_MAJOR_VERSION >= 6
+  auto maxAngle = this->parent_ray_sensor_->AngleMax();
+  auto minAngle = this->parent_ray_sensor_->AngleMin();
+#else
+   math::Angle maxAngle = this->parent_ray_sensor_->GetAngleMax();
+   math::Angle minAngle = this->parent_ray_sensor_->GetAngleMin();
+#endif
+ 
+   double maxRange = this->parent_ray_sensor_->GetRangeMax();
+   double minRange = this->parent_ray_sensor_->GetRangeMin();
+@@ -240,8 +245,13 @@ void GazeboRosBlockLaser::PutLaserData(common::Time &_updateTime)
+ 
+   int verticalRayCount = this->parent_ray_sensor_->GetVerticalRayCount();
+   int verticalRangeCount = this->parent_ray_sensor_->GetVerticalRangeCount();
+#if GAZEBO_MAJOR_VERSION >= 6
+  auto verticalMaxAngle = this->parent_ray_sensor_->VerticalAngleMax();
+  auto verticalMinAngle = this->parent_ray_sensor_->VerticalAngleMin();
+#else
+   math::Angle verticalMaxAngle = this->parent_ray_sensor_->GetVerticalAngleMax();
+   math::Angle verticalMinAngle = this->parent_ray_sensor_->GetVerticalAngleMin();
+#endif
+ 
+   double yDiff = maxAngle.Radian() - minAngle.Radian();
+   double pDiff = verticalMaxAngle.Radian() - verticalMinAngle.Radian();
--- a/dev-ros/gazebo_plugins/files/gazebo7-2.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo7-2.patch
@@ -0,0 +1,22 @@
+commit a27311b3b37a661aadb9815346d26e2970441bef
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Wed Jan 13 11:29:32 2016 -0800
+
+    Add missing boost header
+    
+    Some boost headers were remove from gazebo7 header files
+    and gazebo_ros_joint_state_publisher.cpp was using it
+    implicitly.
+
+diff --git a/gazebo_plugins/src/gazebo_ros_joint_state_publisher.cpp b/gazebo_plugins/src/gazebo_ros_joint_state_publisher.cpp
+index 6c1ede1..d78b3d8 100644
+--- a/gazebo_plugins/src/gazebo_ros_joint_state_publisher.cpp
+++ b/gazebo_plugins/src/gazebo_ros_joint_state_publisher.cpp
+@@ -25,6 +25,7 @@
+  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+  **/
+#include <boost/algorithm/string.hpp>
+ #include <gazebo_plugins/gazebo_ros_joint_state_publisher.h>
+ #include <tf/transform_broadcaster.h>
+ #include <tf/transform_listener.h>
--- a/dev-ros/gazebo_plugins/files/gazebo7-3.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo7-3.patch
@@ -0,0 +1,30 @@
+commit ce0ab101b272c4933f31945e2edaf215c4342772
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Wed Jan 13 11:30:57 2016 -0800
+
+    Fix compiler error with SetHFOV
+    
+    In gazebo7, the rendering::Camera::SetHFOV function
+    is overloaded with a potential for ambiguity,
+    as reported in the following issue:
+    https://bitbucket.org/osrf/gazebo/issues/1830
+    This fixes the build by explicitly defining the
+    Angle type.
+
+diff --git a/gazebo_plugins/src/gazebo_ros_camera_utils.cpp b/gazebo_plugins/src/gazebo_ros_camera_utils.cpp
+index 2129b65..4574e8d 100644
+--- a/gazebo_plugins/src/gazebo_ros_camera_utils.cpp
+++ b/gazebo_plugins/src/gazebo_ros_camera_utils.cpp
+@@ -360,7 +360,11 @@ void GazeboRosCameraUtils::LoadThread()
+ // Set Horizontal Field of View
+ void GazeboRosCameraUtils::SetHFOV(const std_msgs::Float64::ConstPtr& hfov)
+ {
+-  this->camera_->SetHFOV(hfov->data);
+#if GAZEBO_MAJOR_VERSION >= 7
+  this->camera_->SetHFOV(ignition::math::Angle(hfov->data));
+#else
+  this->camera_->SetHFOV(gazebo::math::Angle(hfov->data));
+#endif
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////
--- a/dev-ros/gazebo_plugins/files/gazebo7-4.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo7-4.patch
@@ -0,0 +1,21 @@
+commit d7580215c9e39eddc33196b32b05219fcea707fd
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Fri Jan 15 16:29:37 2016 -0800
+
+    gazebo_ros_utils.h: include gazebo_config.h
+    
+    Make sure to include gazebo_config.h,
+    which defines the GAZEBO_MAJOR_VERSION macro
+
+diff --git a/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h b/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+index 6cdc4a8..6b016b8 100644
+--- a/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+++ b/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+@@ -39,6 +39,7 @@
+ #include <gazebo/common/common.hh>
+ #include <gazebo/physics/physics.hh>
+ #include <gazebo/sensors/Sensor.hh>
+#include <gazebo/gazebo_config.h>
+ #include <ros/ros.h>
+ 
+ #ifndef GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST
--- a/dev-ros/gazebo_plugins/files/gazebo7-5.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo7-5.patch
@@ -0,0 +1,146 @@
+commit 19f5f19f48def0a2c5808a7266151eb8e06d7b63
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Tue Apr 14 18:10:36 2015 -0700
+
+    Use Joint::SetParam for joint velocity motors
+    
+    Before gazebo5, Joint::SetVelocity and SetMaxForce
+    were used to set joint velocity motors.
+    The API has changed in gazebo5, to use Joint::SetParam
+    instead.
+    The functionality is still available through the SetParam API.
+
+diff --git a/gazebo_plugins/src/gazebo_ros_diff_drive.cpp b/gazebo_plugins/src/gazebo_ros_diff_drive.cpp
+index 004fb90..68265a8 100644
+--- a/gazebo_plugins/src/gazebo_ros_diff_drive.cpp
+++ b/gazebo_plugins/src/gazebo_ros_diff_drive.cpp
+@@ -100,8 +100,8 @@ void GazeboRosDiffDrive::Load ( physics::ModelPtr _parent, sdf::ElementPtr _sdf
+     joints_.resize ( 2 );
+     joints_[LEFT] = gazebo_ros_->getJoint ( parent, "leftJoint", "left_joint" );
+     joints_[RIGHT] = gazebo_ros_->getJoint ( parent, "rightJoint", "right_joint" );
+-    joints_[LEFT]->SetMaxForce ( 0, wheel_torque );
+-    joints_[RIGHT]->SetMaxForce ( 0, wheel_torque );
+    joints_[LEFT]->SetParam ( "fmax", 0, wheel_torque );
+    joints_[RIGHT]->SetParam ( "fmax", 0, wheel_torque );
+ 
+ 
+ 
+@@ -170,8 +170,8 @@ void GazeboRosDiffDrive::Reset()
+   pose_encoder_.theta = 0;
+   x_ = 0;
+   rot_ = 0;
+-  joints_[LEFT]->SetMaxForce ( 0, wheel_torque );
+-  joints_[RIGHT]->SetMaxForce ( 0, wheel_torque );
+  joints_[LEFT]->SetParam ( "fmax", 0, wheel_torque );
+  joints_[RIGHT]->SetParam ( "fmax", 0, wheel_torque );
+ }
+ 
+ void GazeboRosDiffDrive::publishWheelJointState()
+@@ -214,15 +214,15 @@ void GazeboRosDiffDrive::publishWheelTF()
+ void GazeboRosDiffDrive::UpdateChild()
+ {
+   
+-    /* force reset SetMaxForce since Joint::Reset reset MaxForce to zero at
+    /* force reset SetParam("fmax") since Joint::Reset reset MaxForce to zero at
+        https://bitbucket.org/osrf/gazebo/src/8091da8b3c529a362f39b042095e12c94656a5d1/gazebo/physics/Joint.cc?at=gazebo2_2.2.5#cl-331
+        (this has been solved in https://bitbucket.org/osrf/gazebo/diff/gazebo/physics/Joint.cc?diff2=b64ff1b7b6ff&at=issue_964 )
+        and Joint::Reset is called after ModelPlugin::Reset, so we need to set maxForce to wheel_torque other than GazeboRosDiffDrive::Reset
+        (this seems to be solved in https://bitbucket.org/osrf/gazebo/commits/ec8801d8683160eccae22c74bf865d59fac81f1e)
+     */
+     for ( int i = 0; i < 2; i++ ) {
+-      if ( fabs(wheel_torque -joints_[i]->GetMaxForce ( 0 )) > 1e-6 ) {
+-        joints_[i]->SetMaxForce ( 0, wheel_torque );
+      if ( fabs(wheel_torque -joints_[i]->GetParam ( "fmax", 0 )) > 1e-6 ) {
+        joints_[i]->SetParam ( "fmax", 0, wheel_torque );
+       }
+     }
+ 
+@@ -248,8 +248,8 @@ void GazeboRosDiffDrive::UpdateChild()
+                 ( fabs ( wheel_speed_[LEFT] - current_speed[LEFT] ) < 0.01 ) ||
+                 ( fabs ( wheel_speed_[RIGHT] - current_speed[RIGHT] ) < 0.01 ) ) {
+             //if max_accel == 0, or target speed is reached
+-            joints_[LEFT]->SetVelocity ( 0, wheel_speed_[LEFT]/ ( wheel_diameter_ / 2.0 ) );
+-            joints_[RIGHT]->SetVelocity ( 0, wheel_speed_[RIGHT]/ ( wheel_diameter_ / 2.0 ) );
+            joints_[LEFT]->SetParam ( "vel", 0, wheel_speed_[LEFT]/ ( wheel_diameter_ / 2.0 ) );
+            joints_[RIGHT]->SetParam ( "vel", 0, wheel_speed_[RIGHT]/ ( wheel_diameter_ / 2.0 ) );
+         } else {
+             if ( wheel_speed_[LEFT]>=current_speed[LEFT] )
+                 wheel_speed_instr_[LEFT]+=fmin ( wheel_speed_[LEFT]-current_speed[LEFT],  wheel_accel * seconds_since_last_update );
+@@ -264,8 +264,8 @@ void GazeboRosDiffDrive::UpdateChild()
+             // ROS_INFO("actual wheel speed = %lf, issued wheel speed= %lf", current_speed[LEFT], wheel_speed_[LEFT]);
+             // ROS_INFO("actual wheel speed = %lf, issued wheel speed= %lf", current_speed[RIGHT],wheel_speed_[RIGHT]);
+ 
+-            joints_[LEFT]->SetVelocity ( 0,wheel_speed_instr_[LEFT] / ( wheel_diameter_ / 2.0 ) );
+-            joints_[RIGHT]->SetVelocity ( 0,wheel_speed_instr_[RIGHT] / ( wheel_diameter_ / 2.0 ) );
+            joints_[LEFT]->SetParam ( "vel", 0, wheel_speed_instr_[LEFT] / ( wheel_diameter_ / 2.0 ) );
+            joints_[RIGHT]->SetParam ( "vel", 0, wheel_speed_instr_[RIGHT] / ( wheel_diameter_ / 2.0 ) );
+         }
+         last_update_time_+= common::Time ( update_period_ );
+     }
+diff --git a/gazebo_plugins/src/gazebo_ros_skid_steer_drive.cpp b/gazebo_plugins/src/gazebo_ros_skid_steer_drive.cpp
+index fdaf61f..a24aba5 100644
+--- a/gazebo_plugins/src/gazebo_ros_skid_steer_drive.cpp
+++ b/gazebo_plugins/src/gazebo_ros_skid_steer_drive.cpp
+@@ -256,10 +256,10 @@ namespace gazebo {
+ 	 gzthrow(error);
+    }
+ 
+-    joints[LEFT_FRONT]->SetMaxForce(0, torque);
+-    joints[RIGHT_FRONT]->SetMaxForce(0, torque);
+-    joints[LEFT_REAR]->SetMaxForce(0, torque);
+-    joints[RIGHT_REAR]->SetMaxForce(0, torque);
+    joints[LEFT_FRONT]->SetParam("fmax", 0, torque);
+    joints[RIGHT_FRONT]->SetParam("fmax", 0, torque);
+    joints[LEFT_REAR]->SetParam("fmax", 0, torque);
+    joints[RIGHT_REAR]->SetParam("fmax", 0, torque);
+ 
+     // Make sure the ROS node for Gazebo has already been initialized
+     if (!ros::isInitialized())
+@@ -308,10 +308,10 @@ namespace gazebo {
+ 
+       // Update robot in case new velocities have been requested
+       getWheelVelocities();
+-      joints[LEFT_FRONT]->SetVelocity(0, wheel_speed_[LEFT_FRONT] / (wheel_diameter_ / 2.0));
+-      joints[RIGHT_FRONT]->SetVelocity(0, wheel_speed_[RIGHT_FRONT] / (wheel_diameter_ / 2.0));
+-      joints[LEFT_REAR]->SetVelocity(0, wheel_speed_[LEFT_REAR] / (wheel_diameter_ / 2.0));
+-      joints[RIGHT_REAR]->SetVelocity(0, wheel_speed_[RIGHT_REAR] / (wheel_diameter_ / 2.0));
+      joints[LEFT_FRONT]->SetParam("vel", 0, wheel_speed_[LEFT_FRONT] / (wheel_diameter_ / 2.0));
+      joints[RIGHT_FRONT]->SetParam("vel", 0, wheel_speed_[RIGHT_FRONT] / (wheel_diameter_ / 2.0));
+      joints[LEFT_REAR]->SetParam("vel", 0, wheel_speed_[LEFT_REAR] / (wheel_diameter_ / 2.0));
+      joints[RIGHT_REAR]->SetParam("vel", 0, wheel_speed_[RIGHT_REAR] / (wheel_diameter_ / 2.0));
+ 
+       last_update_time_+= common::Time(update_period_);
+ 
+diff --git a/gazebo_plugins/src/gazebo_ros_tricycle_drive.cpp b/gazebo_plugins/src/gazebo_ros_tricycle_drive.cpp
+index 97c5ebb..0e83d2a 100644
+--- a/gazebo_plugins/src/gazebo_ros_tricycle_drive.cpp
+++ b/gazebo_plugins/src/gazebo_ros_tricycle_drive.cpp
+@@ -108,8 +108,8 @@ void GazeboRosTricycleDrive::Load ( physics::ModelPtr _parent, sdf::ElementPtr _
+     odomOptions["world"] = WORLD;
+     gazebo_ros_->getParameter<OdomSource> ( odom_source_, "odometrySource", odomOptions, WORLD );
+ 
+-    joint_wheel_actuated_->SetMaxForce ( 0, wheel_torque_ );
+-    joint_steering_->SetMaxForce ( 0, wheel_torque_ );
+    joint_wheel_actuated_->SetParam ( "fmax", 0, wheel_torque_ );
+    joint_steering_->SetParam ( "fmax", 0, wheel_torque_ );
+ 
+ 
+     // Initialize update rate stuff
+@@ -235,7 +235,7 @@ void GazeboRosTricycleDrive::motorController ( double target_speed, double targe
+             applied_speed = current_speed - wheel_deceleration_ * dt;
+         }
+     }
+-    joint_wheel_actuated_->SetVelocity ( 0, applied_speed );
+    joint_wheel_actuated_->SetParam ( "vel", 0, applied_speed );
+     
+     double current_angle = joint_steering_->GetAngle ( 0 ).Radian();
+     if(target_angle > +M_PI / 2.0) target_angle =  +M_PI / 2.0;
+@@ -249,7 +249,7 @@ void GazeboRosTricycleDrive::motorController ( double target_speed, double targe
+         } else {
+             applied_steering_speed = -steering_speed_;
+         }
+-      joint_steering_->SetVelocity ( 0, applied_steering_speed );
+      joint_steering_->SetParam ( "vel", 0, applied_steering_speed );
+     }else {
+ #if GAZEBO_MAJOR_VERSION >= 4
+       joint_steering_->SetPosition ( 0, applied_angle );
--- a/dev-ros/gazebo_plugins/files/gazebo7.patch
+++ b/dev-ros/gazebo_plugins/files/gazebo7.patch
@@ -0,0 +1,176 @@
+commit 194ebf81f025c450555ec8cf3a98653bb1307c4c
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Wed Jan 13 11:25:52 2016 -0800
+
+    Fix gazebo7 build errors
+    
+    The SensorPtr types have changed from boost:: pointers
+    to std:: pointers,
+    which requires boost::dynamic_pointer_cast to change to
+    std::dynamic_pointer_cast.
+    A helper macro is added that adds a `using` statement
+    corresponding to the correct type of dynamic_pointer_cast.
+    This macro should be narrowly scoped to protect
+    other code.
+
+diff --git a/gazebo_plugins/include/gazebo_plugins/MultiCameraPlugin.h b/gazebo_plugins/include/gazebo_plugins/MultiCameraPlugin.h
+index ff38ef6..b3092d0 100644
+--- a/gazebo_plugins/include/gazebo_plugins/MultiCameraPlugin.h
+++ b/gazebo_plugins/include/gazebo_plugins/MultiCameraPlugin.h
+@@ -43,7 +43,7 @@ namespace gazebo
+                               unsigned int _width, unsigned int _height,
+                               unsigned int _depth, const std::string &_format);
+ 
+-    protected: boost::shared_ptr<sensors::MultiCameraSensor> parentSensor;
+    protected: sensors::MultiCameraSensorPtr parentSensor;
+ 
+     protected: std::vector<unsigned int> width, height, depth;
+     protected: std::vector<std::string> format;
+diff --git a/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h b/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+index 3db4c45..6cdc4a8 100644
+--- a/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+++ b/gazebo_plugins/include/gazebo_plugins/gazebo_ros_utils.h
+@@ -41,6 +41,14 @@
+ #include <gazebo/sensors/Sensor.hh>
+ #include <ros/ros.h>
+ 
+#ifndef GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST
+# if GAZEBO_MAJOR_VERSION >= 7
+#define GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST using std::dynamic_pointer_cast
+# else
+#define GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST using boost::dynamic_pointer_cast
+# endif
+#endif
+
+ namespace gazebo
+ {
+ 
+diff --git a/gazebo_plugins/src/MultiCameraPlugin.cpp b/gazebo_plugins/src/MultiCameraPlugin.cpp
+index 8001a22..11f663c 100644
+--- a/gazebo_plugins/src/MultiCameraPlugin.cpp
+++ b/gazebo_plugins/src/MultiCameraPlugin.cpp
+@@ -17,6 +17,7 @@
+ #include <gazebo/sensors/DepthCameraSensor.hh>
+ #include <gazebo/sensors/CameraSensor.hh>
+ #include <gazebo_plugins/MultiCameraPlugin.h>
+#include <gazebo_plugins/gazebo_ros_utils.h>
+ 
+ using namespace gazebo;
+ GZ_REGISTER_SENSOR_PLUGIN(MultiCameraPlugin)
+@@ -40,15 +41,16 @@ void MultiCameraPlugin::Load(sensors::SensorPtr _sensor,
+   if (!_sensor)
+     gzerr << "Invalid sensor pointer.\n";
+ 
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+   this->parentSensor =
+-    boost::dynamic_pointer_cast<sensors::MultiCameraSensor>(_sensor);
+    dynamic_pointer_cast<sensors::MultiCameraSensor>(_sensor);
+ 
+   if (!this->parentSensor)
+   {
+     gzerr << "MultiCameraPlugin requires a CameraSensor.\n";
+-    if (boost::dynamic_pointer_cast<sensors::DepthCameraSensor>(_sensor))
+    if (dynamic_pointer_cast<sensors::DepthCameraSensor>(_sensor))
+       gzmsg << "It is a depth camera sensor\n";
+-    if (boost::dynamic_pointer_cast<sensors::CameraSensor>(_sensor))
+    if (dynamic_pointer_cast<sensors::CameraSensor>(_sensor))
+       gzmsg << "It is a camera sensor\n";
+   }
+ 
+diff --git a/gazebo_plugins/src/gazebo_ros_block_laser.cpp b/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+index 76e0206..d03b9f1 100644
+--- a/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+++ b/gazebo_plugins/src/gazebo_ros_block_laser.cpp
+@@ -24,6 +24,7 @@
+ #include <assert.h>
+ 
+ #include <gazebo_plugins/gazebo_ros_block_laser.h>
+#include <gazebo_plugins/gazebo_ros_utils.h>
+ 
+ #include <gazebo/physics/World.hh>
+ #include <gazebo/physics/HingeJoint.hh>
+@@ -86,7 +87,8 @@ void GazeboRosBlockLaser::Load(sensors::SensorPtr _parent, sdf::ElementPtr _sdf)
+   this->node_ = transport::NodePtr(new transport::Node());
+   this->node_->Init(worldName);
+ 
+-  this->parent_ray_sensor_ = boost::dynamic_pointer_cast<sensors::RaySensor>(this->parent_sensor_);
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+  this->parent_ray_sensor_ = dynamic_pointer_cast<sensors::RaySensor>(this->parent_sensor_);
+ 
+   if (!this->parent_ray_sensor_)
+     gzthrow("GazeboRosBlockLaser controller requires a Ray Sensor as its parent");
+diff --git a/gazebo_plugins/src/gazebo_ros_bumper.cpp b/gazebo_plugins/src/gazebo_ros_bumper.cpp
+index 059f1d9..f8dbdd0 100644
+--- a/gazebo_plugins/src/gazebo_ros_bumper.cpp
+++ b/gazebo_plugins/src/gazebo_ros_bumper.cpp
+@@ -39,6 +39,7 @@
+ #include <tf/tf.h>
+ 
+ #include <gazebo_plugins/gazebo_ros_bumper.h>
+#include <gazebo_plugins/gazebo_ros_utils.h>
+ 
+ namespace gazebo
+ {
+@@ -65,7 +66,8 @@ GazeboRosBumper::~GazeboRosBumper()
+ // Load the controller
+ void GazeboRosBumper::Load(sensors::SensorPtr _parent, sdf::ElementPtr _sdf)
+ {
+-  this->parentSensor = boost::dynamic_pointer_cast<sensors::ContactSensor>(_parent);
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+  this->parentSensor = dynamic_pointer_cast<sensors::ContactSensor>(_parent);
+   if (!this->parentSensor)
+   {
+     ROS_ERROR("Contact sensor parent is not of type ContactSensor");
+diff --git a/gazebo_plugins/src/gazebo_ros_gpu_laser.cpp b/gazebo_plugins/src/gazebo_ros_gpu_laser.cpp
+index 811fc81..6b36c48 100644
+--- a/gazebo_plugins/src/gazebo_ros_gpu_laser.cpp
+++ b/gazebo_plugins/src/gazebo_ros_gpu_laser.cpp
+@@ -75,8 +75,9 @@ void GazeboRosLaser::Load(sensors::SensorPtr _parent, sdf::ElementPtr _sdf)
+   // save pointers
+   this->sdf = _sdf;
+ 
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+   this->parent_ray_sensor_ =
+-    boost::dynamic_pointer_cast<sensors::GpuRaySensor>(_parent);
+    dynamic_pointer_cast<sensors::GpuRaySensor>(_parent);
+ 
+   if (!this->parent_ray_sensor_)
+     gzthrow("GazeboRosLaser controller requires a Ray Sensor as its parent");
+diff --git a/gazebo_plugins/src/gazebo_ros_laser.cpp b/gazebo_plugins/src/gazebo_ros_laser.cpp
+index 815c456..80e60a2 100644
+--- a/gazebo_plugins/src/gazebo_ros_laser.cpp
+++ b/gazebo_plugins/src/gazebo_ros_laser.cpp
+@@ -72,8 +72,9 @@ void GazeboRosLaser::Load(sensors::SensorPtr _parent, sdf::ElementPtr _sdf)
+   // save pointers
+   this->sdf = _sdf;
+ 
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+   this->parent_ray_sensor_ =
+-    boost::dynamic_pointer_cast<sensors::RaySensor>(_parent);
+    dynamic_pointer_cast<sensors::RaySensor>(_parent);
+ 
+   if (!this->parent_ray_sensor_)
+     gzthrow("GazeboRosLaser controller requires a Ray Sensor as its parent");
+diff --git a/gazebo_plugins/src/gazebo_ros_range.cpp b/gazebo_plugins/src/gazebo_ros_range.cpp
+index 9387dde..cb229fe 100644
+--- a/gazebo_plugins/src/gazebo_ros_range.cpp
+++ b/gazebo_plugins/src/gazebo_ros_range.cpp
+@@ -35,6 +35,7 @@
+ /** \author Jose Capriles, Bence Magyar. */
+ 
+ #include "gazebo_plugins/gazebo_ros_range.h"
+#include "gazebo_plugins/gazebo_ros_utils.h"
+ 
+ #include <algorithm>
+ #include <string>
+@@ -92,8 +93,9 @@ void GazeboRosRange::Load(sensors::SensorPtr _parent, sdf::ElementPtr _sdf)
+ 
+   this->last_update_time_ = common::Time(0);
+ 
+  GAZEBO_SENSORS_USING_DYNAMIC_POINTER_CAST;
+   this->parent_ray_sensor_ =
+-    boost::dynamic_pointer_cast<sensors::RaySensor>(this->parent_sensor_);
+    dynamic_pointer_cast<sensors::RaySensor>(this->parent_sensor_);
+ 
+   if (!this->parent_ray_sensor_)
+     gzthrow("GazeboRosRange controller requires a Ray Sensor as its parent");
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.5.1.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.5.1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-ros/camera_info_manager
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/libxml2
-	sci-electronics/gazebo
+	>=sci-electronics/gazebo-7:=
 	dev-games/ogre
 	sci-libs/pcl
 	dev-libs/boost:=
@@ -51,3 +51,11 @@ RDEPEND="
 	dev-ros/roslib[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/gazebo6.patch"
+	"${FILESDIR}/gazebo7.patch"
+	"${FILESDIR}/gazebo7-2.patch"
+	"${FILESDIR}/gazebo7-3.patch"
+	"${FILESDIR}/gazebo7-4.patch"
+	"${FILESDIR}/gazebo7-5.patch"
+)
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-ros/camera_info_manager
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/libxml2
-	sci-electronics/gazebo
+	>=sci-electronics/gazebo-7:=
 	dev-games/ogre
 	sci-libs/pcl
 	dev-libs/boost:=
--- a/dev-ros/gazebo_ros_control/files/gazebo7.patch
+++ b/dev-ros/gazebo_ros_control/files/gazebo7.patch
@@ -0,0 +1,61 @@
+commit b5303e692bb5dd2e4f4fc7932c7ec2c7e0b2e907
+Author: Steven Peters <scpeters@osrfoundation.org>
+Date:   Tue Apr 14 18:10:36 2015 -0700
+
+    Use Joint::SetParam for joint velocity motors
+    
+    Before gazebo5, Joint::SetVelocity and SetMaxForce
+    were used to set joint velocity motors.
+    The API has changed in gazebo5, to use Joint::SetParam
+    instead.
+    The functionality is still available through the SetParam API.
+    
+    cherry-picked from indigo-devel
+    
+    Add ifdefs to fix build with gazebo2
+    
+    It was broken by #315.
+    Fixes #321.
+
+diff --git a/gazebo_ros_control/src/default_robot_hw_sim.cpp b/gazebo_ros_control/src/default_robot_hw_sim.cpp
+index 249c8d3..1d9418d 100644
+--- a/gazebo_ros_control/src/default_robot_hw_sim.cpp
+++ b/gazebo_ros_control/src/default_robot_hw_sim.cpp
+@@ -199,7 +199,7 @@ bool DefaultRobotHWSim::initSim(
+     if (joint_control_methods_[j] != EFFORT)
+     {
+       // Initialize the PID controller. If no PID gain values are found, use joint->SetAngle() or
+-      // joint->SetVelocity() to control the joint.
+      // joint->SetParam("vel") to control the joint.
+       const ros::NodeHandle nh(model_nh, "/gazebo_ros_control/pid_gains/" +
+                                joint_names_[j]);
+       if (pid_controllers_[j].init(nh, true))
+@@ -216,10 +216,14 @@ bool DefaultRobotHWSim::initSim(
+       }
+       else
+       {
+-        // joint->SetMaxForce() must be called if joint->SetAngle() or joint->SetVelocity() are
+-        // going to be called. joint->SetMaxForce() must *not* be called if joint->SetForce() is
+        // joint->SetParam("fmax") must be called if joint->SetAngle() or joint->SetParam("vel") are
+        // going to be called. joint->SetParam("fmax") must *not* be called if joint->SetForce() is
+         // going to be called.
+#if GAZEBO_MAJOR_VERSION > 2
+        joint->SetParam("fmax", 0, joint_effort_limits_[j]);
+#else
+         joint->SetMaxForce(0, joint_effort_limits_[j]);
+#endif
+       }
+     }
+   }
+@@ -327,7 +331,11 @@ void DefaultRobotHWSim::writeSim(ros::Time time, ros::Duration period)
+         break;
+ 
+       case VELOCITY:
+#if GAZEBO_MAJOR_VERSION > 2
+        sim_joints_[j]->SetParam("vel", 0, e_stop_active_ ? 0 : joint_velocity_command_[j]);
+#else
+         sim_joints_[j]->SetVelocity(0, e_stop_active_ ? 0 : joint_velocity_command_[j]);
+#endif
+         break;
+ 
+       case VELOCITY_PID:
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.1.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.1.ebuild
@@ -27,3 +27,4 @@ RDEPEND="
 	sci-electronics/gazebo
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gazebo7.patch" )
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -5,3 +5,4 @@ DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08d
 DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
 DIST rspec-core-3.4.0-git.tgz 354166 SHA256 852bf29d13c30e921126b57233b80a56495465fe80f3a5fb036721f20a74a668 SHA512 9961b99a2209268528a3cee741f682f37300d0bd88c8364ee400073a3274e7465d767f01207db12789debb73a4bcb5dc6eb06039b0364cdf9fd72803fa917bc5 WHIRLPOOL 9d6176434c72a2eacb8d4ca5ae794f0bd0351507bf51a1b102f4eb12dce02a84cbf2f813c801ac5fc591c533ef4ffe995b9e8df374de4ecffe3cb8367e1c1b59
 DIST rspec-core-3.4.1-git.tgz 354375 SHA256 ed75c25573e155b5fd9f57102785294b2f9b4d3796b96279ba977acbb5bf9eb2 SHA512 e472969b7d1571be39438190029690acdcd760b61f7067e8bf66b29324f2eeb7f870f382dacc79738f0aeea1c66bc971b7a8b93ae6a2c3bc61ac539ce4b452a3 WHIRLPOOL 53243e1374d9cc50f950d17e7de30d9dc3f0c3ac0dea16f41c3b36f3160e95d1ab6ed720e83dc508b4925c3340ed4876918fbcfafe937f9b7753cc8888a266a2
+DIST rspec-core-3.4.2-git.tgz 354859 SHA256 bcb93520f5cb2bc0f2f66c09579970c524e7404575cefc5aefcd3da594d775b6 SHA512 33fc3336a01b86f9c22e5e9fe9f78f2b4f66a309fd0bff90d565484912d2ae6525dc80b0e6e2c6d2b5d698c2848e0b025cc4f065b533b9936ba6e7dfb03bae88 WHIRLPOOL 451f5b70bdd9db53fc7fabc84dacff6cd3cbda3422ca475a1090e5bcd2ec42249e91953c0d648c5a4d2ab12af85e778b392a1e75717526d89577ecffe88f0cfa
--- a/dev-ruby/rspec-core/rspec-core-3.4.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.4.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/zentest-4.6.2
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid specs for older coderay version which is no longer packaged
+	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
+		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
+		spec/rspec/core/source/syntax_highlighter_spec.rb
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,3 +2,4 @@ DIST selenium-webdriver-2.46.2.gem 2919424 SHA256 cb6575396f62f86f015c4905970d48
 DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
 DIST selenium-webdriver-2.48.1.gem 884736 SHA256 b804174665cbc2086c24a98f5331dcc6e1ab313db0852849c6a4d0779deb2484 SHA512 b78e20f382210e73bee24e6ea6cf9ff1bcae6bc77e5ed23ccc0ce9db307f4974140e47b29896850eaaa4c315100e50b3dc2756856defb447405a8c8a509ae966 WHIRLPOOL 7b89a4ad412bdd80fe956af413b75d45144597c6cb0d2bba1d7ec599b3d8f63dab06ac416a276df2ab9293263c22023fb092b8cf0c9848b02765edc9430e7480
 DIST selenium-webdriver-2.49.0.gem 887808 SHA256 c3ceba30bcecfb2e6d0f53bed34ac046f740793871ebfd011c339860f79d4bc8 SHA512 bad495b5d5d97d7f3d7133dd47bc5a2b1695634f18b5b565b17effcd894f18006c015e975be89883ac583cf9b531af7130985fc555d40c9e97bac808461d6a4d WHIRLPOOL 3272fd223fd7eaca858663b52f92a3fd622a2a3707c9f005e871efe4aa40c7cdf2f95921a5ce9d94de30f2185a8ba310e7020905daaa1eb1c855c3c06487e86d
+DIST selenium-webdriver-2.50.0.gem 890368 SHA256 6dde9797faebd84bdf252fff9cf0135c70c6027545a54efaf98b626425755115 SHA512 a1b1b51aaec744008fab7db063c8cb53e7065ac766d4e56b98e0055aee576b718ae56bf60244c0ebcd7c98932b7ff9c2c8b8a78bc6d8dfae1fe6fbb813869098 WHIRLPOOL 0d5fe0cdea8f36b45c3fdb1ea2b2ae786029c8dd6a8ee7cd26d336499d3a77b36c6e0bd87dc73595c6b7e2de9482b46a29be3022087722505f28423efd61af43
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.50.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.50.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/multi_json-1.0.4
+	dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+	# Make websocket a development dependency since it is only needed
+	# for the safari driver which we don't support on Gentoo.
+	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
--- a/dev-util/pmk/Manifest
+++ b/dev-util/pmk/Manifest
@@ -1 +0,0 @@
-DIST pmk-0.10.4.tar.gz 208475 SHA256 bde39a1fb1f0612446838f4845f44f1a0a2adb9c62c2d0f9e3ca58c61888a569 SHA512 906ee690b6cae55d54b1e248847a61ddcb15d7404fb8914040047876eb906f868607b38b59dbbd9687a0f8b409d6c3852249d558119af1bea4c64775f34ea32d WHIRLPOOL 9f4c8295b53c3fe9cdbb56fa927ef05bdef7b36e8852af46ea362ba738283eaab69d5e486edcab654e0650f11339ad3ba25216b6e219531c678d6c166b8fe914
--- a/dev-util/pmk/metadata.xml
+++ b/dev-util/pmk/metadata.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription>
-    The meaning of pmk is "Pre Make Kit", a dependency configuring tool. It
-    aims to be considered as an alternative to GNU autoconf, GNU libtool
-    and pkg-config.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pmk</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-util/pmk/pmk-0.10.4.ebuild
+++ b/dev-util/pmk/pmk-0.10.4.ebuild
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="Aims to be an alternative to GNU autoconf"
-HOMEPAGE="http://pmk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	# Make this respect LDFLAGS, bug #334987
-	sed -i -e "s:CLDFLAGS:LDFLAGS:" Makefile.pmk || die
-	sed -i -e "/@CLDFLAGS@/d" Makefile.pmk || die
-
-	# Remove executable stack
-	cp detect_cpu_asm.s detect_cpu_asm.S
-	cat >> detect_cpu_asm.S <<EOF
-#ifdef __ELF__
-.section .note.GNU-stack,"",%progbits
-#endif
-EOF
-}
-
-src_configure() {
-	tc-export CC CPP AS
-	export SYSCONFDIR="${EPREFIX}"/etc
-	export PREFIX="${EPREFIX}"/usr
-	./pmkcfg.sh autodetected || die "Config failed"
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" MANDIR="${EPREFIX}/usr/share/man" install || die "make failed"
-
-	dodoc BUGS Changelog README STATUS TODO || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/pmk/pmk.conf ]] ; then
-		einfo
-		einfo "${EROOT}etc/pmk/pmk.conf doesn't exist."
-		einfo "Running pmksetup to generate an initial pmk.conf."
-		einfo
-		# create one with initial values
-		"${EROOT}"usr/bin/pmksetup
-		# run it again to reset PREFIX from /usr/local to ${EPREFIX}/usr
-		"${EROOT}"usr/bin/pmksetup -u "PREFIX=\"${EPREFIX}/usr\""
-		# remove the automatically created backup from the extra run
-		rm -f "${EROOT}"etc/pmk/pmk.conf.bak
-	fi
-}
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -51,16 +51,18 @@
 # you must either grab each file individually, or find a place to mirror an
 # archive of them.  (iBiblio)
 #
-# It inherits base.
+# It inherits base in EAPI 5 and earlier.

-inherit base
+case ${EAPI:-0} in
+	0|1|2|3|4|5) inherit base ;;
+	6) ;;
+	*) die "Unknown EAPI ${EAPI} for ${ECLASS}" ;;
+esac

 RDEPEND="virtual/latex-base"
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r5"
 HOMEPAGE="http://www.tug.org/"
-SRC_URI="ftp://tug.ctan.org/macros/latex/"
-S=${WORKDIR}/${P}
 TEXMF="/usr/share/texmf-site"

 # @ECLASS-VARIABLE: SUPPLIER
@@ -69,17 +71,12 @@ TEXMF="/usr/share/texmf-site"
 # DESCRIPTION above)
 SUPPLIER="misc"

-# @FUNCTION: latex-package_has_tetex3
-# @RETURN: true if at least one of (>=tetex-3 or >=ptex-3.1.8 or >=texlive-core-2007) is installed, else false
-# @DESCRIPTION:
-# It is often used to know if the current TeX installation supports gentoo's
-# texmf-update or if the package has to do it the old way
+# Kept for backwards compatibility
 latex-package_has_tetex_3() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version '>=app-text/texlive-core-2007' ; then
-		true
-	else
-		false
-	fi
+	case ${EAPI:-0} in
+		0|1|2|3|4|5) return 0 ;;
+		*) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;;
+	esac
 }

 # @FUNCTION: latex-package_src_doinstall
@@ -130,7 +127,7 @@ latex-package_src_doinstall() {
 				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
 				do
 					einfo "Making documentation: $i"
-					texi2dvi -q -c --language=latex $i &> /dev/null
+					texi2dvi -q -c --language=latex $i &> /dev/null || die
 					done
 				;;
 			"tfm" | "vf" | "afm")
@@ -190,7 +187,7 @@ latex-package_src_compile() {
 	for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"`
 	do
 		einfo "Extracting from $i"
-		latex --interaction=batchmode $i &> /dev/null
+		latex --interaction=batchmode $i &> /dev/null || die
 	done
 }

@@ -228,11 +225,7 @@ latex-package_pkg_postrm() {
 # Rehashes the kpathsea database, according to the current TeX installation
 latex-package_rehash() {
 	debug-print function $FUNCNAME $*
-	if latex-package_has_tetex_3 ; then
-		texmf-update
-	else
-		texconfig rehash
-	fi
+	texmf-update
 }

 EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
--- a/eclass/mozconfig-v6.44.eclass
+++ b/eclass/mozconfig-v6.44.eclass
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# @ECLASS: mozconfig-v6.44.eclass
+# @MAINTAINER:
+# mozilla team <mozilla@gentoo.org>
+# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
+# @DESCRIPTION:
+# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
+# to provide a single common place for the common mozilla engine compoments.
+#
+# The eclass provides all common dependencies as well as common use flags.
+#
+# Some use flags which may be optional in particular mozilla packages can be
+# supported through setting eclass variables.
+#
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
+# and so ebuilds inheriting this eclass do not need to inherit that.
+
+inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
+
+case ${EAPI} in
+	0|1|2|3|4) die "EAPI=${EAPI} not supported"
+esac
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="wifi".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if necko-wifi support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild needs to provide
+# optional necko-wifi support via IUSE="jit".  Currently this would include
+# ebuilds for firefox, and potentially seamonkey.
+#
+# Leave the variable UNSET if optional jit support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild can provide
+# optional gtk3 support via IUSE="gtk3".  Currently this would include
+# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
+#
+# Leave the variable UNSET if gtk3 support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
+# @DESCRIPTION:
+# Set this variable before the inherit line, when an ebuild can provide
+# optional qt5 support via IUSE="qt5".  Currently this would include
+# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
+#
+# Leave the variable UNSET if qt5 support should not be available.
+# Set the variable to "enabled" if the use flag should be enabled by default.
+# Set the variable to any value if the use flag should exist but not be default-enabled.
+
+# use-flags common among all mozilla ebuilds
+IUSE="${IUSE} dbus debug ffmpeg +gstreamer gstreamer-0 +jemalloc3 neon pulseaudio selinux startup-notification system-cairo
+	system-icu system-jpeg system-libevent system-sqlite system-libvpx"
+
+# some notes on deps:
+# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
+# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
+
+RDEPEND=">=app-text/hunspell-1.2
+	dev-libs/atk
+	dev-libs/expat
+	>=dev-libs/libevent-1.4.7
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.17:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		>=media-libs/gstreamer-1.4.5:1.0
+		>=media-libs/gst-plugins-base-1.4.5:1.0
+		>=media-libs/gst-plugins-good-1.4.5:1.0
+		>=media-plugins/gst-plugins-libav-1.4.5:1.0
+	)
+	gstreamer-0? (
+		>=media-libs/gstreamer-0.10.25:0.10
+		media-plugins/gst-plugins-meta:0.10[ffmpeg]
+	)
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
+	system-icu? ( >=dev-libs/icu-51.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( =dev-libs/libevent-2.0* )
+	system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
+"
+
+if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
+		IUSE+=" +gtk3"
+	else
+		IUSE+=" gtk3"
+	fi
+	RDEPEND+="
+	gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
+	inherit qmake-utils
+	if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then
+		IUSE+=" +qt5"
+	else
+		IUSE+=" qt5"
+	fi
+	RDEPEND+="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtdeclarative:5
+	)"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
+		IUSE+=" +wifi"
+	else
+		IUSE+=" wifi"
+	fi
+	RDEPEND+="
+	wifi? (
+		kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager )
+	)"
+fi
+if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
+	if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
+		IUSE+=" +jit"
+	else
+		IUSE+=" jit"
+	fi
+fi
+
+DEPEND="app-arch/zip
+	app-arch/unzip
+	>=sys-devel/binutils-2.16.1
+	${RDEPEND}"
+
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mozilla )"
+
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
+REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
+
+# only one of gtk3 or qt5 should be permitted to be selected, since only one will be used.
+[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \
+	REQUIRED_USE+=" ?? ( gtk3 qt5 )"
+
+# @FUNCTION: mozconfig_config
+# @DESCRIPTION:
+# Set common configure options for mozilla packages.
+# Call this within src_configure() phase, after mozconfig_init
+#
+# Example:
+#
+# inherit mozconfig-v5.33
+#
+# src_configure() {
+# 	mozconfig_init
+# 	mozconfig_config
+#	# ... misc ebuild-unique settings via calls to
+#	# ... mozconfig_{annotate,use_with,use_enable}
+#	mozconfig_final
+# }
+
+mozconfig_config() {
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--enable-pango \
+		--enable-svg \
+		--with-system-bz2
+
+	if has bindist ${IUSE}; then
+		mozconfig_use_enable !bindist official-branding
+		if [[ ${PN} == firefox ]] && use bindist ; then
+			mozconfig_annotate '' --with-branding=browser/branding/aurora
+		fi
+	fi
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
+		# wifi pulls in dbus so manage both here
+		mozconfig_use_enable wifi necko-wifi
+		if use kernel_linux && use wifi && ! use dbus; then
+			echo "Enabling dbus support due to wifi request"
+			mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+		else
+			mozconfig_use_enable dbus
+		fi
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are forced-on for webm support
+	mozconfig_annotate 'required' --enable-ogg
+	mozconfig_annotate 'required' --enable-wave
+
+	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
+		mozconfig_use_enable jit ion
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	if use system-libevent; then
+		mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-gnomeui
+	mozconfig_annotate '' --enable-gio
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
+	mozconfig_annotate 'Gentoo default' --disable-skia
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# default toolkit is cairo-gtk2, optional use flags can change this
+	local toolkit="cairo-gtk2"
+	local toolkit_comment=""
+	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
+		if use gtk3; then
+			toolkit="cairo-gtk3"
+			toolkit_comment="gtk3 use flag"
+		fi
+	fi
+	if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
+		if use qt5; then
+			toolkit="cairo-qt"
+			toolkit_comment="qt5 use flag"
+			# need to specify these vars because the qt5 versions are not found otherwise,
+			# and setting --with-qtdir overrides the pkg-config include dirs
+			local i
+			for i in qmake moc rcc; do
+				echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
+					>> "${S}"/.mozconfig || die
+			done
+			echo 'unset QTDIR' >> "${S}"/.mozconfig || die
+			mozconfig_annotate '+qt5' --disable-gio
+		fi
+	fi
+	mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit}
+
+	# Use jemalloc unless libc is not glibc >= 2.4
+	# at this time the minimum glibc in the tree is 2.9 so we should be safe.
+	if use elibc_glibc && use jemalloc3; then
+		# We must force-enable jemalloc 3 via .mozconfig
+		echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
+		mozconfig_annotate '' --enable-jemalloc
+		mozconfig_annotate '' --enable-replace-malloc
+	fi
+
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	use ffmpeg || mozconfig_annotate '-ffmpeg' --disable-ffmpeg
+	if use gstreamer ; then
+		use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:1.0 is not available at runtime"
+		mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+	elif use gstreamer-0 ; then
+		use ffmpeg && einfo "${PN} will not use ffmpeg unless gstreamer:0.10 is not available at runtime"
+		mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
+	else
+		mozconfig_annotate '' --disable-gstreamer
+	fi
+	mozconfig_use_enable pulseaudio
+
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		mozconfig_annotate '' --enable-skia
+
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+}
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
@@ -54,4 +54,7 @@ src_configure() {
 src_install() {
 	kde4-base_src_install
 	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
 }
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild
@@ -54,4 +54,7 @@ src_configure() {
 src_install() {
 	kde4-base_src_install
 	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
 }
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,4 @@
 DIST bluedevil-5.4.3.tar.xz 129024 SHA256 7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413 SHA512 d28b2d85322dab9d0680e7ef371f10e197a1a4dd9acc2e96df424f0928a19634363469671908f0dfb188b3ccfbd936bd7469b797bd010dad42717fa7322db930 WHIRLPOOL bf09237e2c830b9aa75a46991f6bc51b2e38588f1df5d6eeef94c87a89e25524d98c26bb0e72e172fe0f18017df08827b69db9eac8e5cccfea6dfadf8f211f64
 DIST bluedevil-5.5.2.tar.xz 132832 SHA256 4e7e9736f394f64598933e8b82d7a2a03852728f9c106b7bd434b6e593dc237c SHA512 0c439367a2766412ff9d9f9a9ea0581d760fa8ef23abec1a11485022cb11e17ed0ae10c966861f6310a58c5aa96ba331487ced7881b9f361f99fb87f863fcea3 WHIRLPOOL 5e9c5a07ec84d0ba9510152e88d8398be60eb0b8ec8d8d71393e602edfebf6de24a6b62e70485319efc2a17e8ed11fbaec14af6b6a9125438ab49fa1bd66301b
 DIST bluedevil-5.5.3.tar.xz 132880 SHA256 b31ea8c95ffa4f8045b9063621b846d3bc052777351e2d23f33d718374902b1d SHA512 1da7b44e6eb3035d6a1f77b1074a573dc942016770ede2439df56a4599705811f9a2b82e64ab2e219e19357f6d0025039b199ea0ba95fb894aff8a34c80a5f84 WHIRLPOOL ab5865ee1bdfa810ae2cabbb656d99958e805f98efa57adfd0e707dafcf1142257b4e34fa487dbb21f0ee9acad20eb7c56d902cc72a38ddb4a2d160f0d902d07
+DIST bluedevil-5.5.4.tar.xz 135084 SHA256 24dc614820c765f34bec63cb0d6075420378da6522adb66ca6a30df4346d40e4 SHA512 0ee3ab0ae5cc4fc6660367c7a80faf9ec06d551adf947375b36a38d9bebbf2bfa22086d26f45d6a32a1972bfe1afdf0abd021601c4061bf7489f739d85f28066 WHIRLPOOL 1c608f0131b188ab091f98702a66f952a70f31e6028de52c246377042fa647cdf8cb1edac4396ff0a4cd3c49cba75b1a8c8e55cb17f51231626c3c3eb9eedb45
--- a/kde-plasma/bluedevil/bluedevil-5.5.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.5.4.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 fdo-mime kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!net-wireless/bluedevil
+	!net-wireless/kbluetooth
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.5.2.tar.xz 258140 SHA256 a0233498e7824398da1752210a52988989a225b8891ed45c23f93c9acd6a9dfe SHA512 a6f9e8185f4494f74f377b31f59c0e8b9e187bfd87dca584041baea05f86da0638ec3e9a68f3db33b344996545a127c00a22e48103b2289d68c46a077a3add1b WHIRLPOOL 02dde2498f89b44028571fef2b520d8a094cdb952743bb8a344d395c9c68e2f68ceea73e7c6816fdb65517f7871d70464c37269fb523b870cd8723e1ad37f957
 DIST breeze-gtk-5.5.3.tar.xz 257620 SHA256 5bba2f4a5ede5957fb3fc236024df5b1c24380cce9155825a3339fa1cfb1035e SHA512 7d32ff3b5445cbcde3fdeb1e0bf548fa224e75a17a5a5048e81db435eaedaf623622af600f0fd8ede913a54de095a6af11368a0f5a38ec1423ed5ba3fb1d51b2 WHIRLPOOL aaff0348748ae1c1a5c8b84da0a214443f7143f8e31b885d1c095311f844e0145e008aaa92e1a3f42b9047c59e2c60127b1fac4f53efb7b6bb318b3fe837e5da
+DIST breeze-gtk-5.5.4.tar.xz 257724 SHA256 1bb5e201802df5853fcc5213a5ac3380abbc368e5492fc36243a28f86e85d1e4 SHA512 aa5afb7d58277c962affe0a8955739370a3fa16e773012d5c151c83c6d0fc98725e8f6949caf6c218d44f7cefa556132d9c26e4127e27b84c823ce4ed1d78157 WHIRLPOOL 40107020710101ad9bfdd56c2ae938acfb1db3f04a7fdf1856c4f846c880616dcdaa187a2b95d1c979ba3acde8b34db5ec3c53723ac3c44792d0b9411135aa8b
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
 DIST breeze-5.5.2.tar.xz 29670592 SHA256 f9317657125940e38a0b8e10e10a8c0bde406a55f296a6910a5744414c4c369c SHA512 4a84c1b14777c5be060af798cd8573822c7fff4feffaff679f637ee84a258e1f097d3a9109289b1e0f11454c4a0c5d2a7bca8f073a686414f950282e6f22a5f3 WHIRLPOOL 908581c54d827e16feadd0261986a1bd65fe82afd4cd51a11116edd4aa61d36a00943d3c782cfb7d1f3daa6d6e9e4b343391229975eda0e8e2c34b733131f4ba
 DIST breeze-5.5.3.tar.xz 29670380 SHA256 3d8c34e214d3249ab1373a932099f82ae9102630fbd005f18b80538376255ccd SHA512 e9885a276a768803d021d52ca69b7f482eecef999cc7c1c4be46a421b9f8702aaf4c76145e80312d54f8dc45a88a4de6d9ee6c78d189bc515584ca699d5e7872 WHIRLPOOL 84d5661dde7be6a159af615d49422284cb5d0bedd0512e2c6ad517a98ceeb2806f70be74ed25bf7192178efc32dbc347a4f22e3111ee91f855dad17081b2fca4
+DIST breeze-5.5.4.tar.xz 29674196 SHA256 831f8e0d8f1023ef1ce7a073e6b6aaed000b45cad2393213cc29fc5f7eb91432 SHA512 6b6772790e327e01f3a80819d0f904d3f0b12f26e898d123b35346ecb0f84d8155afe1ed4dcbaf94cae8f15bc674175f6628275faab2d6ed4b3417e555efe72b WHIRLPOOL 070a69ed51f138a7bd0fe33d587af6342175b5aaecc60f5b125f0c37a949451ce0cccc7bc1bb8660ee0d05cf68d48d6a017da85db2f9eb9b6c9b7f66c7559e8e
--- a/kde-plasma/breeze/breeze-5.5.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.5.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4"
+
+DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	qt4? (
+		kde-base/kdelibs:4
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,3 +1,4 @@
 DIST kde-cli-tools-5.4.3.tar.xz 484060 SHA256 19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799 SHA512 6e9970fd492097319be2c3d84e08fa6cf885befdac8c8f4c8a328080c0f1091f976f885650156ee0e073a6c9af294c47482a1aeef8276b880538e2ef5d018b28 WHIRLPOOL aa8f48e0464de0f35597d7889203a743f575eb4cc29405f945b345cd92e3d158a3dcb1b2b829e10a0020ea3076cc980c3d39355dd863f2fd5e566763ffd3796b
 DIST kde-cli-tools-5.5.2.tar.xz 485560 SHA256 664ec399c2a08221aa71d68a495b9b179835dadbd737227c6861b2ec62c72736 SHA512 c67cc47fca5f27d879a126633a9e3930d5c75ede7ef1133c3051729e65b4ae1de5a0175f3940015a68a4a0fffbcef15a82023d6f3e914693b32e0c0caa26a309 WHIRLPOOL 96708ffec6c0fd1d29aaf77c9de395dd63cfbee59cdbaa8a43fa669350722c63a8a6d1a72e57d618aa52726b092280c72ed3f1c9b5be75efd827dd4b8414771e
 DIST kde-cli-tools-5.5.3.tar.xz 485704 SHA256 7cd8e186498398a3d185b42fb9eaa969935b61a4b05164477c510e599519892b SHA512 6e629e991a196a03df6e290e4e5c0463a663f400e99fbea306d3ef8c8ea8b12ce7c6c2693de44461a512c57afc639ed0667964778b044c67d4f3e0919aa40a9f WHIRLPOOL 1807813d2057e3927c9b96511f52150e995f74fd56deed999d11fdad46b6cf8c857736e672464e867c8b94c75c2d480eea0d14647fedb3fd080540ebb62d8fe6
+DIST kde-cli-tools-5.5.4.tar.xz 485904 SHA256 be73c26f10981fb15ffdf11ad587e3e35273eef38e310b7e93ddcc02204534f1 SHA512 78c53a0fbf30484e99462ee5da33e7d9fa71cca2c63df304297fb76a8ce1dfe23b043cfa6735dda02c9e8e2ce8f823598be9d3801623414cc2a0d2268b3f1b1e WHIRLPOOL 726838fd6a3bcc09c9033f4ab47cc0c44c363360e0810f002d82314b50b3969afc12f9c821900142b4066df376b42f5a4e9eaf295343835a1e8e9d107c5f3b42
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_frameworks_dep kdelibs4support)
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X KF5KDELibs4Support)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,4 @@
 DIST kde-gtk-config-5.4.3.tar.xz 144832 SHA256 2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a SHA512 4cbfcab8b2bb905627b7ec17fa78c5a6ae538aba20a5f83b762aad0837f33fd8cfb89bece94cca7f36bbd93328c5d77c6de02c95111b6fd27792de9891d54117 WHIRLPOOL 8f9f69edaf5a1025e4c5acb783169018030ee2ad8ec7563dfcfdf9368c0e5808faff8cd4c80591ca74016840bb339798774d2547663f458d359bbebca5b6654c
 DIST kde-gtk-config-5.5.2.tar.xz 145904 SHA256 08464609744f3880f7ef084b72b619a43994c7b048cc5e0b0937b7f7cc50a85d SHA512 4d54e5933804f209423a2ac872c833cd0003158ea80936e6fe5abb2732c2c7b5314c7395b9485067ef460168c7f6fb9d46f60d3dbd1820701aec091d80ebba7e WHIRLPOOL 6c6dfae15c1c71b10bff510ee313f01bceffafda93ac213b957f243949e166d2672a5ed3a9554e0d7da97c6db463e3481cd5918d3f96e358ec24366f7dd9c02d
 DIST kde-gtk-config-5.5.3.tar.xz 145944 SHA256 bbcc6d9ee0193f940717b2f48ffa12b8d01f2b598f0e951d7a35308c547b6236 SHA512 52ea31f576245f51ce4afe4d6008cf949e121e3d3e34088f1ec6ccca5284daee8cd25f4c4fdac63366d9542d5a6022ca2b3d4ec9935207bfcbdbef95b82648ad WHIRLPOOL e002f5adb4c1ca4297d7dbedf1a8412691818e470cef66703e053b81aac93d44308b782394550424caaf7ba04cca7b7010db2b6dcbe7eb267eb1b96ffbb4e0e8
+DIST kde-gtk-config-5.5.4.tar.xz 146852 SHA256 3538d7ac15a6039c850f20fd11bd8afa9f090a3c96fc60cbf72335ac057b5218 SHA512 11c9808aeb9a34a795cfefe8cb5c926b157690c09767229169759063fc81c0d0ce771424ef110d97d62504cb946eb965d454909908e3dab260e3409bffa6ba8e WHIRLPOOL fc4a99dfbc159bee3151bd3c7762fcf0b7122b94da7474d511d7fe853c89a7cd6fc669a576321c3ed3227d6f524261f30db3362f571b6abae4adb3e522ccac67
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-libs/glib:2
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kde-gtk-config:4
+	!kde-misc/kde-gtk-config
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+		-DBUILD_gtk3proxies=$(usex gtk3)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	einfo
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+	einfo
+}
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,4 @@
 DIST kdecoration-5.4.3.tar.xz 33580 SHA256 38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5 SHA512 b346a370ddcc7ad3bda74c57f30e0eb586333e0a50d432382af1495ab292b2eeb0541e0d0638517c8133a75fd26e4f1e8c8ae731bc995ce6ad3b80a835b6b303 WHIRLPOOL 6926d3afba79a93c3d4473ba66f9b8409d2d347ccd19fd54229c0b3a1376be0419599614dd75068c313162af303b81c88925ce8ee304178872368d3db0ae3f5a
 DIST kdecoration-5.5.2.tar.xz 34708 SHA256 f0f24c8dafa939bdd640310f4549a3ce90a089fba3329c0e2d10f9bff1dc2bbd SHA512 ba1fe14217ef5b0e3143cee38f3ab864450b9293988751e0de5b361257c8d64e275ca0ede99743e86b9a179a6e6a3d470cfeaf8e31d144323552b9253322dc6a WHIRLPOOL 2f8cb0861268837a1442796afe72c6aec42ad80a04284a341b37cb25c2ed1dca78eb2b5b7d3724702da04a8fb16d34f374ece475017813f829b2e76c7e2a1646
 DIST kdecoration-5.5.3.tar.xz 34672 SHA256 7b46a3dd3ccbe4de3d0da78062012a478d425a43f6cc85698ceb58bed25c1fd2 SHA512 5789e9de134ebc2b037807163466757aa4f593a180e65721d8971aafe932142c56312d983bb339323a30eebaa1fbaf9a5ce2ad5101dac41f089ea737d2a203ec WHIRLPOOL d413c7e20eba42cd10eb5f7a006fb7e62041159e563003dc32c59425501330a29ed9aeaf0af53ec53b5cf8bcd36e1691e9e668f0aee613b994be5cbf9b4dc199
+DIST kdecoration-5.5.4.tar.xz 34684 SHA256 468c52f1a579a53b368157e29367e60d46ac900fdce7a4067d544a47c1db0fbe SHA512 a228391532b738c417b65ba8c7d254afd21695d88a414aee5a88b8c2456daa74af59331cbf47089c77a7e5c2cbba0f161fde371ab4151aa2466c3ad51b041f5c WHIRLPOOL 07d59d041d444ba62aaad8f729dc4d2b9e68c52f03471f6a03f17c3122ab20cdc4943d5bbbceb15b726df68b3b83daf194261d4f36b9977bf22d84392d79124b
--- a/kde-plasma/kdecoration/kdecoration-5.5.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.5.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,4 @@
 DIST kdeplasma-addons-5.4.3.tar.xz 2076536 SHA256 b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873 SHA512 6f499a19ad89c433f18977485730d27a4d553e2fbf8002772797e7ad08648f6b576848083ae53066b6b6c27ff4ab2d4569952b9427f72610e5d94d9cbe1a2c44 WHIRLPOOL b621a6db0c7cdf2c9f78ba050cd59b7ce1e856087eea93c187884d4f470afb71adc2ff514f59bfe593aef25ac9486a95852b91df020424ff034cd0bcfca7c8ea
 DIST kdeplasma-addons-5.5.2.tar.xz 2111648 SHA256 84664e42c0923cb150574913d7f66eb40115f514f653284cbd32ae223c7e1053 SHA512 c9c38d7a3180d7ae6950fa1092e7a3e0a2083d0ee049ba7c95a8c32dcb795ecfc58b10cebd5a000a34dadc1b77f9c20e548aa032ab9d94e0fd4cf1838308f906 WHIRLPOOL 6b9d10842e547e3fd2c0d1046c3945149413b6a717698934e84cf802da6880acc3defb71d885ddeafd6d59c824cacf7708bf040340e03851ebc3b60ea9ffa3cd
 DIST kdeplasma-addons-5.5.3.tar.xz 2112868 SHA256 3a7caf27515d47fea7d1b22d7dab7297bf47e84ff3ea66498179d1164a2d5244 SHA512 fc5e3015c4343e9a03f3927012395bc4ea693291ca45cbcef814a427f37f5e32b05a3ed8b21ac22ead3327767727225533b19ca500c823a6780a1b22e3f2008e WHIRLPOOL d49a1fff8ddb50a58f598116627ccd2470bd0ceee0fdbe538e6f5a0c7eba78e5479ff8acc242280923589e38f0450f5604ef120f0dfc0ec3cae3a4ca5bdf34c1
+DIST kdeplasma-addons-5.5.4.tar.xz 2115728 SHA256 01c32a04ebae6030a8972415a749b1c2ce2c9cdaea486480b6038b61e094397b SHA512 7a6bb39665012711347e28ef6ed299377d116474c47b8b25bce00dc569b0e5b671e89046a16edbeb0949e8703becb74b96021e9da2a7b514975d705a2d9e2663 WHIRLPOOL e019a40d825d931b400167d072d0240624bcf1a3dc59a09ec463d559c7911be10dedd486bd0fe6b9cdbaad9b6e8aade3c986c17087cd352bdaba568c554c196c
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ibus scim"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	!kde-base/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package scim SCIM)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,4 @@
 DIST kgamma5-5.4.3.tar.xz 60308 SHA256 f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50 SHA512 9417d434a315c0debdec58ca1691babb002485184b5e02f21510dbdcdc4ef37614b96f69b625839efe6266aeb99ae21008a23734ce0201d1992130a29047881c WHIRLPOOL ce0f68e688a794d2959c1e0d0022f3508ab366198c81b2e5009f7745cf3cdb3bc9157a3cb8b3f565d141670a3e9e42c8c9d6d2f88e8a7be85cb948f01d6c0af4
 DIST kgamma5-5.5.2.tar.xz 60324 SHA256 d8f014a434da5ad542031e92dc59c0482f047a88ed50baef996484b1b23b9f51 SHA512 72c1ee7f5870168897c37ff62000e8c06b8be59642a973067f5820336ca77ee7024b6c5fb10a5eb84dac24416e9e8b7af1a03c2d0330a79a1af95fefe214005f WHIRLPOOL 164e0964e0c5963137b169eed745fc60cfe61295a5c1a4bd628212ea65953ab3e7b57be2a4135b6ee02dd6e105835848ff646ec8eda835f8cb524d4b9a9fb269
 DIST kgamma5-5.5.3.tar.xz 60292 SHA256 e48d7bbe90b5a2cde2976650bc466a7ee3037593657df2014ad72b181d0fa45e SHA512 540d14cb946ff64a70223a0105f226accc5ecd6f64d8b0cb5ff339552b5baf068b887d798101084582cce77d92fbe18a3b31075cb2593bc1d89f324a7dca5900 WHIRLPOOL 3241ea50c2208d4a33690569bb4f27465b0ba68e92a06222340fddb5d37817080dc7461eee0e0e8bde9a1db1f0b5719111f07c92732d8456bd21d23aea31a505
+DIST kgamma5-5.5.4.tar.xz 60316 SHA256 82d9e518a32e13042774d014d614294cb0bff2253e7bbf1407ca09dc75a8c370 SHA512 fb467bace44a32728feb679d74e6c232459728f669011ca351d6c266f690110e338167ff8f92ca4cbac4178f372270c1b8c9a279ea1eec96fb09a97314671ab3 WHIRLPOOL e3fdbfe4c4ee29bf01397043d6ae8f8f948a48db2588d673f30550a9526f2f7464cf991925e328c6f3c9af94a48118eed2d569dc93bb7e9e91d3266092219ce3
--- a/kde-plasma/kgamma/kgamma-5.5.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.5.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
+	!kde-apps/kgamma:5
+"
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1,3 +1,4 @@
 DIST khelpcenter-5.4.3.tar.xz 1797076 SHA256 02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d SHA512 63becef909a2c1631f606418b6d2c435797e8ab02b272372c89d214d9ea943eb286bd9ddf644ad956159844bb0996820aa9501cfaf02e943f8bf1093dd54a223 WHIRLPOOL ed6c484a70ff5be1fe8e57944460d8695316b2911a1bb3514485d5685c66d5c7989a3601820d7c5b06120ace611db853b5efb7608ec6b79dd40866407dab7fce
 DIST khelpcenter-5.5.2.tar.xz 1800552 SHA256 3d8047c70928ef1efffcb5493aaa00e2adbfb46734858cbe01fea546d305fefa SHA512 b07dbd746ef1134709020876473ce3dec6beacbbe77b97d8eefdad107dfb8db490c495cb41a6de41c91fed5fc146b481f4fdfe3cb4e5051c82e2be01019a4796 WHIRLPOOL 7a0b7006dc4080e8b2703ad97d882613b282fcd375fa9e2d5531661b8801d0232ece303c07ca6d7d1b2e17cf21ee8187a627a1d047e3a22a94899166de94f74f
 DIST khelpcenter-5.5.3.tar.xz 1809704 SHA256 2c2372dc0611c1a3a017329a2e74a42b69ec572035ffd3c0fe8584f0cb5e5f3d SHA512 e8042c32dcd84bce864bbc1c1d53d0b4a4a250805ce2b35f3b5d120905b7eabc9f8115406c576835c64c706160d083639143ce4a698a741092a35e14532491b7 WHIRLPOOL 33da737f26ceb58fb95636e7524d8ccc2db74fab7b4c87bdb00caf314fcf0481a228faba73012f2b3aec1342dfb5b79dba929df55b47a2410d5366b331a41de8
+DIST khelpcenter-5.5.4.tar.xz 1809816 SHA256 60cb5c0b7d6913fbb3b4b33b8040f3ecfabd46497b4e0f1f7c4ffc1eee497c06 SHA512 ed60d63ca5a50b43377196641d772cbca34c13d453d680e38bd2e5ccdeb993cf85549825425f366923d6fedb068b57566dde2ce7c7bfecd2f9e3f97e5119c609 WHIRLPOOL 17593604987fab20b6d8f067c34bda0c957d7b58b0289e82c964ef31b4101811f661e62a451c1d39ae22205a0b80e3ccf000763a9d1b19b736c207ac1d7d3359
--- a/kde-plasma/khelpcenter/khelpcenter-5.5.4.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.5.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khelpcenter:4
+"
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,4 @@
 DIST khotkeys-5.4.3.tar.xz 607124 SHA256 495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624 SHA512 9e9bbec5b3e6c9e912b7679a5f8bdc3cd59a913c6af5da9dcfd866aafb3706b0edcc5ab13ccaa5a9bd356db2fc749c38b73128510e618de11f9edbdce47fee22 WHIRLPOOL b8cb7bc155d9bd6cd7f5e8fc2058f2acc580d756e14577d6b279252da24054911be08349f35eb4c1b942aeb0e609d2ed5da5d1ef0271f64d1d54364b569ba6cf
 DIST khotkeys-5.5.2.tar.xz 603584 SHA256 4b9d5fd24b3ec2bad004284be8b2beef8ab906bf5680b9c78d0a53d821808d35 SHA512 b9cdd913bba9ab7cc324adfdabfc0892b10dca2f92e9d689b019d5d5d242d690f78cf99f20e23f722983ce3852e37277fd3476c2e63cdff71cf804684fa15db0 WHIRLPOOL cc18a8ae6186cc5e31e1a90a05e55dc6a7b358f01ae1a011a2b1a908b7c565cd3abb93a1b4a17409965e4f735ffe933e8f3a4ef8bd1168b539374c4279988d85
 DIST khotkeys-5.5.3.tar.xz 603572 SHA256 a086458365a3800f5f5b875f0bedf09f3c84e46ccdb46bcb02437dc6adfcba56 SHA512 6228ab6ce3fc696864127a077196ffc6206dd8ffcf45474853ed01990d42a4f07c5d973803cbb4ccfc25b2b5918a104a4d913ba71fbe716a7b1ea0461c69b4b4 WHIRLPOOL 10057d6a6f25c2db2cfc3ca51c550495e0ef547e8f9eed6129afb1864426a5d68cf4ba40b5049bca2df1f23e66373e0a8329d7ced0a1cae4e2b70cfa848edb1d
+DIST khotkeys-5.5.4.tar.xz 603672 SHA256 d6a73a6c8c857a954885b2074b3d039b83cffaf67753ce8afbc90ace33fe97ca SHA512 78fdfc740ccfda80d7b9c828122d0898d878f205e8f0e9591eb772a4a82a9f0f896e40d27ce6de7e44e297803202abff1d074790ae3d7e81e9ce1bf53a6fb187 WHIRLPOOL 1a40f804ab22297db6877cd05ac364ed975417a8c768b035184e2506c51098e856798b94109216c61a632f009b33f989033aa70e212b93e7b1e6616e17da4bf3
--- a/kde-plasma/khotkeys/khotkeys-5.5.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khotkeys:4
+	!kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-proto/xproto
+"
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -2,3 +2,4 @@ DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb4
 DIST kinfocenter-5.4.3.tar.xz 1131908 SHA256 475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec SHA512 9ca50172136607e835be9dc7e9767988b11aa746d9c2236167d36c82858e0c0127f396c0d7a7884a33de025ce3a7f122eadbee0414bc5b4f7f138bea3c2312f9 WHIRLPOOL 419c49cddd263335858e70252809f5771f75ac69f76b0795ca1343195780a49951a6fdf0c42dd2d48e8bfd73b0a1613a6a56d7c335baabfd01f66d0056ba20ec
 DIST kinfocenter-5.5.2.tar.xz 1142968 SHA256 fc5984022db9a3d4580f39ab798cab3053d007314b08a4dbf08b3e93c0f6e8f1 SHA512 67edea63d6680cc7f3130e680166247d14dfc5a8ce674a09bb9dba00abc6d2985d3fdf0a0957874d72702a9dc60b313ac43fd4da1b8c09742a97b95ebb9ecd95 WHIRLPOOL 6f6e08b12bd68ed95f68b389f839ed43d70d807e1079005bd5dd018258af2ee00995a2c1d5918cc698e1db8c6964b30ec4eeb1cf8b806bfe0a815264514743c8
 DIST kinfocenter-5.5.3.tar.xz 1158792 SHA256 00e4204568de11f819cd3a5fa8eaeeb3c75bcd5bb8024b5a9d3fb6eae65eabb0 SHA512 cd6733946336eba62195b7f78e0ae218b857851251076a400df2b66c1edbce44097496cda781b56c009dc5b84ee2b76e64ac5149a72427fa7611a9eca425e96b WHIRLPOOL 9b1ee38a4c9f5c731a0cddb0de39117e6a649693577f7d271770870e37e5b6ee0f3013972d2fa90cc295efa93c2feb639317fd3d46315960c4ab183f75726707
+DIST kinfocenter-5.5.4.tar.xz 1159708 SHA256 24c71af5332b9e16e36ce2d7a1fd9922b90f8ce193c8fcea85aa0605cdc11083 SHA512 58db75c5d1dfde05f0f3df945d70ff24b0423e156c866751e0be9d3d87343d8fbe892fd7d633e29563a3509489b761a3113bcf23ad44ce90123c4ed7cff620ed WHIRLPOOL 86c56dbc924f8faf0248629b98926258fa46ef70dc8ab3ea3fa8eeb67b7ef825550867f72a5c6c21e81842e87d910917f0110cc09f1c261509c551be7b275a40
--- a/kde-plasma/kinfocenter/kinfocenter-5.5.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.5.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
+
+REQUIRED_USE="egl? ( || ( gles opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[opengl(+)]
+	dev-qt/qtwidgets:5
+	gles? (
+		dev-qt/qtgui:5[gles2]
+		|| (
+			media-libs/mesa[egl,gles1]
+			media-libs/mesa[egl,gles2]
+		)
+	)
+	ieee1394? ( sys-libs/libraw1394 )
+	nfs? ( net-fs/nfs-utils )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pci? ( sys-apps/pciutils )
+	samba? ( net-fs/samba[server(+)] )
+	wayland? ( $(add_plasma_dep kwayland) )
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kcontrol:4
+	!kde-base/kinfocenter:4
+	!kde-misc/about-distro
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package gles OpenGLES)
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,4 @@
 DIST kmenuedit-5.4.3.tar.xz 441376 SHA256 36ad27922d8a21a80646d4a9bfa2b93ebc6b1cad6da6dd67799200dec1dbfc7e SHA512 56f0e75b6a2de816bfd822053f4e61c5fb48cd63dc880c44d0d74780cbc694bf548153313fcb4d5c0e89d0e309670cb1bfe4cc051bfb5781c8089710b7a30ece WHIRLPOOL 67462c5cf5d3d00854873381e3c775a7c20fd312ea4464606eeb1331ac530e059239479be5cd46f5d8a02be22b61c24eb29706822e4520eb840b8bd73bee3d85
 DIST kmenuedit-5.5.2.tar.xz 441440 SHA256 99a750fd288440ba2071f6e6ae4ec5b502ead74c3c145225c50daab032170bbf SHA512 d77976da672fba5ae7b3b93d39c520bedf7f767f896e3139dea55a4c39677b981a7c43a050f5bc6ed586733d1324bef466ddcef220d4e1228f25dfc87b694496 WHIRLPOOL 3df19045cd22011a971bc4d629f1c7451ece6fc94b2071e9bc990355a210f0a1815c02a9fc0e6764498e5c632409883ca7426b8c6474a960e277aadf0185a5db
 DIST kmenuedit-5.5.3.tar.xz 441448 SHA256 bffb5867371478c6a25ba4023a480e1cd26036a32e5298c422ca864118c630ee SHA512 f49fbf49656c68576111235a0c7875e9e230a882e0f38fafd79e84ed5d01dfc3e831d03a71be8337d57cfee9ddae558e3277971b55ff971e19feb0fea491ebb2 WHIRLPOOL 93e39401c55496cda0eb61c67a04d1dc542823441be6f4b64d5b2520790c57b386a5d2dc5b0429139884c33244eef25f5ce1dc5de171594344321fbbd15802c1
+DIST kmenuedit-5.5.4.tar.xz 441496 SHA256 46e7a83d7a62b806348e865a4cf1a99c1569acd560de822685a011a7e3c89a69 SHA512 c5ab4ffd000088c4e31c99ef4b522927fab7232b1d2f3b39bd2525f87aecb6239406013ec9c47815830f0f8d65eadbc301d2f237e3d9c0e1d81a97b678be49ec WHIRLPOOL 15af884c54eca227c41c56634a73a261f706b6345e221a0e14e1807bab164dab8dfbcb8e4bd8aabd5494a22df1651a4326b4c2cd00578c2b03f63fbf65383e1c
--- a/kde-plasma/kmenuedit/kmenuedit-5.5.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.5.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+	!kde-base/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,4 @@
 DIST kscreen-5.4.3.tar.xz 100368 SHA256 b95ba33840e950f2c71a601f6623a9acedce5f3b58e5e1eed395eee230266a05 SHA512 da7a7f49c0688a7c1a4b7cb1651efcad00467393521262f7f8c030d9ad3f91c67a46aacaae9a107a29f2bb2b1d2ca4eab2978be3f80f4c9a8654278fdd9285dd WHIRLPOOL a339c4f2693c054f41350d90b6e3678a567f41ef56132ea995d26b1d439fb4f367c0376a7ef5ec438f318b61d0b327530b667c37977c6031d990b323ecc6249d
 DIST kscreen-5.5.2.tar.xz 103360 SHA256 57f5220b2b43ec9a16d8a2aeee1001637d250b781e69f119c0ae3f934d120e4f SHA512 a9ffd997ff03f1533c575df2fe73f259fe02a85b8306c60c2da5fdbf8b46b6a2daaad958776214618ac8145dc3a17bea09993742c852bcfd89097fd315ddc821 WHIRLPOOL 2a726f62e5da36ae374a9ea000b4c1edc146c2c8bc0009232994ff14627dc6c185f957ffa009f6ffa6aae6a259e99ed78808bbd21db4badbc1a29413ebee797b
 DIST kscreen-5.5.3.tar.xz 103372 SHA256 efd6deeedac1cbd912cf724e15b81c8f69f98abc83aba3f2e3c2740a639a248b SHA512 bd3a12e8238eab170b251d5befd23fd08713a74bc2b06c3de47bfbddbe4db6177ed020279ceab9d25af1c82bed882e945ea2a26c45c192388948b812f5457724 WHIRLPOOL 7bdcf7506416cb86847b51b9ef3c108b4393d5a1f10b2285fc0c9bc010e448510c3e6f1bee83adc75b401a7e81a764395525cdb81c1d85b0c29cc0208a84da7a
+DIST kscreen-5.5.4.tar.xz 104404 SHA256 7bf7d826e9021b3fa5e9bb62e1b8ccb88380c7a44e0fc8c794a970e9f03ba62b SHA512 28763a746f1f987d25aa23050667b5474b56d584dde97be9bf66e62bcdb542f8b01f075c325895bc7fc0bdf1041771db96e62ebdb8acd28cc729ef8dca9b5d2f WHIRLPOOL 8fadcbc5f11954abcbb9d8f16b9813607d4bfdfadac4c715b225d8f3270efcffe9951abcb9a7fef79b6564978fadacb419e7958ff56b1bbe20281c6a4edd1b3b
--- a/kde-plasma/kscreen/kscreen-5.5.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_plasma_dep libkscreen)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	dev-qt/qtgraphicaleffects:5
+	!kde-misc/kscreen
+"
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.5.2.tar.xz 97496 SHA256 b5192ac76fd9484b78f78106a565a8b873d6f11095a886e296c284697b5e76fa SHA512 e641e367411329a0b3a75501b6441c3d31cd049fa280e12a8f92cfeb5f604543249dddd3957555b36516033224a43e185b8823c8542b138c25a2fc672584c15c WHIRLPOOL b680e8afba20339d18f42ec1b5e69a109f153b15cd3f98c30300ec023a0c43edea57411d5bee5e9c6d5acda55a63a319408c1ada4e3a4877ddc9cde396aa1fa8
 DIST kscreenlocker-5.5.3.tar.xz 97476 SHA256 89dc3408989cc8b4c551ab7c1713422b9e6229443a2fd17df0f0440e0db62fb3 SHA512 088babdfab9cc221c2b1dc1c3be3324b2cc74ea9c6b3fe5b2e1d7ac94b2d642cb998957a3c0749c3eda34d4c1720e9bc0cd270f1f30897a6b190231bfb8d3021 WHIRLPOOL 7064a9bb59a7497661bc27f65e30ab86628c8be4ba1e2ada6f7adbf87da68cb84a1b95c027261f42d23e31979d06671023fb7f6ffbcb781744a0f36652ce1a52
+DIST kscreenlocker-5.5.4.tar.xz 98204 SHA256 39c3a4272b6f53b26c27054f5efb54c0e88ebb6d6aea3f8a541dc5bc8b1b25a3 SHA512 b70280c5f433ff51b4862be4f9f67ed10f6999fab644a6d982783acd50a3105c79164fbd4a9947280928fa4addea5c41cb6aabb117def70ab0a9b67d43e7f6c0 WHIRLPOOL 578bb5ad5fc41302195dc289f9749fabcbe902e9d820c7bc6b326ec1e39793604eea3ff69be728f467d9eedc63b89f65ba4ead8fc7084072f912d84c02fcc19a
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.5.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pam"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kwayland)
+	dev-libs/wayland
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!<kde-base/kcheckpass-4.11.22-r1:4
+	!kde-base/kdebase-pam:4
+	!<kde-plasma/plasma-workspace-5.4.50
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.90-no-SUID-no-GUID.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pam PAM)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,3 +1,4 @@
 DIST ksshaskpass-5.4.3.tar.xz 19476 SHA256 7eb6025e58e8cd57cab640ab42ff9670ae113317534001be94916610135127a3 SHA512 b8378263806014c225a3c7337c1fcf0a513cf508db718e6154304f49841e0d3744b61a58058093e021f4ace8b282842bb7d90ae5a9ad912af222cbaedaac0aad WHIRLPOOL ed0c6a399bc4338b1b17ea2c790f1f9490eb1f2de01aa3b1aa5dcb8a7c919f5b4895e0eea65c76b624d2071436f1a0c60cc1256d0a320a60b8dccd4ea1af1031
 DIST ksshaskpass-5.5.2.tar.xz 20340 SHA256 8efbfe53f8f99828acbf2253780e6df696dd3317c2a6a0a2590d0f5c5dc40137 SHA512 22b3caf18c85ff20132fde3957bcd2759a90f349d436cf0226202cb0e963df82fccf762800465158a734401a5001f33e9c563564b471fcecff1ee005fef00531 WHIRLPOOL 59de2b1fe4dd1c1debaacda7584ac8752c9c6ac1d593ebde788fcf31480c5c294f695317194a2ff1f3c1221b63644baf48ccec0a6295031205bd0ec8a7ab97e8
 DIST ksshaskpass-5.5.3.tar.xz 20332 SHA256 6b462b304c92b6bde332ad1bcf5f72cab6d7e4e99eb9365d1e6c8740d6dab493 SHA512 f2dc0fbb745a22d238fb1b4a45f0203535d8c637d8d79cb67e9a1f7b0d2d0b200be5664818a2a107ee7f73e2a626e9137b71f369bb7c7bed2a178130b24c9f57 WHIRLPOOL d1acb5a1e6bd5459f26655ddd201e39d6e24518d57cb2c9c18380b8889a5c5de938d89e1d79263521c93408adf8227aac585dc40cc29e7d4223aa92aa31dbf90
+DIST ksshaskpass-5.5.4.tar.xz 20568 SHA256 42c2e64191ec0e42019b99fb1170ad5b368b59077aa6e3ea8e7a6293d0718f42 SHA512 39c8892400499c1711c6cc00aca9eaf761aa03f7d642e4e4b81f32ec1e20a9ee059b3d292b94ad8a772bab594f69ba5db532327da0d870a1d65582b8c4e3bcf8 WHIRLPOOL 709e49e2207ac8501312e14d2c969f29e36681d9d0f7e8c2091e1c6dbd4ba0d14a2373f184bb90db97ac34ddc46ba0275a9e0842f1c1e6df7e423e2e28b56d77
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.5.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ksshaskpass
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,4 @@
 DIST ksysguard-5.4.3.tar.xz 481208 SHA256 935633f75ad167cbdccfee453be9b65d12015db426576d434fd47fd797daebd1 SHA512 77f4d77c4df5ace23479d3cbe23d1da2d70e26c5530549bc24bc821ef3cadcaab38300b0fe211eb597448e9a453a58fa073b03ef798f6696d1a206800352755c WHIRLPOOL 1e40432a5b17bd9a99c933e5e6bc05055ba249bfc2dcdb3807aa02fe55ec732506b98c60e7d7e07174ea2bc397e1860ac851e4d28e262cf65cf0b4040032dd4d
 DIST ksysguard-5.5.2.tar.xz 481400 SHA256 dd0a3b5f2297a75df2a5db871c7de5452ad666c7571de9b3b2065a7e6b543130 SHA512 1c0d25133a80a9d00babdae4d69f1233102cdc174fe6b0933df0656266b3c4ac5f610ebd8f2da50f55dead65193d08fb0ed70793acb5926f62b0d45e17190066 WHIRLPOOL d31be3abce1e13001787fc6e89af8da75c1603f5fda4ecc2861f3728667f7b6d69906ff1a9cced1c616ed8c9dba7784859b7b6198bb24c85a14b3934bff388d9
 DIST ksysguard-5.5.3.tar.xz 481532 SHA256 1d0688e8aea1556f72ce86ef5d0b2545883826592c0679f4fe96599c831dbdf8 SHA512 2932cfa238854056f13358c6c0c8a16cc874bf699a3b6fec175c65d5b396ae2ae141e1092a3987beefb156b185082fe8140153a3f19990322609902fcf90612c WHIRLPOOL 487883f4a3fa731e266d8c259e8bf8088f32e78503455ac9186276668cab30bdf088ac7528b134623c6e69ee1acaaeca0b26bec4a8c5ece9b3154e2350b41ac9
+DIST ksysguard-5.5.4.tar.xz 481572 SHA256 6c86988c437199815e35dc780799bcd987c99defb95125069853c6f4ef4578c1 SHA512 ef277e76c5de76f45c1c2a75ca407ebd76129b347643ee080c941d48bdc773aa4835a4f018e97d414a2fa6f074c6f6e9f166ef69d50fad0f8e183b04f9d3b129 WHIRLPOOL 000d203c7cb09ed63af3e892d408a99d5e4d84c7bfc85b6b41b7288953b3245f0a4685ea8ff9fb0ff0fb80859baa0a28c46c07b5fe3780f5524bcd361e346260
--- a/kde-plasma/ksysguard/ksysguard-5.5.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.5.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-base/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,4 @@
 DIST kwallet-pam-5.4.3.tar.xz 15540 SHA256 a15c1fe1f8b9dc3be2600b93876bbb15cb28cf65a935c066065c516518fabe54 SHA512 2bc79bce836d565aca07e7689d98cd44a20096991e1e57b6d6bf766fa518340421de7d7b47e6c8e8ae749a93af682a4722b6d5b1ce6167cf73248bc4d0795ef3 WHIRLPOOL d0a74950f94f7109ef4cef76726dc3f248795062da712832e69ed620c2df395e938112b9818ad0ff3d337bd68b005c25c08a9e2a53f86ec008a6a85b834fee25
 DIST kwallet-pam-5.5.2.tar.xz 16284 SHA256 c086c5cb4ccccb68514159f95fb39d9f2aa61f0958db92bb0c7e6f1daa14b33e SHA512 27cd972dfbc96f937c91e91a7df11c8d2431c95925cb24827346974b19f69678b06663634c411baf5abe46c14e8d8dcecd14d8b8155afd1ad331e71480c52cc9 WHIRLPOOL 14b58589a618d56e5a86317f9e8fd2712e932da85826a7927aeca889cbf50c5196c2d8835f7837321e06f008319bf929e39e33769c79b5d77c00a9feb75aea7e
 DIST kwallet-pam-5.5.3.tar.xz 16276 SHA256 0ddeca3b84e7085279395956f5064a9dd6065c5ea98cba99bc690cf7dbce9f5a SHA512 83f67b59172b24b5a196391be0ec89b95c72391d8fd501350902b3272944edca29d75486ff1f2565a90fe92068f513df680c52244a1f2de3cb47f6b68e2213fd WHIRLPOOL 90bbbbc8aefe508f1d8b43c4e11b9536158115545b0ce1fdab69ab7cf75f10b314dc4daf3f69bcf5fba77534cce33abe3d8115e90afa999666a7a4ed5539721a
+DIST kwallet-pam-5.5.4.tar.xz 16276 SHA256 14367f03fdb3f1d828747090ef07a7a3b27592ba8ec0211f639408b50e8e4932 SHA512 124fa38fd0b70f98003cf2ede556b0776adc5a97a34c708dda5dc7f117c5a102000ed5395eca9a6fd7013a8aaae29ee75c42ace69b7084d8c199a03852c4c0d7 WHIRLPOOL fc7849b36bd601eb05fd4be37f5e4da8e0345b0e1ae83cdf584baa5960c7ae37d82064bc5da313dbeda58556a1c6044530ab7e7272df3a3aa74a7a150292aa50
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.5.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.5.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5 multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,4 @@
 DIST kwayland-integration-5.4.3.tar.xz 14004 SHA256 17d76337e10c268823be94bb9c7b1254ea435492e9325641e34f847a76b64c81 SHA512 e8ffa0bbe0338ea5e158b150ac6a04e2ce7ede7e9f14ddebab8694f062e6dc928f6e44772ebc26b03cccc9693a6a8f697bd3653877413ad3b87d1dcdb5aba37d WHIRLPOOL bf147fd651132b8d45d7df8617ee9f6b994c51de078857380653ebd93a493ac9b2642666316ab6c9af3975fbe036a0a7b73830276e67b1960f6f749b5a88cd05
 DIST kwayland-integration-5.5.2.tar.xz 17072 SHA256 db2ed262f18865f5b1dfe2111a386c25f4b40427162996b0bab396f37dcd9f25 SHA512 3a89340013338c243eb2ad4b7974a93c6ac4bf295a15eeecf0a14899725ebc57327fa60b70d3ceac095961e0532ff7665dc97500448b851e6a547debd7936b7e WHIRLPOOL 6383f0ac91bd19784d60c0095df1f313eb32045d60f87109c66ad69bd1c0929619071ffffac754e45710aa2215db0dad0a1094daa4c13032d65f0b10c68fda4c
 DIST kwayland-integration-5.5.3.tar.xz 17064 SHA256 254559a4d8db86b3babdc196e5e988e4011bac578db90bef7a849465f046d7fb SHA512 ed01491ca14c7008b9dc41a9b056e9a3b086dda74cce1b376b2a9c58bfc62fe4f9e8f5a9efffb15cfaa0554299f96129a436eb8b9fd8b84a8489f6d9cad790bd WHIRLPOOL b13be88cf99ca046f5a2e7e9bbd095b3449f43f716523fe97c2f32c55043e43406dc35d7d899fa0bd772520dfb6dbff99a69e63095f64a7f7e84b733aec14450
+DIST kwayland-integration-5.5.4.tar.xz 17080 SHA256 5e3a5489680a418b5d5144dc3d8d862d9781a2b02e5a738d39f6d587e53b7b1f SHA512 bd8c125e48148207bd58cdbcb51e80365a483b3e8fab117f7ce9e72328017a4af38ab3ec74e6dde7afe93a3a25d38af9d2ae4fbecf4c732918a254d4d30d8fb3 WHIRLPOOL de65355670d18d4789abcc43c8a0e61202db2cd5d9886ceb26d62d4efa66aefdaccbc7cd4ec77ecf9c173558ec2c786bc9c44e977f267baa59abc918f5a2f579
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.5.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.5.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kwayland)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1,3 +1,4 @@
 DIST kwayland-5.4.3.tar.xz 111608 SHA256 8085ef636c91c83c03eddaac0de7d8e7f56f08884ea8aa72fb63b9b93d7fd208 SHA512 3c247c75ff6d8cc469db0389caaad4b407e0aeac20bb4959689b3b40dc8eeccb03819d2fd2315c3074f9aa447e338ab2850743c2685913386dee7319a6558f72 WHIRLPOOL b55e4d103f671cc6f1d95d048b034d406d6435b8b53b337f976d4f7fdd61ce4dcc5b3787e122ec5ea5959423faf5cbe8ce546bac97c6d66b76c7766355daa8ee
 DIST kwayland-5.5.2.tar.xz 159696 SHA256 bb8257c862a480116988424cac75046025fae58d4c12c861a0093e1fdce82fc4 SHA512 bf56c6a02676c36a4ed0e38acbd853d9d7d616636f8763f9dc808577a491eaee06e084e7d55fd1bc69c18b5023f3993d0f0e63d837d807dd6b778d44c942ae6a WHIRLPOOL 0f92caa61e01a2f1a8a403ebcceb64da1697ce378967625183c14c6f338b342d7979a6dfcae483144148227f432beb829f36cdf4b9b254424e02165dd648935a
 DIST kwayland-5.5.3.tar.xz 159700 SHA256 df5240a9fdaa531e27b0b831fc30a546a4c670f0fab13eed0dcb090fef27bb4a SHA512 baf128a5ae751f884b62ffe9a8f9884a048c305d5afc28446e95ddee7ac6e9113b04ac4c753a17a8a225e2fda8f7879aa9160f892198e2c5af0bdde5b8b8ef34 WHIRLPOOL 4bc9c4b2dc8906137079b06dd54c4077f92366792a512be3f0aeccf98d0b5a719d11c1113d3a09758b9996e41839235dc067e9e454edce30e51150d9db49f0bb
+DIST kwayland-5.5.4.tar.xz 159752 SHA256 9797977706fc66ea0ec4ab8f9e1466cbceedff45a082900cf2f622785078f9b2 SHA512 80e4e099cc5bc84717bdfde694c649e261b896dad643cd16512d0757eecb3eb06ad9a6300356d2d4a8b9fcc093c12e51e4f597b28bb37d770503f960440ccaa9 WHIRLPOOL 3bff730d8c516797ed7fd5226f395ee3cf0e637289fda87535aaa69416bfbcc5738032d6778f5ee0bc62ab2cfd0cdf0c190076a51f3c9a805cc19b0caf9dcdd3
--- a/kde-plasma/kwayland/kwayland-5.5.4.ebuild
+++ b/kde-plasma/kwayland/kwayland-5.5.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/wayland-1.7.0
+	dev-qt/qtgui:5
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-5.4.3.tar.xz 3790076 SHA256 ab4842735dbee91e93f0d0dadb39df4aed234346010caeb3c2fcc230562ac366 SHA512 dcb4c006b06653950f52a9583dcf3a23cceec90fef7e629dde9fff4e683ac406b64425c136a3c9c774e4d2946a4619c263af93b87e803237ec618911c9d32759 WHIRLPOOL 8fdff9ed2204b810549a273a01c2bb39caaec2ec073262516f8cdf9e57c745d0d2d2f45a2a71fa820b26d5672d6558422adfd73575b0b6d2cd1572b68d2485d9
 DIST kwin-5.5.2.tar.xz 3811768 SHA256 97f4f51fc65031a8ce7ff3ac0fa0e6f4a67b34661047c72e80c4b4b36c1d9e32 SHA512 e0eb472542e887fb386f19e23d4628c40f234b95957a0a0b63148a6919ba81f66003d849a4591d341852dd49a946b3b1c33a5b7c4e8002b1505369644e82c9dc WHIRLPOOL 2a99237bc2d61ad1dc1689202340a02450264d088a71c2ecc3f792a48204193c75a360dfadf8ce4747f867d3129fcfd903304731d3120dda486af75465293848
 DIST kwin-5.5.3.tar.xz 3812084 SHA256 e058451c08c16592d1d60dd3a3a2935b2ec8dbdb719aedfe616d174151ed4fc2 SHA512 35ac4a36a5ab8ccf9ce5991d57838b5d79d9abc572c08c09d674e74ab5ac4e8321d8cdb66c0eb418771eff21a6c72362cae8b0c2d11b29b12c35814a85d72c45 WHIRLPOOL 525c2f36519a8f7eae21fbe5eb19d51196b20a677f0a19ccfc0829740b7ca6ed6cc95d8a17d865f8d10db03fab4e2ee23249f45506a700e285ecc4189651e32b
+DIST kwin-5.5.4.tar.xz 3816804 SHA256 4872a9f2eb968f1f29fac96fe87bc80052ddeae083e6e97424ab443f1a502580 SHA512 eb89b89e392ecbd8b3f798a5fa9f41c03e764d46f3b8198d5b6326c7d4e9f0088540208ad1a24a6075ab47d474aedc12153451249aa480e7674ca5e3a312f136 WHIRLPOOL dc9e97c7148a74d8ce532ae3e1bc0ab7c8576b15b249f164a81b63b03e890efd4ea68565de53e407b80523a6d2dd462cdcbc8d28f6aa0612209bd0cfa7566ba8
--- a/kde-plasma/kwin/kwin-5.5.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.5.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 multimedia"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwayland)
+	>=dev-libs/libinput-0.10
+	>=dev-libs/wayland-1.2
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[gles2=,opengl(+)]
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.4.1
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	multimedia? (
+		|| (
+			dev-qt/qtmultimedia:5[gstreamer,qml]
+			dev-qt/qtmultimedia:5[gstreamer010,qml]
+		)
+	)
+	!kde-base/kwin:4
+	!kde-base/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	x11-proto/xproto
+	test? (	x11-libs/xcb-util-wm )
+"
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,4 @@
 DIST kwrited-5.4.3.tar.xz 19484 SHA256 d3835c5f17c3209feb9d0abee0d179cdd78881c7c0d1b3fcc05a7ff3f5863647 SHA512 090895091bb9567f578d46880a86c62f9ac7f2b43167ac88ffb1422f0d89fa964a2a96ab237f3ea56f10411121a24f63e163691d5f140a6bf2817bfed335332c WHIRLPOOL 74a868f3d56bde4b9d3635ba3bcb7c314f4414ba922a1aff1dd3f2b564bc583201c74fcfdbd3d6b6dde03ade82e351c04baa91b90d1084d7396845631b547741
 DIST kwrited-5.5.2.tar.xz 19508 SHA256 08be0bfd844aa57f9c67e26258e53d09b114a8ba548ddbfa8f514f0fe35ea63a SHA512 d6f81e9d3c2ba01a8d7e232f1ec32ba8c5c57ee6bf08c800f9f54ee0c7ca3ef9506a9ad943653b1f65f8397f6c37ffbf1dfe80a70ad9276ee59b07f6c5ad365c WHIRLPOOL 04a92ded4ddadac5bb113e8ed95ce1ff504269f411df60e6b9611936363c9829d15b8c9b86dfce3cd62708bbd97108e8e29b1a0beccf7f573ac4ffb8161588c2
 DIST kwrited-5.5.3.tar.xz 19500 SHA256 a93fd5f0ce17f950cc212c345e44279fea92919bd0fcfee7b3a32a1691beefad SHA512 b6d76c16b5f34950366d2a59000befdbfc31a3b5ec1c0c19e5142fc5cc58ec02d6e5580d1f994954d03ed0eb7bd96b7b60f2bd075eb24453b955b38978a2d126 WHIRLPOOL 7f1d3622b9ae5074d022caf59c5df0fa74c1fd3c3c2b998bc475d33f5352d7a666c2e7c0dc29ba8d29a907f058fd9dc555e33fb09559512cbc725cb38671313a
+DIST kwrited-5.5.4.tar.xz 19504 SHA256 d0b9b777eb4fe3ee256c2274ed88aaa42d6ac5f7fb6da59daa30bb22e1c0a805 SHA512 9c47ebe783ac175db057d91e508cde47d0202c77ae8a9635dc081a3328d60c71738e45d7094b38f1694ce014ad610ff521784e6c3d180ddbf0e0ba50a1a53470 WHIRLPOOL 400f98e7ea549f36287086eb844618c50327329dca66046abec58469bfaa3ee7450731ce2edebc713f85129ba4b6419022275eec7342fa5a25e22c554f714170
--- a/kde-plasma/kwrited/kwrited-5.5.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.5.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-base/kwrited:4
+"
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,4 @@
 DIST libkscreen-5.4.3.tar.xz 72244 SHA256 1d2b17c4e10edc4bd7ce0f220f2b68eb3522c76c2708b0ddc0c2f6bda7794975 SHA512 483b65a55bf84f3ac7915e5e4d2224d71b86dc2a58697219bdc53af21df9cb65c5c950cf550a4b172e464bd7f9d3da93fb7283601d1e6fac8a5c18a4cb7bab90 WHIRLPOOL faca84131edd21d922c18040c2c294531ca16e82e1f516aecd7247be0039b4dfbb758b2f3b3533e769c59dd5bbcb658583418a98921f42515cf483731c78edb6
 DIST libkscreen-5.5.2.tar.xz 71916 SHA256 c2ba28d1b3777b0cd0912a49f875622f08b6c9ccbf1f50cf21162aba3e564a09 SHA512 e32ea155a551901536282f9666c200e836854b78fe35d003e0c3c201440253c1696888ba969c25eb1843ac94400ab51b91c24a2c5e7f17e82a7a00561d3df183 WHIRLPOOL 35864dd75a89c3353740755be4f0d6cc957e34c7f8ee951cebe348a0bb7194a44c452f00f8fad74933d11037bffe165146eaed3ca92da66fc31fd8bc5f16029e
 DIST libkscreen-5.5.3.tar.xz 71892 SHA256 5ea0e08c8eab60520e2db4d8b5b573fab6e08117f6749877b415c878b13ef511 SHA512 a46182133980900307f3fd2eb6230487ac608a1e5817427ed2f75cd1c33e5abae9817339adb01c23dd266ee62cdc367102f3ee45bc71b76fcff6c300b24ef749 WHIRLPOOL 9ab614641a673f4c0ed3c69bb1b9a4ead5d56e2d9df29f436111dfbff32365e8b3e1cf31e6307cff401167e21546b986c2d398e8b457d78ac9705993e408dfe4
+DIST libkscreen-5.5.4.tar.xz 71864 SHA256 aefa612c29be8e1b8458061cea8036a6e7fd3ca704ce3a56099fa14e08ea0797 SHA512 c9cab62f5a00624b0e21ce5241afe5c9f816092bf1e5286dd0aa680a12b3dc3b5bcdde5734d3331666cd930c85dfa088e0ef875d8fc2311d33f49ee9587e849b WHIRLPOOL c153d7c0df593b038eab657bb3c0797c3d54d3d427b139e41307f1155d3dd162b40b1fb5c9fad2e08aa2c5bf0e00865a6e7216f9c5fa8a574df3969348616ee7
--- a/kde-plasma/libkscreen/libkscreen-5.5.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.5.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE screen management library"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
+
+# requires running session
+RESTRICT="test"
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,3 +1,4 @@
 DIST libksysguard-5.4.3.tar.xz 561892 SHA256 d1d858b60d83ab6acce176647a35dde98cac483f02ebdce3ca7cfd25e46cd6a1 SHA512 a7ed47c1ae6985ee213103f51a96d09bb93c6ab3693cf6aefb2f88db14c817943d7d1c3e6b3c38495557dc533b5fa7cc9f881a09002d16b7ab3d4d71a88534ef WHIRLPOOL 0390c0ca26795d07f2d6bf2c534c811650075ee3185c8a2327b24b6fe8ae4c763a4d4c84b08beec80a11e5d0f44a08e5981884036acb5ce410ecd366c469adfa
 DIST libksysguard-5.5.2.tar.xz 568352 SHA256 c5963b31f617ed84f02ad4ab6976e8635da1c366c593d1fed83cc5b1248f99fc SHA512 b2223f8a415a03a660cc833acd3456a6d0f9af478a000f4fcbf36be4692432813d13dac8516e5b9a8170bce6c4ff6be8746b059c7e00f5ce88dd128ffceb0090 WHIRLPOOL 8b90e724934e77d05dba1b80963525cd456652217994995560d1e3b1fa895d334b2ea8da266f1e2f857bad8d8a91407e61a9eab3a0e820da4ef4594c568bf84f
 DIST libksysguard-5.5.3.tar.xz 568336 SHA256 f4e972fdb97b51d7a9ff2fb2b5898d174bfca4ceb7e568d2f88e5e7eef5365dc SHA512 93b61094d093b681cbf5c9ec9bb217557c81b55d029f729923e2cd1c9ee4bc5d15bcd85f6250a24a8007f01a2c49ff0ad7f59c3352b1b60b3b2aeb07b0f053c1 WHIRLPOOL 1ac30c831cff523b70ddef7eb196aaaa69305a03ef71f34dbf35f6e2bcc0a34a4c3cdf8c2a69fa1f957d83545afb64f3cf08a315782bd702d649523dbc0faf05
+DIST libksysguard-5.5.4.tar.xz 570140 SHA256 81573caf0d2110c0c4ea934c91fb7d117dbc6ec40b9c7227f4283f50e35839c7 SHA512 43da318eb9258e2d9e85fc318039f0aa7c25f4fe52c6104e17d3793eb39a200ab60f79be14d5268535363a33c08e111a3cd61a3e3a6e77e9c8615b5540060de5 WHIRLPOOL f651c837085103ffa5e7f54a1ae46f31eed60ecd7d8cf5e42b972e166b6817bbeac1ec0a4e831eba49784ca4a0ff8017ec139523a3b40b5eb52858fb6fcba51e
--- a/kde-plasma/libksysguard/libksysguard-5.5.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+detailedmemory X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	detailedmemory? ( dev-qt/qtwebkit:5 )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/ksysguard:4
+	!kde-base/libksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep plasma)
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,4 @@
 DIST milou-5.4.3.tar.xz 51492 SHA256 e1487fc818435c25830962e0cab9b78938de4d48c332583ace87681e6080c677 SHA512 cb1f983c9b8f83496ee8348f9dbd3c7fe4ec3c235b1acb21a32dd515cfbf00fcffa45e8ab4516e5a43779e41f23d0dd3a044be16127c65d3cb3a67eb8d662a54 WHIRLPOOL b8e0f23b591e4573836074fcc160972cb11a93ee10c033bd4fc8f33c9d4ce06e5cd9c108c4d00ca273a3a4b76b0a381304dde79cf3f2fe947fe62442a0587e18
 DIST milou-5.5.2.tar.xz 51584 SHA256 18b8c1b24ff5b768f5d9b0e313cf2702bc6da57bb817100ad7165f4fff4811a0 SHA512 b4e7666ad4686cc71f27895c2c0f5e16fb81bb998b8b761d2d6fc57f98d317c092d31ed4f3701a9bb2593f8c65b994036c4360b7025ef2baf2d2822ef4d79b2d WHIRLPOOL 083df1bb3b3dfdca69c7665ce1e76d78e4ccc05edffb8ca8371efe6cf563278951b227320ec103d6fd144aea32a226291dc9a6cc42792bc63c6dc94a922986bf
 DIST milou-5.5.3.tar.xz 51608 SHA256 22d97f638dfb951afd6115b708119f89f8bd813455d8be0018ad5488fab8ad69 SHA512 05c3489e871ec566bca598251d0d5799ddd7ecca6cd2080cb95e28efe84a2b3f92c1696fbba7f73ded8b8419ef76f1fb61d84a96099a45445ff3887b68e484e1 WHIRLPOOL ee0feb7d1b7db7b132a64304f8f6b6eb5de6f7eceb847be0c7dd97692d824463b7aef02c1a7bbb62172c6894c19c2a22ac2324b48157fe0328aa29df05f29d6f
+DIST milou-5.5.4.tar.xz 51920 SHA256 b43516549bafc82cb110387568d630d77bb76b162192d665d918460fe6928835 SHA512 0699a95c48856ec51c02afeb914388af89f0f033ed1da1bd36272668ccf6adf09579c8a3e67bd70635fc6062cc2dc16f1252afe603cf5cb07a7dd0216e4db815 WHIRLPOOL 4e0ed285cfecd42b73e4f23809f99ac1a582a336331289ec2e5b3fbdfcf025fdcc999b2add0d7a0529806e26ba426e6c921b5e7c10e75d58ab944f350f08074e
--- a/kde-plasma/milou/milou-5.5.4.ebuild
+++ b/kde-plasma/milou/milou-5.5.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-misc/milou:4
+"
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,4 @@
 DIST oxygen-5.4.3.tar.xz 4508180 SHA256 0510483df7c55afde204c1927bea3ea1f2135761d0615c44f204e127743166ab SHA512 822cd897869afad160439d41f847590314a0d6c3135533384d90880366d8fe098590c9d0edad28f600607ac1c1e6d666127d6ac2b0be05b8683277adbb66c2ea WHIRLPOOL 94d55efdd725f01d8afd47452e60ff63ee980a15cb4a561651e1bfbff9a896d5e77876a213ab2ade081156cf87edc430749376522711453e2d7b91e0ffe81388
 DIST oxygen-5.5.2.tar.xz 4453872 SHA256 770234c8167a1ccdbce81e428ec7367b366bbf64aca4f2e79b9a30ebbf5a3561 SHA512 2917b6acaeb818a0fa0d8ca70cd7670cad8fe774d17a62cdc0d7a2d2a42320c96ca05317d5b73ebf241811e36ebb509238b674b007ef2aa49c33340892dc4eaa WHIRLPOOL 7b5c4cc6c55b584aac084bd701e989ae7792cbc81fec8503699b2f25d439fcf5c86793917e2abc9df45ac5dd0edd65efd6a98befcd5f60d53f0a24624c8d0c93
 DIST oxygen-5.5.3.tar.xz 4453844 SHA256 b67949c20e1d4783a88f5b6f3ebfcf9e38f619e288c91a0532f512c674dad6e7 SHA512 e9b930b4c5b8f891c2a20f4f5cb051e0cc954fcf078be534a73df228dcd4fb80d82c78eee3f9f4d0277407191793f76416ea1a68d2f39048f9e59e962188b84c WHIRLPOOL ec7ca3ae77633d022d8d92f304744dfac26448487b193725918bae2090fc1ec03e34754e3ed517d404c3e58c3b5d7caa52c86132776fc2ae0c804998c4713a2e
+DIST oxygen-5.5.4.tar.xz 4454564 SHA256 3bf4a86d243424b88c80267560858f8246292f7733984495cdf3daafc2e4d281 SHA512 ab225e40bf38272bfbccc04e829738ba6e1b458518748152ce0c7fe6dd4662ed50b90641a1eecd5deaf8d81e05117710c2f2e388c48bcff49a0c4ce11140a188 WHIRLPOOL aead01dd40d0d417f3e11f404de7b3af81f4751c3bb2d5b2f6e97dae9ccf772213477a781b8a38b39fdfd7c5cd8502c3f816df40a5da81d0a1a1003d788eb916
--- a/kde-plasma/oxygen/oxygen-5.5.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.5.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE window manager theme"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	!kde-base/kdebase-cursors:4
+	!kde-base/oxygen:4
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`DIST pmk-0.10.4.tar.gz 208475 SHA256 bde39a1fb1f0612446838f4845f44f1a0a2adb9c62c2d0f9e3ca58c61888a569 SHA512 906ee690b6cae55d54b1e248847a61ddcb15d7404fb8914040047876eb906f868607b38b59dbbd9687a0f8b409d6c3852249d558119af1bea4c64775f34ea32d WHIRLPOOL 9f4c8295b53c3fe9cdbb56fa927ef05bdef7b36e8852af46ea362ba738283eaab69d5e486edcab654e0650f11339ad3ba25216b6e219531c678d6c166b8fe914`