Merge updates from master

25 files changed, 457 insertions, 382 deletions

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index d1f61a2cbd0e..082892ae7c88 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,6 @@
 DIST docker-1.10.0.tar.gz 9966458 SHA256 4321baec0839a0f57b9bb3a20d84f2ab1ff045fbe631c3aa76bbc1db67012635 SHA512 dc8c421e704990882dce26d23929d71dffeac605e07d595872f1fa5c0920f214a368c902ecd7c739f32a468c276001acf3cef1676aeaeffc8e4530ec028db070 WHIRLPOOL 583f186e338624ddb8d67941e62c5cc9f12af99a13939b20739dbe2d46eff0b3aa21fc8dec508d7b6f8dd13c4ff4e0f52cf7afd174d5289f7966c2cfefa3a081
 DIST docker-1.10.3.tar.gz 9973680 SHA256 6b72fafa4c068a95133f5c9fda9fb148c9412db7a932800689e259a1b1c7ef6d SHA512 0e8f1dc80b8600a3a2d36a0e2a5c1a5cdca540198dafb9b6e32e79e7a2d2bea3d822ec310d6b1655fd0c91dca03874fa93b3ddb77e59607d62aac4fe6062c0da WHIRLPOOL 0d1b09868e958bfad5a722f60a73847ba12745e36abc11e04ff074546728967ccbaf0cf4554dec70dcd97169a2c684144d5cc171ef3b9bf0ba438daf37c24269
+DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
 DIST docker-1.6.1.tar.gz 5713944 SHA256 aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e SHA512 d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2 WHIRLPOOL e12c799ef63a0646f7393b00b6c1e200f350f7089445c58819ae5b53d66d18d985cb9f8fde1cd3ecfa55c2f0186064fc7080b7ebba132404aa15502029881602
 DIST docker-1.6.2.tar.gz 5714121 SHA256 f3a031b23ea9ff0fdbf3ffb9449c64ec51bb053491b47b28000eb4cce9f23203 SHA512 c27bdafabcb8ad2e49bee9e1529141a25596ba2b59435fb9368fc406950d0d7d1cbd876f1f4248dfc7089a22b8a2d13009dd164bde87e37b95a8e502bb49cac9 WHIRLPOOL aea4105ba30104d751203153b6208e363ce0abb3145ee134e675c4bc640e888afb281e7ba9009a30b9af37e829185684427a33b947d8710b49562e3352526c06
 DIST docker-1.7.1.tar.gz 6853527 SHA256 9cd26415d68a88d3cf576e7e78c2fe97f42af795404f552728acc5b41dccf4ef SHA512 9b32c3deab77a27a4322a3ccbb3759a2c2a5627605090c4517c3754e6821407abcf5ffa227bad1fdafcbba068cdcaab586015dd8cfe9aed7e8a221d0615463f1 WHIRLPOOL 41b1afd8ea08c3452e5658d73e85c3b79a64f85fb4cb99c4c6a2ce1ab49836cebbe14724afe47898cb8d9bb9d4d69c64ff1c061895f3b9534150bc7ab50e2b22
diff --git a/app-emulation/docker/docker-1.11.0.ebuild b/app-emulation/docker/docker-1.11.0.ebuild
new file mode 100644
index 000000000000..eabd8d83dbbc
--- /dev/null
+++ b/app-emulation/docker/docker-1.11.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN="github.com/docker/docker"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit golang-base git-r3
+else
+	MY_PV="${PV/_/-}"
+	DOCKER_GITCOMMIT="4dc5990"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 linux-info multilib systemd udev user
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? (
+		>=sys-libs/libseccomp-2.2.1[static-libs]
+	)
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.8
+	)
+"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+
+	>=app-emulation/containerd-0.2.0
+	>=app-emulation/runc-0.1.0
+
+	apparmor? (
+		sys-libs/libapparmor[static-libs]
+	)
+"
+
+RESTRICT="installsources strip"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+	~NF_NAT ~NF_NAT_NEEDED
+
+	~POSIX_MQUEUE
+
+	~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~IOSCHED_CFQ
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+"
+
+ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_prepare() {
+	cd "src/${EGO_PN}" || die
+	epatch "${FILESDIR}/docker-containerd.patch"
+	# allow user patches (use sparingly - upstream won't support them)
+	epatch_user
+}
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a zip, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if gcc-specs-pie; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	# https://github.com/docker/docker/pull/13338
+	if use experimental; then
+		export DOCKER_EXPERIMENTAL=1
+	else
+		unset DOCKER_EXPERIMENTAL
+	fi
+
+	# time to build!
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build the man pages too
+	./man/md2man-all.sh || die "unable to generate man pages"
+}
+
+src_install() {
+	cd "src/${EGO_PN}" || die
+	VERSION="$(cat VERSION)"
+	newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker
+	#exeinto /usr/libexec/docker
+	#newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	mkdir -p "${D}/usr/share/${PN}/contrib"
+	cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index 02a19fec8092..eabd8d83dbbc 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.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$
 
@@ -10,23 +10,23 @@ if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
+	inherit golang-base git-r3
 else
 	MY_PV="${PV/_/-}"
-	DOCKER_GITCOMMIT="d12ea79"
+	DOCKER_GITCOMMIT="4dc5990"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
-inherit bash-completion-r1 eutils linux-info multilib systemd udev user
+inherit bash-completion-r1 linux-info multilib systemd udev user
 
 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +device-mapper experimental lxc overlay"
+IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
 
 # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
 CDEPEND="
@@ -34,6 +34,9 @@ CDEPEND="
 	device-mapper? (
 		>=sys-fs/lvm2-2.02.89[thin]
 	)
+	seccomp? (
+		>=sys-libs/libseccomp-2.2.1[static-libs]
+	)
 "
 
 DEPEND="
@@ -57,9 +60,8 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 
-	lxc? (
-		>=app-emulation/lxc-1.0.7
-	)
+	>=app-emulation/containerd-0.2.0
+	>=app-emulation/runc-0.1.0
 
 	apparmor? (
 		sys-libs/libapparmor[static-libs]
@@ -170,13 +172,14 @@ pkg_setup() {
 
 src_prepare() {
 	cd "src/${EGO_PN}" || die
+	epatch "${FILESDIR}/docker-containerd.patch"
 	# allow user patches (use sparingly - upstream won't support them)
 	epatch_user
 }
 
 src_compile() {
 	cd "src/${EGO_PN}" || die
-	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor:$(get_golibdir_gopath)"
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
 
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
@@ -187,10 +190,11 @@ src_compile() {
 	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
 
 	if gcc-specs-pie; then
-		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
 		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
 
-		sed -i "s/LDFLAGS_STATIC_DOCKER='/LDFLAGS_STATIC_DOCKER='-extldflags -fno-PIC /" hack/make/dynbinary || die
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary || die
 		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
 	fi
 
@@ -202,9 +206,11 @@ src_compile() {
 		fi
 	done
 
-	if use apparmor; then
-		DOCKER_BUILDTAGS+=' apparmor'
-	fi
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
 
 	# https://github.com/docker/docker/pull/13338
 	if use experimental; then
@@ -224,8 +230,8 @@ src_install() {
 	cd "src/${EGO_PN}" || die
 	VERSION="$(cat VERSION)"
 	newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker
-	exeinto /usr/libexec/docker
-	newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
+	#exeinto /usr/libexec/docker
+	#newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit
 
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
@@ -247,8 +253,9 @@ src_install() {
 	doins -r contrib/syntax/vim/ftdetect
 	doins -r contrib/syntax/vim/syntax
 
-	insinto "/usr/share/${PN}/contrib"
-	doins -r contrib/*
+	# note: intentionally not using "doins" so that we preserve +x bits
+	mkdir -p "${D}/usr/share/${PN}/contrib"
+	cp -R contrib/* "${D}/usr/share/${PN}/contrib"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/docker/files/docker-containerd.patch b/app-emulation/docker/files/docker-containerd.patch
new file mode 100644
index 000000000000..c53e82eda808
--- /dev/null
+++ b/app-emulation/docker/files/docker-containerd.patch
@@ -0,0 +1,22 @@
+diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
+index f0284ca..e44a1d1 100644
+--- a/libcontainerd/remote_linux.go
++++ b/libcontainerd/remote_linux.go
+@@ -27,7 +27,7 @@ const (
+ 	maxConnectionRetryCount   = 3
+ 	connectionRetryDelay      = 3 * time.Second
+ 	containerdShutdownTimeout = 15 * time.Second
+-	containerdBinary          = "docker-containerd"
++	containerdBinary          = "containerd"
+ 	containerdPidFilename     = "docker-containerd.pid"
+ 	containerdSockFilename    = "docker-containerd.sock"
+ 	eventTimestampFilename    = "event.ts"
+@@ -338,7 +338,7 @@ func (r *remote) runContainerdDaemon() error {
+ 	}
+ 
+ 	// Start a new instance
+-	args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
++	args := []string{"-l", r.rpcAddr, "--runtime", "runc"}
+ 	if r.debugLog {
+ 		args = append(args, "--debug", "true")
+ 	}
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 20a02d879a83..050f0c4fc80d 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -451,19 +451,10 @@ _calculate_src_uri() {
 					# Last SC release
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
 				4.14.8)
-					# Part of 15.04.1 actually, sigh. Not stable for next release!
+					# Part of 15.04.1 actually, sigh. Used by kdelibs and KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.1/src/${_kmname_pv}.tar.xz" ;;
 				4.14.10)
-					# Part of 15.04.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
-				4.14.16)
-					# Part of 15.12.1 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.1/src/${_kmname_pv}.tar.xz" ;;
-				4.14.18)
-					# Part of 15.12.3 actually, sigh. Not stable for next release!
-					SRC_URI="mirror://kde/stable/applications/15.12.3/src/${_kmname_pv}.tar.xz" ;;
-				15.04.3)
-					# Files moved to Attic
+					# Part of 15.04.3 actually, sigh. Used by last version of KDE PIM 4.
 					SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[4-9]?)
 					# Unstable KDE Applications releases
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 44bc29631a56..dbcb229ab9ec 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -41,7 +41,12 @@ esac
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DESCRIPTION:
 # Minimal GCC version to require for the package.
-: ${KDE_GCC_MINIMAL:=4.8}
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+	: ${KDE_GCC_MINIMAL:=4.5}
+else
+	: ${KDE_GCC_MINIMAL:=4.8}
+fi
+
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 313e0609d175..675023b6e515 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -27,7 +27,11 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	esac
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+if [[ ${CATEGORY} != kde-frameworks ]]; then
+	EXPORT_FUNCTIONS pkg_pretend
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
@@ -337,9 +341,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 # Do some basic settings
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_gcc_version
-	fi
+	_check_gcc_version
 }
 
 # @FUNCTION: kde5_pkg_setup
@@ -347,9 +349,7 @@ kde5_pkg_pretend() {
 # Do some basic settings
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		_check_gcc_version
-	fi
+	_check_gcc_version
 }
 
 # @FUNCTION: kde5_src_unpack
diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild
index a9c6b6e0b4ca..6e449b0527a4 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-15.04.3.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$
 
@@ -10,6 +10,8 @@ inherit kde4-base
 DESCRIPTION="KDE Wallet Management Tool"
 HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
 https://utils.kde.org/projects/kwalletmanager"
+SRC_URI="mirror://kde/Attic/applications/${PV}/src/${P}.tar.xz"
+
 KEYWORDS="amd64 x86"
 IUSE="debug minimal"
 
@@ -19,4 +21,4 @@ src_install() {
 	if use minimal ; then
 		rm -r "${D}"/usr/share/icons
 	fi
-}
\ No newline at end of file
+}
diff --git a/kde-apps/pairs/pairs-15.04.3.ebuild b/kde-apps/pairs/pairs-15.04.3.ebuild
index 33fc5fef62bb..391590ccd794 100644
--- a/kde-apps/pairs/pairs-15.04.3.ebuild
+++ b/kde-apps/pairs/pairs-15.04.3.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$
 
@@ -9,6 +9,8 @@ inherit kde4-base
 
 DESCRIPTION="KDE memory and pairs game"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/pairs"
+SRC_URI="mirror://kde/Attic/applications/${PV}/src/${P}.tar.xz"
+
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
index 47b81e50d418..eb6fc3c2256e 100644
--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
@@ -12,8 +12,10 @@ KDE_HANDBOOK="optional"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
 EGIT_BRANCH="KDE/4.14"
+APPS_VERSION="15.12.1" # Don't forget to bump this
 
 DESCRIPTION="KDE libraries needed by all KDE programs"
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
diff --git a/kde-base/kdelibs/kdelibs-4.14.18.ebuild b/kde-base/kdelibs/kdelibs-4.14.18.ebuild
index b44a85f24346..3aa7aba09ee6 100644
--- a/kde-base/kdelibs/kdelibs-4.14.18.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.18.ebuild
@@ -12,8 +12,10 @@ KDE_HANDBOOK="optional"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
 EGIT_BRANCH="KDE/4.14"
+APPS_VERSION="15.12.3" # Don't forget to bump this
 
 DESCRIPTION="KDE libraries needed by all KDE programs"
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libopenshot/libopenshot-0.1.0.ebuild b/media-libs/libopenshot/libopenshot-0.1.0.ebuild
index b7907a9f0eee..0f77a8adaa90 100644
--- a/media-libs/libopenshot/libopenshot-0.1.0.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.1.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	media-gfx/imagemagick
+	media-gfx/imagemagick[cxx]
 	media-libs/libopenshot-audio
 	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
 	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index f53ae8f48320..e3144b1f7408 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,11 +1,6 @@
-DIST fio-1.17.2.tar.bz2 1155486 SHA256 1bf40fb709b7e7dbee778139cabae6b70ec6a89a43ddd83450a6b981bf813498 SHA512 99ea0da474f2d23d17a4c8775d1ec0421c020f072e2ccfbf920cbf52edac934e365dac38cdbd15993dfa72dd09b81540b0b9802f1896f031e8682fdfd805ee4b WHIRLPOOL 61da7007e3b591b148f3ffba45c3c1ecf646c47ad08d78c258cdca2906c441285fa0db738e5b0b0113a00ed178d99973b5b380a03690fe5d2e279a361cea0201
-DIST fio-1.99.10.tar.bz2 371892 SHA256 c6af6f685dfaa32c1f5779497f8d1b3dc1e18fc54bf35f0f3bb8120cf4ac2b3a SHA512 23bc2eaeed310d092a84cac06c701ccbe7c4ec45d98323f2e5ab3e4ccbea4b901edf2099dba1aed6fb31254c177228369e5983622a078ac33dc947a532693d87 WHIRLPOOL a4727121239f592f75f1a118f63370ee811c8f8b4396a253debd5ccc8a92641624d6bee65fb9b6c882e5dde41e5144d66457f47fef79942117a1a865f7183075
-DIST fio-2.0.14.tar.bz2 253574 SHA256 4bf01f1d2baf6d4fa905e5489e446e85e01979c427b2c38e2915e039248044e5 SHA512 f58024aeb38026e62cfec5a3ec9ceffb0bd1361a65cf89513a36615aa084974461c7f132ae803d49f02c36d36a6029c52f851e7f8b2cd1c66be0dcdc9fdcf115 WHIRLPOOL cb4812b34a59df41dfc6e293518becfe43515fa228b3dcb1400af987f465d7c1251b9d2645395fb7f2991728a67133bc1f1b0124db88963a1d9b11b29d949e26
-DIST fio-2.0.15.tar.bz2 258773 SHA256 3cc1b5e6c6955f9acad016b4d2ef619061ad9937874c7663e2a29777ed845ac4 SHA512 00289a0404cb44dd670614856932fbdf61cb1508e0eb672e5778c2ba3eba661b82892f7c969e4a82cf4fc487a744eb7411bfebf3b9612863de0197a28787f556 WHIRLPOOL 08b37573b63f812ea62c4ba323f05f510a9656e74f780117bd711bcc78e7fc7b5bef009212e7ec98f0ed153cc3786ece4d75d565845c0bc5eaba59afa1b037d8
-DIST fio-2.1.9.tar.bz2 429122 SHA256 4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493 SHA512 91913941c0d83705c156eef550eb87b388368804ee722c8c99ea638481ee657960e333c58b54e720034e92c2c34e9a8bb901336399a209a87f5eaa1ad1dfde53 WHIRLPOOL 6f44cbfe601f436b1ed0173e1dfbcf3b342f1a191c947392f0167a2dba9c4806fa422ffaedf9475f83b49fab8832aa1076ba91d27a9f2bdbcae126fa4d708824
 DIST fio-2.2.10.tar.bz2 497503 SHA256 04b4490c69f82bafeccbab51d33732cfd74e7a54e74eae0d9a2450faf4f1d857 SHA512 6ff71ca78b2ffa40cd9390b3e4f0b6f07db4d50c85f89c4a9e03c7f327153c0fed3eb8b7c44f3a8f8d0b1b35b48ccb5b1aa96a95fdca08581c22b99f2961c7d3 WHIRLPOOL 7bb881ecea82f3ad568d7513af0486494dc657ede69cc4de0f71e7bdf873ccf8f7a58744ab8f1fce8a1c507c3ce0f7e95eb3a7098a01fe041f04cd29a6a4afb7
 DIST fio-2.2.13.tar.bz2 503950 SHA256 66a0084c37bd8804d9f7d260d843a9a3bf51561954024d3b32062b9332281924 SHA512 b2adc4fb1b8c71bb909cfc2cfd9e0d25affcacd47908bc6d126625b448c0e964afa7c65fb88cf21662d4b9d07bfbaebbb2fd66b4c4662382ef68aaf8f053bd6d WHIRLPOOL 112af8620a73e907723760fd01caa4c582f7adba5eef5bf51bb6b695c1a15ff812957937cb67dff00b93c3e941df67d751ecf1aca1627722a6084c5494e7f70a
-DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
 DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
 DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
 DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
+DIST fio-2.8.tar.bz2 513800 SHA256 815344531a6c0201872aca43581c2e4b6fbc1d735266dd12a0c3408754ec862f SHA512 2228dab377f6664ce9e1bd6e5720e7eb256370758f6cea25c778a2480b5fbbf39630e8c5676e2cf34d9d664c7b1960c618feb1bd252fec290e09bf534672922c WHIRLPOOL fd32419a2d338a77f76d68831eb08ae7b1f34892d03bcd931a8cca3630813767fefa081148fd8f636531b62bd71c7fa0a7d4d71c53d8c8294f7cad7bb794eec6
diff --git a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
deleted file mode 100644
index fa35e27c754e..000000000000
--- a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar fio-2.0.14.orig/arch/arch-x86-common.h fio-2.0.14/arch/arch-x86-common.h
---- fio-2.0.14.orig/arch/arch-x86-common.h	2013-02-21 18:12:32.000000000 +0000
-+++ fio-2.0.14/arch/arch-x86-common.h	2013-03-27 01:48:04.000000000 +0000
-@@ -6,10 +6,24 @@
- static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
- 			    unsigned int *ecx, unsigned int *edx)
- {
-+#ifdef __PIC__
-+    /* 32-bit Hardened GCC (PIC) uses register EBX, so it must be preserved 
-+     * Fix ported from Gentoo's x86info-1.24-pic patch 
-+     * http://tuxion.com/2010/07/02/clobber-registers.html */
-+	asm volatile(
-+            "movl %%ebx,%%edi\n"
-+            "cpuid\n"
-+            "movl %%ebx,%1\n"
-+            "movl %%edi,%%ebx\n"
-+		: "=a" (*eax), "=m" (*ebx), "=c" (*ecx), "=d" (*edx)
-+		: "0" (*eax), "2" (*ecx)
-+		: "memory", "%edi");
-+#else
- 	asm volatile("cpuid"
- 		: "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
- 		: "0" (*eax), "2" (*ecx)
- 		: "memory");
-+#endif
- }
- 
- static inline void cpuid(unsigned int op,
-
diff --git a/sys-block/fio/files/fio-2.1.10-json.patch b/sys-block/fio/files/fio-2.1.10-json.patch
deleted file mode 100644
index 526be9b76228..000000000000
--- a/sys-block/fio/files/fio-2.1.10-json.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a606a802173272002e37be6475802be8c37481d6 Mon Sep 17 00:00:00 2001
-From: Puthikorn Voravootivat <puthik@chromium.org>
-Date: Tue, 24 Jun 2014 15:59:53 -0700
-Subject: [PATCH] Cast input argument for json_object_add_value_int to long
- long
-
-The latency related (and some other) variables type is uint32_t
-but the JSON integer type is long long. So we need to cast
-the numbers to long long type to make JSON output correctly.
-
-Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
-Signed-off-by: Jens Axboe <axboe@fb.com>
----
- json.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/json.h b/json.h
-index 081afd6..962c11c 100644
---- a/json.h
-+++ b/json.h
-@@ -52,7 +52,7 @@ void json_free_object(struct json_object *obj);
- 
- int json_object_add_value_type(struct json_object *obj, const char *name, int type, ...);
- #define json_object_add_value_int(obj, name, val) \
--	json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (val))
-+	json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (long long) (val))
- #define json_object_add_value_float(obj, name, val) \
- 	json_object_add_value_type((obj), name, JSON_TYPE_FLOAT, (val))
- #define json_object_add_value_string(obj, name, val) \
--- 
-2.0.0
-
diff --git a/sys-block/fio/files/fio-2.8-sysmacros.patch b/sys-block/fio/files/fio-2.8-sysmacros.patch
new file mode 100644
index 000000000000..0881c1b91d84
--- /dev/null
+++ b/sys-block/fio/files/fio-2.8-sysmacros.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/580592
+
+From a254805d9ca1872adced3f8be2a053211b8f27eb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 12:51:23 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor
+
+These functions have always been defined in sys/sysmacros.h under
+Linux C libraries.  For some, including sys/types.h implicitly
+includes that as well, but glibc wants to deprecate that, and some
+others already have.  Include the header explicitly for the funcs.
+
+The mtd change is already in upstream mtd-utils too.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ os/os-linux.h         | 1 +
+ oslib/libmtd_common.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/os/os-linux.h b/os/os-linux.h
+index 9e708f0..23c16b6 100644
+--- a/os/os-linux.h
++++ b/os/os-linux.h
+@@ -6,6 +6,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/uio.h>
+ #include <sys/syscall.h>
++#include <sys/sysmacros.h>
+ #include <sys/vfs.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+diff --git a/oslib/libmtd_common.h b/oslib/libmtd_common.h
+index a123323..9768066 100644
+--- a/oslib/libmtd_common.h
++++ b/oslib/libmtd_common.h
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <features.h>
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+ 
+ #ifndef PROGRAM_NAME
+ # error "You must define PROGRAM_NAME before including this header"
+-- 
+2.7.4
+
diff --git a/sys-block/fio/fio-1.17.2.ebuild b/sys-block/fio/fio-1.17.2.ebuild
deleted file mode 100644
index 1c4de44784e2..000000000000
--- a/sys-block/fio/fio-1.17.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.99.10.ebuild b/sys-block/fio/fio-1.99.10.ebuild
deleted file mode 100644
index 03ebe008a57b..000000000000
--- a/sys-block/fio/fio-1.99.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-flags -W
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.14-r1.ebuild b/sys-block/fio/fio-2.0.14-r1.ebuild
deleted file mode 100644
index 47911275f3ad..000000000000
--- a/sys-block/fio/fio-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		Makefile || die
-	epatch "$FILESDIR"/fio-2.0.14-pic-clobber-fix.patch
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	: # not a real configure script
-	./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.15.ebuild b/sys-block/fio/fio-2.0.15.ebuild
deleted file mode 100644
index 628d3780dcdd..000000000000
--- a/sys-block/fio/fio-2.0.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Write job files matching the I/O load one wants to simulate"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e '/filter /s:-o:$(LDFLAGS) -o:' \
-		-e '/: depend$/d' \
-		-e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
-		Makefile || die
-	epatch "$FILESDIR"/fio-2.0.14-pic-clobber-fix.patch
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	: # not a real configure script
-	./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
-	append-flags -W
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-	doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.9.ebuild b/sys-block/fio/fio-2.1.9.ebuild
deleted file mode 100644
index 07dc69d0fe14..000000000000
--- a/sys-block/fio/fio-2.1.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	gnuplot? (
-		sci-visualization/gnuplot
-		${PYTHON_DEPS}
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
-	epatch_user
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	./configure \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex numa '' '--disable-numa') \
-		|| die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	if use gnuplot ; then
-		python_replicate_script "${ED}/usr/bin/fio2gnuplot"
-	else
-		rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
-		rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
-		rm "${ED}"/usr/share/fio/*.gpm || die
-		rmdir "${ED}"/usr/share/fio/ 2>/dev/null
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.6.ebuild b/sys-block/fio/fio-2.6.ebuild
index f7a5277013f7..e66d13cada0a 100644
--- a/sys-block/fio/fio-2.6.ebuild
+++ b/sys-block/fio/fio-2.6.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
 	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
 	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user
diff --git a/sys-block/fio/fio-2.2.4-r1.ebuild b/sys-block/fio/fio-2.8.ebuild
index d645612bb4dc..cff874b73f0d 100644
--- a/sys-block/fio/fio-2.2.4-r1.ebuild
+++ b/sys-block/fio/fio-2.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
+
 inherit eutils python-r1 toolchain-funcs
 
 MY_PV="${PV/_rc/-rc}"
@@ -16,18 +17,20 @@ SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
-	glusterfs? ( sys-cluster/glusterfs )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	numa? ( sys-process/numactl )
-	rbd? ( sys-cluster/ceph )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
+IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+	gtk? ( dev-libs/glib:2[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+="
 	gnuplot? (
 		sci-visualization/gnuplot
 		${PYTHON_DEPS}
@@ -36,7 +39,9 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
+	epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
+	epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
 	epatch_user
 
 	# Many checks don't have configure flags.
@@ -50,14 +55,18 @@ src_prepare() {
 src_configure() {
 	chmod g-w "${T}"
 	# not a real configure script
+	set -- \
 	./configure \
+		--disable-optimizations \
 		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
 		--cc="$(tc-getCC)" \
 		$(usex glusterfs '' '--disable-gfapi') \
 		$(usex gtk '--enable-gfio' '') \
 		$(usex numa '' '--disable-numa') \
 		$(usex rbd '' '--disable-rbd') \
-		|| die 'configure failed'
+		$(usex static '--build-static' '')
+	echo "$@"
+	"$@" || die 'configure failed'
 }
 
 src_compile() {
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 7330422921d2..b927d1d36e8a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -73,6 +73,9 @@ DIST genpatches-4.1-26.extras.tar.xz 16168 SHA256 462116699602f0115af98847c2394f
 DIST genpatches-4.1-27.base.tar.xz 722704 SHA256 b0ffbc22416f07a7d6e9596908327d2cf20d5da1301072eef26aca6368eff343 SHA512 42ba344b4563060c12255d175931874a4894fade2f4277563393779ac6ffbe7e518ef0167f59d3fed3c6bc8572d2ae6930db064047c228fbe5d74194ced20e58 WHIRLPOOL 6041b94868f45d2dccc5a5e11e3080a32f4fea56d0e83fd3da7dce57220d00586dd73ddac6c1a23b9017eead31fd5ca0b54a5ddd135f3ca6913b64de3a3f7c62
 DIST genpatches-4.1-27.experimental.tar.xz 61632 SHA256 4bb92ffeea910c385e7461bff112db5c1285394908947043932f1c8d8d97751c SHA512 416ffe679342798b6bea83f15e4fec240eb60a77b563f8f77e79a7e8bd34f86da334aa74f8c74871cc6a66b1bbe5fa7db592991eaf2b1c458b0148b9b8a3ef09 WHIRLPOOL a47a9740d879a4bf6a27f9779bb503ea7b5f0cf4c727a093bec6f8f3025e7a24b3266b3e9ada6c8e54d4f87f5223ad4a5889918df46bec307fc592db91ccaee9
 DIST genpatches-4.1-27.extras.tar.xz 16172 SHA256 ec43f541ac011977a4ca00d911c2a5b0a1570234ae5e215d7a42327632fa3a46 SHA512 ae6d1b446c1cca749fff8f2f9500b0efb101465397ec475bec2dd1af6955c0927a43cc926452fbcac459c4653b31ad428c28d76311e6486ba117e43334609a27 WHIRLPOOL c6a02bea4133cb23d7451b2b94cf40736a40dec2072814d44ca73a6adb3ad43718f19f276f563a76b3366450119ac1234208832eb2ae8ccbbc2d5389514f0ca9
+DIST genpatches-4.4-10.base.tar.xz 342516 SHA256 4de20ee2b1cb8c33d4a6c431cef4dc3ab4a3365ad2ca905ccc47bf29455da8d0 SHA512 ea4f51afb3f85af9ee3742d703360cdea2f585017268fa3cb16a2d86a3a2e6df0ee46a0d52cc550fb99cbba7e4973676bbd8dc6cbb2b265af842939d3fdbe109 WHIRLPOOL 28a0fef05bc1b91592244a69cf1fbc15257f62f7b2dacb31b556aa9cdb5cb4d25c1b0a83e2c3518f8d08162ed57bfe50f26e081a23403adc4a3c96c1151498f6
+DIST genpatches-4.4-10.experimental.tar.xz 62612 SHA256 29ba528a6a7f0298607ed12b204ae31cc1c0a1a559e93383dc4ead57f58f52fa SHA512 e5205462b47dabec0b1798388d2aeace5bfa342e56e9857863ca445212ad627934365cd51c2c1cc5d1b38b6235b473b8e516f2eacce7e27c482d3f990f69e991 WHIRLPOOL 74952df3fe17878eb1d08d64f1c295ca59b8d22a8ae66bdff7aa4fca8c0615e693848ffd8090f01719741d25f19a706c08c6e7932f2e357b8981b1e91e608c78
+DIST genpatches-4.4-10.extras.tar.xz 16280 SHA256 68c15831b7d7fff7e49d163fac43205b4749b01f0b8e03b0fe17d919a1c00a60 SHA512 1336406a10934fc76c7281e0dd4634fce0c102ee0d086f033618c974395eb71789b153b48dce25f9d8e654f84b01b8db0639d87b3254a7536dc6f9cfed7606be WHIRLPOOL 4a45e581557f7338d45e74bddd3fb0240f35bcae18b6ade28a066e1e91570632e7d0a0066c5e7b67035accc5580bf75e7db3136fd50bb18b4f2836d89fdbf0f7
 DIST genpatches-4.4-8.base.tar.xz 243736 SHA256 70a54851283def9013601bd8ea299c04850410001e36d619fa6e83b64a4f0907 SHA512 fde00c28bc8da96aee2378d7ea36c85a5f8520c271e0251c7bc7472cd3c395dc2c3f5168f38b1bd10e6b5189bedc8b10780899468a368f8e9be1811bc31c0ab1 WHIRLPOOL 1190d8167c05062a53a7cc66a36310b42f6b90a711a497543b68626e1d6ca3fbc1c57a37dfa2a1fc98ed4f3b1dae5d7e77b74f3d708bc830b2bd5c31fc797b74
 DIST genpatches-4.4-8.experimental.tar.xz 62604 SHA256 35148c3d46a256819b5d214203b7365316694e85a729ddec2e5c229e48b9091d SHA512 e1e5b31d35a851f446645a2ac403ab238d63fb540e8443d36a30dd8a5d32016b077c4cfdcb30976e5facc511c0a6116037efb0af0a4840e00a1d8cf6be3fe310 WHIRLPOOL 4b65738d20969d5098feb66e416af450f0be87fa8c1770381165f70ca99e019400ff9e92c92d8f6dc1b641f4a400fa6165f0573aeb68ecba05f8934a348e6cc7
 DIST genpatches-4.4-8.extras.tar.xz 16284 SHA256 50b6dc7b842191a49a77d0f54302ebd1c7334e5f60cccc91e2a02db51ae074f8 SHA512 478e31f23742a99e4b3a2d24c93f0880c1794d40e5b05b80cc472ce237e14f28a83cb31554b686c8ec78e80b776fca363a1aabe450add7a3142ad30a4b586841 WHIRLPOOL 2ff0a37edadfd391b59bbe5158c463ee4b411fcd06e8f5bf53f58b19f88a564a40fabe690d5ac12f108e02d3a001d8b928372aa453f060d530ff2e30d0617113
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.8.ebuild
new file mode 100644
index 000000000000..8576b6420901
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}