diff --git a/app-admin/eselect/eselect-1.4.4.ebuild b/app-admin/eselect/eselect-1.4.4.ebuild
index 1541e51549b3..2a0cc0abc4f8 100644
--- a/app-admin/eselect/eselect-1.4.4.ebuild
+++ b/app-admin/eselect/eselect-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.4.ebuild,v 1.8 2015/04/01 08:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.4.ebuild,v 1.9 2015/04/02 20:00:20 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/sudo/sudo-1.8.12.ebuild b/app-admin/sudo/sudo-1.8.12.ebuild
index 0367ea02aa1d..f096cb93e951 100644
--- a/app-admin/sudo/sudo-1.8.12.ebuild
+++ b/app-admin/sudo/sudo-1.8.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.12.ebuild,v 1.7 2015/03/31 07:57:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.12.ebuild,v 1.8 2015/04/02 19:55:03 maekke Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey +sendmail"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/supervisor/supervisor-3.1.3.ebuild b/app-admin/supervisor/supervisor-3.1.3.ebuild
index 76c749e29591..2c8512933ce6 100644
--- a/app-admin/supervisor/supervisor-3.1.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.3.ebuild,v 1.3 2015/03/08 23:37:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.1.3.ebuild,v 1.4 2015/04/02 18:24:49 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
 
-# ALL versions of meld3 match to >=meld3-0.6.5 
+# ALL versions of meld3 match to >=meld3-0.6.5
 RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/app-arch/lzip/lzip-1.16.ebuild b/app-arch/lzip/lzip-1.16.ebuild
index 2e3942942630..fc08ac00eb33 100644
--- a/app-arch/lzip/lzip-1.16.ebuild
+++ b/app-arch/lzip/lzip-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.16.ebuild,v 1.9 2015/02/27 11:19:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.16.ebuild,v 1.10 2015/04/02 17:18:10 vapier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_configure() {
 	# not autotools-based
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 9873005e0b96..545ce8a9d3e6 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,4 @@
-DIST bareos-12.4.5.tar.gz 3496879 SHA256 2defc15ed4fb6483e1d45ea63bb9cb8ba009e2b31c7755544984f1813bf4e017 SHA512 a59e95bc9b4a5147d8254e6b802c411956d324571ac084f5cb11629ddad59d605cdad2ab7b86f001af8c32faf15070833f233a44cbefaf71d13cad05faaba5cf WHIRLPOOL c95492acb57729e45a6ff5d2ae1894de4ebdb9e416d9f8a5beeef89ccf563a12ea8d5cdb943c2b6ec5681fb2bf0d348fb5e089ecac571256a835b4fd1a4459c8
-DIST bareos-13.2.3.tar.gz 3451591 SHA256 5245333699caaa48a5234e34c379e9994274b1002b7be4801f84a9e7bf78437e SHA512 2d0b14509d6ff9668151f6f6ff18513cf1ecfe91d24fd5d646c25f3d307ce6c24a1aacfaa824a85e4a1d5aba8157e854bf629234e4302c32f3f5de841842c819 WHIRLPOOL 849f89362e392ecb4061e1c2623f158e02a16b0e0fb8e78f993c8ea206d01dfc8d2209234e40dd6f7edd700ec8a321fb6020d3aaed389c631bf3e43028b9e679
-DIST bareos-13.2.4.tar.gz 3467280 SHA256 3e46096444620e86e1e6be76ba6c7c4ee905e2cbc401cf02bba2afc75f84cfbd SHA512 8a8a1a4806c028d25c7921ccf487d0e81be847821b3b66b7b56777f3a00c8279df4b1f0c31c2d3d7a374c646b084a799df8e2f20aa756e9fe888d9296e98347a WHIRLPOOL 7260e7ff935b177dbe56e272168492649099c28417f246a28fa1b517c84c179fb32df83a35e24dcdf54f6e46c98bfc487e5403e525aa19d7ceeb3ca6292cf2f9
-DIST bareos-14.2.1.tar.gz 3742585 SHA256 3a95cc717508d7d96242dc5ee6491db5b0ca65bc448c1c39a9d0b389039714d2 SHA512 a5a147df2bbf2a24f9157f1e8f63a5b2f4573089fe1ea57079cffb91121652be402be850c02854bb09c1abba292949f2c8d61ed52a05dc13b22c4dafd73f0f92 WHIRLPOOL 580e7848fae349dd4582d7dd65fdf3c14de9be89c495733c975939014b6f5f87f9165129715388c4a09abe80dd4d9a75b30e1fbc55c08b0d9cc88f55bf499d87
+DIST bareos-12.4.5.tar.gz 3496881 SHA256 7e3eb7bf294b26ea97807f642d6cc7ac17f0c2eecc133c40db50ce810fd3dede SHA512 e91ddc89766c7a5339d4cae6924c302d7e7c340f1cfa36c598ad3d2cec70a131b4c9c57b9ae5f9006e96acb460e838d38da577f794f567acb07e1137dbae9b11 WHIRLPOOL dd893d45f7cd7a5df486f54e68c53217b4d506fcbc7697e968441595ed7f485dc5f5f7c9e7fe11d98b704d7174a56e2ac90ce05f94be8b71c8b8fc41ece87414
+DIST bareos-13.2.3.tar.gz 3451543 SHA256 737502d427d70bba1f5a5bed7bdfd3bc4a2b8044ebde6ac69f9951ef75723568 SHA512 2d52706a79cc6e9df94bcd7a3d6ec8b1aa58f03c8c9b13139a5de3cef9f8614b445c72de37adb4bcbcf7651acc41b73a2664f96ae8e503b81ca483e5ec64a4ef WHIRLPOOL 9980101cc8d107bb8341ad1699ae8cd13e9786de92232e77fd1f6a140c10571ff1f75571ad63c29cc46747f546779e45a437c177ee9767e8e22107e076574a8d
+DIST bareos-13.2.4.tar.gz 3467542 SHA256 def68891d074438e55d7a3e570cfaae1c1a8c9479d089815ba0f8f31e1d6eefc SHA512 d7e4bc016993f68521f4438b56adf51e88685195693d00d34103259c3c24d1d7c03cc2b7aecbb55ff88a00d5f169e9e42accd23b17bcd3c837ca78079a9f394f WHIRLPOOL 54b5ee5094be6569c1a7857ebcc98f1e24ee272485327397f1ab0833433a6b46e8b7e3f2cd927668600ba63f2d36a920dc64cb9dfc2f0dd69adb57a70b862848
+DIST bareos-14.2.1.tar.gz 3741825 SHA256 a4a6227dbfadfdf973c1e80a2279e6775511d10255e55c4af25e4ffec94c93bd SHA512 2e7215be8b85258c9ebddb65c639c437b1c3b1397ca03a6277a130f4b4b6ba5d14eeae0dc675022e3b387bb0f9ceb25950997c6734c5c3242048ade7e80b8928 WHIRLPOOL 3353ac795a2ab6c7e5eb7433a10016fd6fa9403d5161d09ee1b1b868ab5d23f8e1d99b73f0d470054c883ff66fba60938afec9e83b2d1688d2d3b29d9d8d8f9b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
index ec32d0832265..af5847e5540f 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild,v 1.7 2015/04/01 08:21:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild,v 1.8 2015/04/02 20:00:59 maekke Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ad622001e475..8549b4c820fd 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -12,3 +12,4 @@ DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b9
 DIST xen-gentoo-patches-0.tar.xz 22240 SHA256 cfe809b2ca278a4ad6771a59ea5bf4848423e5eb5c72c2f3092163c772774e3c SHA512 05c3416859e24b6704e4cf3442fe20411e78a63689d20f97dfd228a15a7e5bb6cf0c4310278ef6cb15a37bc5e07933137ffa17ccb0a8b7096fc45f3a1c16ba90 WHIRLPOOL ea1c3a4679368bcc37f4638400e91f773126a43f6c180084cb8c8f737d9bdae476d67e310453ac3b10e3fe71a0e2c760906ad707234ee6933c0963d6f3c7f061
 DIST xen-gentoo-patches-3.tar.xz 23364 SHA256 66e37bc63376ac9aa9c8c9b16d7a154d3fb8c9906f963bb32f3d7baec6c95c68 SHA512 20b6bcede882b454bd84d349b0b70bf7e7150afb25ff89718f2feb938b120bd051547b7c129e58656e5281b39263de29bc2ed0510070fcfc2297110f0a597b4d WHIRLPOOL 293b1db1061e5af0f4f6e5c4d102d2ea8203539ad17adec3545ef35184ffae7d5c3f7a99dc5c367b9ad84b39aa6fa9624598620bdeb308c08ccf03b56b379e90
 DIST xen-ovmf-patches-0.tar.xz 4356 SHA256 cd192a98114e534ce7454dc7ea45a42cea7ca83899d01fc8d695e2b110fdeaaf SHA512 03b844040ebad1a18d759418b0107d56feb9b8095291b7da1d36eb3409041764ad4bfd87679176b820221180e1038f6fad4314e8ad877096c052505de6339cf8 WHIRLPOOL e5c0aca3c786d905ad13f4d58a3b9b78260350df3dbe769ea6b66ac409e25ea0a368f9554c9da9b1a3f6f01ea1540038893b496fa5e637b18007076f8d305ee6
+DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r4.ebuild
new file mode 100644
index 000000000000..2baf9ef6e205
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.2.5-r4.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5-r4.ebuild,v 1.1 2015/04/03 05:10:20 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=6
+	SECURITY_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=0
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	SEABIOS_VER=1.6.3.2
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt:0
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pypam[${PYTHON_USEDEP}]
+	sys-libs/zlib
+	sys-power/iasl
+	system-seabios? ( sys-firmware/seabios )
+	sys-firmware/ipxe
+	dev-ml/findlib
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (  x11-proto/xproto
+		!net-libs/libiscsi )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
+
+	if gcc-specs-pie; then
+		epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	epatch_user
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${ED}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild b/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild
index 4f18dcee4b2f..f1973942a7a0 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild,v 1.2 2015/03/16 13:21:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1-r7.ebuild,v 1.3 2015/04/03 05:10:20 dlan Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 	live_eclass="mercurial"
 else
-	KEYWORDS="amd64 ~arm -x86"
+	KEYWORDS="~amd64 ~arm -x86"
 	UPSTREAM_VER=8
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=3
diff --git a/app-emulation/xen-tools/xen-tools-4.4.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..b4a3666ae5cf
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.4.2-r1.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.2-r1.ebuild,v 1.1 2015/04/03 05:10:20 dlan Exp $
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=3
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=0
+
+	SEABIOS_VER=1.7.3.1
+	OVMF_PV=20131208
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}
+	${OVMF_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	arm? ( >=sys-apps/dtc-1.4.0 )
+	!arm? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]]; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# Bug 477884, 518136
+	if [[ "${ARCH}" == 'amd64' ]]; then
+		sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die
+	fi
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	# disable qemu-traditional for arm, fail to build
+	use arm || myconf+=" --enable-qemu-traditional"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.5.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.5.0-r3.ebuild
new file mode 100644
index 000000000000..9316677ea739
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.5.0-r3.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r3.ebuild,v 1.1 2015/04/03 05:10:20 dlan Exp $
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~arm ~arm64 ~amd64 -x86"
+	UPSTREAM_VER=3
+	SECURITY_VER=0
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=3
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=0
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20131208
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}
+	${OVMF_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]]; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f61c857c1df2..8e2143195c8b 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -7,3 +7,4 @@ DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2
 DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
 DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6
 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
+DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
diff --git a/app-emulation/xen/xen-4.2.5-r8.ebuild b/app-emulation/xen/xen-4.2.5-r8.ebuild
new file mode 100644
index 000000000000..0bf82f13f708
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.5-r8.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r8.ebuild,v 1.1 2015/04/03 05:01:16 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=6
+	SECURITY_VER=0
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask pae xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.4.2-r1.ebuild b/app-emulation/xen/xen-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..82d9cd002383
--- /dev/null
+++ b/app-emulation/xen/xen-4.4.2-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r1.ebuild,v 1.1 2015/04/03 05:01:16 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=0
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.4-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.5.0-r5.ebuild b/app-emulation/xen/xen-4.5.0-r5.ebuild
new file mode 100644
index 000000000000..12caa8658f16
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.0-r5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r5.ebuild,v 1.1 2015/04/03 05:01:16 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+	live_eclass="git-2"
+else
+	KEYWORDS="~arm ~arm64 ~amd64"
+	UPSTREAM_VER=3
+	SECURITY_VER=0
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+	arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.5-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild b/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild
index 1ee26e59960c..247cf4d9cc72 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild,v 1.3 2014/04/03 08:11:14 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.60.ebuild,v 1.4 2015/04/02 17:56:18 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -14,4 +14,4 @@ IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	virtual/udev"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild b/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild
index b31bd12cf2e9..97a1ebb9fc2a 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild,v 1.1 2014/04/10 17:52:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.65.ebuild,v 1.2 2015/04/02 17:56:18 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -14,4 +14,4 @@ IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	virtual/udev"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild b/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
index 089643db3b4e..9fe9c280aa38 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild,v 1.1 2014/08/03 18:49:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-0.6.70.ebuild,v 1.2 2015/04/02 17:56:18 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -14,4 +14,4 @@ IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	virtual/udev"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild b/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
index 386820ad321a..118eb34bc1f8 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild,v 1.1 2013/08/18 18:32:02 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild,v 1.2 2015/04/02 17:56:18 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -14,4 +14,4 @@ IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	virtual/udev"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild
index be9838650a9d..9b3a8aea1ea6 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild,v 1.4 2014/04/03 08:21:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.60.ebuild,v 1.5 2015/04/02 17:57:03 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild
index 23c2bb80b8c7..8dd19a355566 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild,v 1.1 2014/04/10 17:55:19 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.65.ebuild,v 1.2 2015/04/02 17:57:03 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
index d57b302e68af..69035fc3d1dd 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild,v 1.1 2014/08/03 18:52:58 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-0.6.70.ebuild,v 1.2 2015/04/02 17:57:03 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
index 6d82e5227cbd..d8d54fcadb09 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild,v 1.1 2013/06/11 14:25:18 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild,v 1.2 2015/04/02 17:57:03 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}"
-RDEPEND="${DEPEND}"
\ No newline at end of file
+RDEPEND="${DEPEND}"
diff --git a/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild b/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
index 6b871b0f0a14..12a9edb04121 100644
--- a/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
+++ b/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild,v 1.1 2014/08/03 18:57:35 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-0.6.70.ebuild,v 1.2 2015/04/02 17:57:48 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -39,4 +39,4 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
-}
\ No newline at end of file
+}
diff --git a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
index 2e61a8a38aa2..24542cd67e8c 100644
--- a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
+++ b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.4 2014/07/05 12:29:17 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.5 2015/04/02 17:57:48 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -39,4 +39,4 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/out/html/*
-}
\ No newline at end of file
+}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild
index 80853ef0c1e6..9863348d23b1 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild,v 1.1 2015/03/18 18:35:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2-r1.ebuild,v 1.2 2015/04/02 18:25:35 mr_bones_ Exp $
 
 EAPI=5
 
@@ -73,8 +73,8 @@ BIN_COMMON_DEPEND="
 "
 
 # PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above. 
-# All dependencies below this point should remain identical to those in 
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
 # the source ebuilds.
 
 COMMON_DEPEND="
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild
index bea4fe4bfdbc..63c040bc3ddb 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild,v 1.5 2015/02/22 10:15:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.3.5.2.ebuild,v 1.6 2015/04/02 18:25:35 mr_bones_ Exp $
 
 EAPI=5
 
@@ -73,8 +73,8 @@ BIN_COMMON_DEPEND="
 "
 
 # PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above. 
-# All dependencies below this point should remain identical to those in 
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
 # the source ebuilds.
 
 COMMON_DEPEND="
diff --git a/app-text/aspell/aspell-0.60.6.1-r1.ebuild b/app-text/aspell/aspell-0.60.6.1-r1.ebuild
index 6b8ca47776c0..2781749d87df 100644
--- a/app-text/aspell/aspell-0.60.6.1-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1-r1.ebuild,v 1.7 2015/04/01 08:23:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1-r1.ebuild,v 1.8 2015/04/02 20:24:35 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
index 2ca6aafe67b6..635ff58753d1 100644
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.1 2014/08/25 15:25:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.2 2015/04/02 18:26:20 mr_bones_ Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ src_compile() {
 	#if use egl ; then
 	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
 	#	local egl="egl"
-	#fi 
+	#fi
 	if use static ; then
 		local cclib=""
 		local slib=""
diff --git a/app-text/llpp/llpp-21.ebuild b/app-text/llpp/llpp-21.ebuild
index 66e24b614e5b..e2de72c35921 100644
--- a/app-text/llpp/llpp-21.ebuild
+++ b/app-text/llpp/llpp-21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21.ebuild,v 1.3 2015/03/17 07:46:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-21.ebuild,v 1.4 2015/04/02 18:26:20 mr_bones_ Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ src_compile() {
 	#if use egl ; then
 	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
 	#	local egl="egl"
-	#fi 
+	#fi
 	if use static ; then
 		local cclib=""
 		local slib=""
diff --git a/app-text/logmerge/logmerge-0.4_beta.ebuild b/app-text/logmerge/logmerge-0.4_beta.ebuild
index 6557a2c762b7..e2424f107dc4 100644
--- a/app-text/logmerge/logmerge-0.4_beta.ebuild
+++ b/app-text/logmerge/logmerge-0.4_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/logmerge/logmerge-0.4_beta.ebuild,v 1.3 2014/08/10 18:26:21 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/logmerge/logmerge-0.4_beta.ebuild,v 1.4 2015/04/02 17:58:31 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -20,4 +20,4 @@ RDEPEND="dev-lang/perl"
 
 src_install() {
 	dobin ${PN}
-}
\ No newline at end of file
+}
diff --git a/app-text/po4a/po4a-0.45-r2.ebuild b/app-text/po4a/po4a-0.45-r2.ebuild
index d513d9dacf08..840025be4b31 100644
--- a/app-text/po4a/po4a-0.45-r2.ebuild
+++ b/app-text/po4a/po4a-0.45-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.45-r2.ebuild,v 1.2 2014/12/12 09:31:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.45-r2.ebuild,v 1.3 2015/04/02 18:27:05 mr_bones_ Exp $
 
 EAPI=5
 
@@ -58,7 +58,7 @@ src_prepare() {
 	einfo "Your LINGUAS lists the following languages: $LINGUAS"
 	einfo "Removing locale files not listed in it ..."
 
-	# perl_rm_files also updates the Manifest file 
+	# perl_rm_files also updates the Manifest file
 	# and therefore silences Perl as to .po files we're about to clean
 	perl_rm_files "${locales_to_remove[@]}"
 }
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
index 01dc305eec2d..ee6f58596dbd 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild,v 1.7 2015/04/01 08:24:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild,v 1.8 2015/04/02 20:23:02 maekke Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="jadetex"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
index f3524250b5d1..3d642fc6bc20 100644
--- a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild,v 1.1 2015/03/28 09:56:26 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild,v 1.2 2015/04/02 19:56:46 maekke Exp $
 
 EAPI=5
 
@@ -64,7 +64,7 @@ SRC_URI="http://dev.gentoo.org/~tomka/files/${PN}-3.03-rc1.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
 
 IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
 
diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
index fcce343a41f1..0ab79f85f1ac 100644
--- a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
+++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.7 2015/01/16 10:02:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.8 2015/04/02 18:17:50 mr_bones_ Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="http://googlemock.googlecode.com/files/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="static-libs"
+IUSE="static-libs test"
 
 RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild
index 87f55f7e08a1..b26c60669e4c 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild,v 1.12 2014/04/19 17:43:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.4.ebuild,v 1.13 2015/04/02 17:59:19 mr_bones_ Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -52,4 +52,4 @@ src_configure() {
 	gnome2_src_configure \
 		--enable-api-atkmm \
 		$(use_enable doc documentation)
-}
\ No newline at end of file
+}
diff --git a/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild b/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
index 35b60864f3d2..101426a84c1c 100644
--- a/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild,v 1.2 2014/06/08 08:14:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003-r1.ebuild,v 1.3 2015/04/02 18:27:52 mr_bones_ Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -39,7 +39,7 @@ src_prepare() {
 		-e "/^ASM/s/as/$(tc-getAS)/g" \
 		build/*.gcc.inc || die
 
-	# force 64bit where applicable, 32bit where applicable... 
+	# force 64bit where applicable, 32bit where applicable...
 	# built-in detection is based on running kernel, which messes up
 	# e.g. in a x86 chroot on amd64 kernel. Bug 462130
 	# see build/linux.inc for values
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index 887f6b292206..e4433351a08f 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.9.0.ebuild,v 1.12 2014/08/10 20:00:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.9.0.ebuild,v 1.13 2015/04/02 18:28:35 mr_bones_ Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-0.9.0-fix-ac-macro.patch 
+	#epatch "${FILESDIR}"/${PN}-0.9.0-fix-ac-macro.patch
 	#epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
 	#cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
 	epatch "${FILESDIR}"/libdbi-0.9.0-doc-build-fix.patch
diff --git a/dev-games/ois/ois-1.3.ebuild b/dev-games/ois/ois-1.3.ebuild
index fc9fdb15de14..44a3435ee577 100644
--- a/dev-games/ois/ois-1.3.ebuild
+++ b/dev-games/ois/ois-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ois-1.3.ebuild,v 1.6 2013/04/27 23:15:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ois/ois-1.3.ebuild,v 1.7 2015/04/02 16:53:58 aballier Exp $
 
 EAPI=4
 inherit autotools autotools-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wgois/${MY_P/-/_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static-libs"
 
 DEPEND="x11-libs/libXaw
diff --git a/dev-haskell/logict/logict-0.6.0.1.ebuild b/dev-haskell/logict/logict-0.6.0.1.ebuild
index 4533d13ce751..b36959ac3b93 100644
--- a/dev-haskell/logict/logict-0.6.0.1.ebuild
+++ b/dev-haskell/logict/logict-0.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/logict/logict-0.6.0.1.ebuild,v 1.2 2014/07/25 09:16:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/logict/logict-0.6.0.1.ebuild,v 1.3 2015/04/02 18:00:03 mr_bones_ Exp $
 
 EAPI=5
 
@@ -24,4 +24,4 @@ RDEPEND=">=dev-haskell/mtl-2:=[profile?]
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-0"
 
-PATCHES=("${FILESDIR}/${PN}-0.5.0-ghc-6.12.patch")
\ No newline at end of file
+PATCHES=("${FILESDIR}/${PN}-0.5.0-ghc-6.12.patch")
diff --git a/dev-haskell/split/split-0.2.2.ebuild b/dev-haskell/split/split-0.2.2.ebuild
index 277dc4049dc2..58b01bb249fa 100644
--- a/dev-haskell/split/split-0.2.2.ebuild
+++ b/dev-haskell/split/split-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/split/split-0.2.2.ebuild,v 1.9 2014/07/25 09:16:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/split/split-0.2.2.ebuild,v 1.10 2015/04/03 05:59:14 gienah Exp $
 
 EAPI=5
 
@@ -18,8 +18,15 @@ SLOT="0/${PV}"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""
 
+RESTRICT=test # hangs
+
 RDEPEND=">=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.10
 		test? ( >=dev-haskell/quickcheck-2.4
 		)"
+
+src_prepare() {
+	cabal_chdeps \
+		'base <4.8' 'base'
+}
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
index f105460bbe45..0f83d1d0d86b 100644
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.8 2015/02/28 13:27:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.9 2015/04/03 03:05:56 gienah Exp $
 
 EAPI=5
 
@@ -23,3 +23,8 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.2
 "
+
+src_prepare() {
+	cabal_chdeps \
+		'base >= 3 && < 4.8' 'base >= 3'
+}
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index b992b5f54030..5c7b66d26d69 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,3 +1,4 @@
 DIST vector-algorithms-0.5.4.2.tar.gz 22938 SHA256 c42c35dcf23cb60b874e50d6fec894463c835d6e2ef71d02283039f86635eb22 SHA512 10f376697e39561eeb4f9148db5ba71fcc3eecb8d9bdc796d8edb4b39a0567592b7740c40ea3ba402d594b3e0b46c365d26776f8ea0cc675fd79ab3c6ecb17fe WHIRLPOOL c1eed67e47716f531e86c0bdd93ac83208e0ddfb4b357dd00b2560a1be62fb94b726ca73d3d3f66471cd32be74f959b3327afff0589f66aae5b5b5715317d694
 DIST vector-algorithms-0.6.0.1.tar.gz 20273 SHA256 85fd0d102b2f3bc61e2241959563e10b58f233d9fd96ff4b5083d55618f87136 SHA512 e38f25f51c347df844cff181ba99368ac2b7389fdb190ea5bec97fc8b4a26ba5ee2df27ab38884d38d505d88fefbc56be427724f05f85646906dd2d0d583fdcf WHIRLPOOL 2e47adbab21724e042e692577141dab45a3a33f4d726ac49acb82998a6c1fa7347ca8b71fb3eb2f6a5e7321836c92195f8b1b52ec9a1b8dc9c0f6cd47bbc0797
 DIST vector-algorithms-0.6.0.3.tar.gz 20273 SHA256 c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf SHA512 40743d262ac410c9863924572d62dd0bab87b07521ab0df29d4dfa8c35ea873483f9afa4cfef0dc51edeb725b662a49427781e3e66a4b4aff693784e36b030fc WHIRLPOOL 46c229d13ecb01d8295821a98a36485c5e2546c4bf3741745e176d163d60ce2efab84a526a6cde644612e4fd19a454136d1d80794d85523f5625b15c9f58906b
+DIST vector-algorithms-0.6.0.4.tar.gz 20455 SHA256 5b8922154baa62c9239ed3efed94e890eeaf7e56f89d81a8c8407550749bc025 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf WHIRLPOOL f2e9d2abb74a0565d0a83b6384b7efb343ba485a7dd2ce97c7d5256800e441045fa5a6b456ce22fa99620a30f6edde54d7a5e66663c80ed9d9bb40a86f521dde
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
new file mode 100644
index 000000000000..114ecbfb9f45
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild,v 1.1 2015/04/03 05:21:11 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="http://code.haskell.org/~dolio/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bench +boundschecks internalchecks +properties unsafechecks"
+
+RESTRICT=test # hangs
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/mwc-random:=[profile?]
+	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bench bench) \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag properties properties) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
index 0d192492a2ad..3f88575c2f30 100644
--- a/dev-haskell/vector-instances/Manifest
+++ b/dev-haskell/vector-instances/Manifest
@@ -1 +1,2 @@
+DIST vector-instances-3.3.0.1.tar.gz 3623 SHA256 84b19901a496ffbba0115296452abc49e5248b4d55b153ba62bdf08bb6ddefda SHA512 5be54747af266f47c405884a581bc48f9a66d999634ad6ea1ac12307c0fb77891a0d089b3fce2fc4d85557aa31346a968bb80a583d3e5165deea3dbaf492bb16 WHIRLPOOL a30f32856b35663b4b13fbac44a57e4b861ee93a006af4258d9d6b24a118cb2a443a3236c5e86884f3b9ea68f3038eb0fc9ed787070aa7c2f617e756454fc652
 DIST vector-instances-3.3.tar.gz 3596 SHA256 bee0ea0636363ddd20324deb9929e3edc5058df5c4b71d10d4aeb11dc54d3c46 SHA512 287437e23c6c8a74f539e944fcb53553cd94767b4f2d16d45c43465ff5e962e7b5dadb3cca2d6ea421a34c6ea8723e160d3d7cbcfc0aae4c8efb6c91be46b5d3 WHIRLPOOL b42f6fb3661f3093ceac0314e51f022913333c40e0ccea68c3d7940edeae4111f51938cdb5979d83b1362a10fb1b92875bec4f622d57fd48d199408227fc6f4f
diff --git a/dev-haskell/vector-instances/vector-instances-3.3.0.1.ebuild b/dev-haskell/vector-instances/vector-instances-3.3.0.1.ebuild
new file mode 100644
index 000000000000..6751d6d2b1f4
--- /dev/null
+++ b/dev-haskell/vector-instances/vector-instances-3.3.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector-instances/vector-instances-3.3.0.1.ebuild,v 1.1 2015/04/03 05:23:28 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan Instances for 'Data.Vector'"
+HOMEPAGE="http://github.com/ekmett/vector-instances"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/comonad-3:=[profile?]
+	>=dev-haskell/keys-3:=[profile?]
+	>=dev-haskell/pointed-3:=[profile?]
+	>=dev-haskell/semigroupoids-3:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/vector-th-unbox/Manifest b/dev-haskell/vector-th-unbox/Manifest
index 9a00dcbad889..6d8f71ddf5f2 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1 +1,2 @@
 DIST vector-th-unbox-0.2.1.0.tar.gz 4362 SHA256 30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65 SHA512 6ae1fde21a671d4a51a48b30f0726729fad72ce8a356edfe7e42a44701991f802e7729257c3acb39cd245df9b35bb60fcab6350d4001c12baba29e40e82f1b50 WHIRLPOOL ac6157d202d1b74b9d82ad988b1f53549416014e15b99bece056308f65278fc8e4a8affe982f6dde82a4b88475f144f7862c57734b0086eb5dca732171d724e1
+DIST vector-th-unbox-0.2.1.2.tar.gz 4536 SHA256 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05 SHA512 30c3ff686179d9d9736038e6746d4778160dfc778497467fe7c85baadbb44aa5161550c21007d7fbb1977a7231c3eb5281b8c4c7248e71e925a60588c95debbb WHIRLPOOL e2565df415c2f1405744323cd19aa986a5f24798916a709a970ed9104e35428705c05b955b12c8ade4d5c10041b10b30b861c0998db715159f3cf29e921452cf
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.2.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.2.ebuild
new file mode 100644
index 000000000000..19d87be08aa1
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.2.ebuild,v 1.1 2015/04/03 05:22:51 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
+HOMEPAGE="http://hackage.haskell.org/package/vector-th-unbox"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 0c13a523beff..174e95d31c5e 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,5 +1,6 @@
 DIST vector-0.10.0.1.tar.gz 102426 SHA256 ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af SHA512 2595bee97295a62471de26748c0b598f40a9c5a75571e645c24a8f2bc4eef1d7a3e29d576e7ba9a9dca0fb071f0c178a5a3757e063219d1cf25d8c484e645754 WHIRLPOOL 24617c62582a4eb490e263dc69289e4b24ad18ab6dc6191b3fff52bbcb816cfda9d909c6a62b388daa1f7dd68d7bc9318d1c7618ff7a1a3db0b9cd631cc0ae4b
 DIST vector-0.10.11.0.tar.gz 103758 SHA256 b284d2350bc56233275af00c166a33934175a73a7d3c47fffb070980919eb238 SHA512 56699fdc9359454719666baade5ab0531ff2c5c95e078522444b1b26a6e067537cab523cdb4bba8a3effc85916f553b1f767ae45d6a12f76d68c3211289e4ac6 WHIRLPOOL 5761f80baf17a9f1ffbcc2580e1f2bf76e426aa33ee92778bedcd8dda5aaabc12f0d0b7e591ed932189ac1bdfcb9e5ef5f642b76975ab9e9a77c887d3b2756fe
 DIST vector-0.10.12.2.tar.gz 103591 SHA256 455427a217e98cc20af71906700bf36fed265ac15b7fb21b78a0a61f66380c06 SHA512 87438b965c12e0ba1805fe0a212806fa5ff356593345bb85311b82e92d753ec2bc050e96ef5106b5e84383b322fff1fbc3d2acf828a18738f401bbf06777b7cb WHIRLPOOL 4675d9224d1331e888f78256bde2a4cfd2c85ad4f5e8ea2029a126649ea5e2b3030a90aeaf5432c46abd376d72b489b35c8a76c6a172c1e212de2cbaffadeb6a
+DIST vector-0.10.12.3.tar.gz 103617 SHA256 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b WHIRLPOOL b572031197f4992ad322c0d47843dbe20dc48372c0e3d1d53a6a0fe03a0c0c3d8f99ce7f13994bb5f5998bb8e9ee1fc225a67b15e63421484a8c371aebec5021
 DIST vector-0.10.9.1.tar.gz 101693 SHA256 205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5 SHA512 8eab2fb1d225f7a53d82721147bf78a05714bc1484e9b7bdd1d1bc4720e42d71bda0ffe92e60b8c6c65287b64c3bd738ff597ea8caa5b05e15a822b8563aba3c WHIRLPOOL e490dc6de9e26c7242b233541ce2920ab5000f508db12c75fb073c2eeb7149e703f12fc8a4bc78943fe9c10057b5eaf613eb7c39d0fa682187371d93a748432e
 DIST vector-0.9.1.tar.gz 104997 SHA256 5a2507f633c8b61a203b34ca29a30fca20fde1d6261f1f8417903b447c4bd7d4 SHA512 981fc466212438ca1b4b1f39dbe662e2ab2d6f481b8aea7ddc5dc5655542988842817d5cc3aca46d319020df82908f89bce9ab53aa71a47d8d717224ccc2d8fa WHIRLPOOL acdefbe6df6a80d8595fbd1a5a10fc966cbd1bb26cba4cb3d89cc3e6263cd2a8e5f3fde42de439421579b594ac5ba9ecc1bae03e4d1294e1bbf23bcf94031194
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
new file mode 100644
index 000000000000..436b2d242069
--- /dev/null
+++ b/dev-haskell/vector/vector-0.10.12.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.12.3.ebuild,v 1.1 2015/04/03 05:22:10 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
+		dev-haskell/random
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2
+		>=dev-haskell/transformers-0.2.0.0 )
+"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	cabal_chdeps \
+		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7  && < 2.9"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index 19ee98282fb3..bcebed092f84 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.10 2015/01/02 23:12:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild,v 1.11 2015/04/03 05:45:41 gienah Exp $
 
 EAPI=5
 
@@ -22,4 +22,4 @@ RDEPEND=">=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6"
 
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
+CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1"
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild
index 96f071995860..cd58b53d0566 100644
--- a/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild,v 1.2 2014/08/10 20:07:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-jmf/ant-jmf-1.9.1.ebuild,v 1.3 2015/04/02 18:00:48 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ inherit ant-tasks
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux \
-	~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
\ No newline at end of file
+	~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.9.1.ebuild b/dev-java/ant-swing/ant-swing-1.9.1.ebuild
index 5e6aa72254ee..f7337ee545af 100644
--- a/dev-java/ant-swing/ant-swing-1.9.1.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.9.1.ebuild,v 1.2 2014/08/10 20:07:46 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-swing/ant-swing-1.9.1.ebuild,v 1.3 2015/04/02 18:01:34 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -13,4 +13,4 @@ DESCRIPTION="Apache Ant's optional tasks for Swing"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux \
 	~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris \
-	~x64-solaris ~x86-solaris"
\ No newline at end of file
+	~x64-solaris ~x86-solaris"
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index 50b2c6abf9a3..b946ccb87461 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r2.ebuild,v 1.3 2015/03/27 10:30:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r2.ebuild,v 1.4 2015/04/02 18:02:19 mr_bones_ Exp $
 
 EAPI=5
 
@@ -32,4 +32,4 @@ JAVA_SRC_DIR="src/main"
 
 java_prepare() {
 	rm build.xml || die
-}
\ No newline at end of file
+}
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
index 3157e24ce125..e83c5594f58a 100644
--- a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
+++ b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild,v 1.2 2014/08/10 20:08:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild,v 1.3 2015/04/02 18:03:03 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -50,4 +50,4 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar generated/biz.aQute.junit.jar
-}
\ No newline at end of file
+}
diff --git a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
index 5ec4dfc5e913..6bf7c640e5b9 100644
--- a/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
+++ b/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild,v 1.1 2014/03/01 09:15:45 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/boilerpipe/boilerpipe-1.2.0.ebuild,v 1.2 2015/04/02 18:03:46 mr_bones_ Exp $
 
 EAPI=5
 
@@ -38,4 +38,4 @@ java_prepare() {
 src_install() {
 	java-pkg_newjar dist/${P}.jar ${PN}.jar
 	use source && java-pkg_dosrc src/main/*
-}
\ No newline at end of file
+}
diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
index 76283e7f0c80..4f36b3dcc89e 100644
--- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.4 2015/03/29 00:53:49 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild,v 1.5 2015/04/02 18:29:19 mr_bones_ Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ src_test() {
 	}
 
 	# These tests depend on a geronimo,
-	# which is not packaged yet for Gentoo unfortunately. 
+	# which is not packaged yet for Gentoo unfortunately.
 	# See bug #348853.
 	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
 	test_to_del src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
index 14a7bf151f47..b6f151a8eb92 100644
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild,v 1.2 2014/08/10 20:11:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild,v 1.3 2015/04/02 18:30:02 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ EANT_GENTOO_CLASSPATH="commons-logging"
 java_prepare() {
 	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
 
-	# these two calls is what the "jjtree-javacc" goal in the pom.xml does 
+	# these two calls is what the "jjtree-javacc" goal in the pom.xml does
 	jjtree -OUTPUT_DIRECTORY="${S}/src/main/java/org/apache/commons/jexl2/parser/" \
 		src/main/java/org/apache/commons/jexl2/parser/Parser.jjt \
 		|| die "Code generation via jjtree failed"
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
index 08c5df520e17..06108ff72a4d 100644
--- a/dev-java/dnsjava/dnsjava-2.1.6.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dnsjava/dnsjava-2.1.6.ebuild,v 1.1 2014/03/07 18:38:34 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dnsjava/dnsjava-2.1.6.ebuild,v 1.2 2015/04/02 18:04:29 mr_bones_ Exp $
 
 EAPI=5
 
@@ -47,4 +47,4 @@ src_install() {
 
 src_test() {
 	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
index cceea5f7b3ca..cfd53dd6b92e 100644
--- a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
+++ b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild,v 1.1 2013/09/11 16:28:39 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild,v 1.2 2015/04/02 18:05:57 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -47,4 +47,4 @@ src_install() {
 	java-pkg-simple_src_install
 
 	use examples && java-pkg_doexamples examples
-}
\ No newline at end of file
+}
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
index 5ae05a7fdf38..d70d7fb1818c 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/easymock-3.2-r1.ebuild,v 1.1 2013/09/11 16:26:16 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/easymock/easymock-3.2-r1.ebuild,v 1.2 2015/04/02 18:05:14 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -55,4 +55,4 @@ src_install() {
 	java-pkg-simple_src_install
 
 	use examples && java-pkg_doexamples examples
-}
\ No newline at end of file
+}
diff --git a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
index f84fbc250d35..ef17a421edc6 100644
--- a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
+++ b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild,v 1.2 2014/08/10 20:12:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild,v 1.3 2015/04/02 18:06:40 mr_bones_ Exp $
 
 EAPI=5
 
@@ -30,4 +30,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc apidocs
 	use source && java-pkg_dosrc src/
-}
\ No newline at end of file
+}
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
index 080c94ba8a17..5c68ed8e6c2b 100644
--- a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild,v 1.1 2014/03/08 16:43:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild,v 1.2 2015/04/02 18:30:46 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -54,7 +54,7 @@ java_prepare() {
 	use minimal || EANT_BUILD_TARGET=" jar.docbook jar.about jar.browser"
 }
 
-# Investigate building demos/photogallery demos/filebrowser because 
+# Investigate building demos/photogallery demos/filebrowser because
 # the files seem to be missing for jar.photogaller jar.filebrowser
 EANT_BUILD_TARGET="jar.core"
 EANT_DOC_TARGET="docs"
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index 87e49b1b6b01..768c46a2d439 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild,v 1.2 2013/10/23 17:50:52 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild,v 1.3 2015/04/02 18:07:23 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -36,4 +36,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java/javax
-}
\ No newline at end of file
+}
diff --git a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
index 18eb3d78b13b..edafeca5ca6f 100644
--- a/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
+++ b/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild,v 1.2 2014/03/10 21:06:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild,v 1.3 2015/04/02 18:08:06 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -39,4 +39,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java/javax
-}
\ No newline at end of file
+}
diff --git a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
index 244c159149dd..4182bdf73d86 100644
--- a/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
+++ b/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild,v 1.2 2013/10/23 17:21:57 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1.ebuild,v 1.3 2015/04/02 18:08:49 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -35,4 +35,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java/javax
-}
\ No newline at end of file
+}
diff --git a/dev-java/headius-options/headius-options-1.1.ebuild b/dev-java/headius-options/headius-options-1.1.ebuild
index ecbc28c0a824..cb6d69c174b0 100644
--- a/dev-java/headius-options/headius-options-1.1.ebuild
+++ b/dev-java/headius-options/headius-options-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/headius-options/headius-options-1.1.ebuild,v 1.1 2014/05/03 19:22:31 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/headius-options/headius-options-1.1.ebuild,v 1.2 2015/04/02 18:09:32 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -43,4 +43,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java/com
-}
\ No newline at end of file
+}
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild
index 3e54a8b74f9d..ff2d127fe261 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild,v 1.1 2013/12/01 16:08:26 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild,v 1.2 2015/04/02 18:31:30 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -45,7 +45,7 @@ EANT_TEST_ANT_TASKS="ant-junit"
 java_prepare() {
 	# The Ehcache cache storage depends on a version of Ehcache
 	# (with a .replace(Element, Element) method) >= 2.2.0 which can only be built
-	# with the proprietary terracotta library 
+	# with the proprietary terracotta library
 	rm "${S}"/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java \
 		"${S}"/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java \
 		"${S}"/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java || die
diff --git a/dev-java/invokebinder/invokebinder-1.2.ebuild b/dev-java/invokebinder/invokebinder-1.2.ebuild
index b78b88c3dd90..ddba0820ed2e 100644
--- a/dev-java/invokebinder/invokebinder-1.2.ebuild
+++ b/dev-java/invokebinder/invokebinder-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/invokebinder/invokebinder-1.2.ebuild,v 1.3 2014/08/10 20:15:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/invokebinder/invokebinder-1.2.ebuild,v 1.4 2015/04/02 18:10:15 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -43,4 +43,4 @@ src_install() {
 
 		dodoc README.markdown
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild
index 256fa327bbfd..c07bee67f7c4 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild,v 1.2 2014/08/10 20:15:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.6.2.ebuild,v 1.3 2015/04/02 18:10:58 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -48,4 +48,4 @@ src_install() {
 	java-pkg_newjar target/${P}.jar
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
-}
\ No newline at end of file
+}
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
index 6f2a15280a53..5ac024429e78 100644
--- a/dev-java/janino/janino-2.7.0.ebuild
+++ b/dev-java/janino/janino-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/janino/janino-2.7.0.ebuild,v 1.1 2013/10/11 16:22:05 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/janino/janino-2.7.0.ebuild,v 1.2 2015/04/02 18:11:41 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -45,4 +45,4 @@ java_prepare() {
 src_install() {
 	java-pkg-simple_src_install
 	use examples && java-pkg_doexamples examples/
-}
\ No newline at end of file
+}
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild
index 172f67de0259..f7c909e1b9f1 100644
--- a/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild
+++ b/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild,v 1.2 2014/05/10 08:49:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild,v 1.3 2015/04/02 18:12:25 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -40,4 +40,4 @@ src_install() {
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java/org
-}
\ No newline at end of file
+}
diff --git a/dev-java/jmock/jmock-2.5.1.ebuild b/dev-java/jmock/jmock-2.5.1.ebuild
index 2ad5e1cbd953..2ca021e8091b 100644
--- a/dev-java/jmock/jmock-2.5.1.ebuild
+++ b/dev-java/jmock/jmock-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-2.5.1.ebuild,v 1.2 2014/08/10 20:18:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-2.5.1.ebuild,v 1.3 2015/04/02 18:13:09 mr_bones_ Exp $
 
 EAPI=5
 
@@ -42,4 +42,4 @@ src_prepare() {
 	find -name "*.class" -delete || die
 
 	epatch "${FILESDIR}/${PV}-invokeAll-invokeAny.patch"
-}
\ No newline at end of file
+}
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
index 5796c40734af..7c1a40b7672e 100644
--- a/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
+++ b/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild,v 1.2 2013/10/23 18:21:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild,v 1.3 2015/04/02 18:13:52 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -38,4 +38,4 @@ src_install() {
 	use source && java-pkg_dosrc src/main/java/jnr
 	use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
 	use doc && java-pkg_dojavadoc target/site/apidocs
-}
\ No newline at end of file
+}
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index e9463a8af31a..8a3e81970cbd 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -3,6 +3,6 @@ DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe
 DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
 DIST jnr-ffi-0.7.7.tar.gz 130740 SHA256 d0f93346af0edd922e330975524f01f3dc5a2beb329fc5a62e32fd5153992807 SHA512 41a315fa6e03837e675a06d1f537a080430005c3a6ba63d03b3471998171a82b8205ba3d784a4d6b6ed4f94aeeac51121057580d51b14362216fac820eff2fa5 WHIRLPOOL 0ac7f995b396e95fdd80c470d2df328af7f97209feb09367ada66f49640a4fc413e111eb8e6748e9bd7341bc974e8b8dad2235be2de9b78621699b675d845225
 DIST jnr-ffi-0.7.9.tar.gz 131265 SHA256 8b9cefd983afc45cdf9dbe6a0f8915d636f26708c3e87de3e88156f0d87cef7d SHA512 fe6d2735fb538b11d9cc72e02f9cf37151db1750caad3ad8a758055d4693ca1e928d101e4f87b1037b99b982eaac7b878e56cc81c441f36e088ca24ca28de8ac WHIRLPOOL 0beca5fd67ff08c92e3a22e625e1ebc088dfdaa2250da0f6de808fec2dbc2fddfd98fa3bda73d7a9c436f7e905ce57901a6e8dcadfeee93b13fe071aa23ff501
-DIST jnr-ffi-1.0.10.tar.gz 169255 SHA256 baa6ba61b0e336c141d1a4a3787f946363d6c60ce033bb5045356279cbcc047d SHA512 d1c412284a62e830850702349d8441239a5c403968d23ae2d7ff629d27997443b4f40e4ed7dbb0cee0be247c08d6ef9ffe4ffb4e066c7898df3c3046c1ca1511 WHIRLPOOL 431f9772d311b442c149e98db62a713ef620faeb2f1d08320bc89246027a1a006c1e1bfbb81cb0bd06c7b97ba63e6c7632d4ac56dc31ac4f8349e11ca7bafa5d
+DIST jnr-ffi-1.0.10.tar.gz 169196 SHA256 8d37e264705551a0f6b0283046dcc1264b311925874d7f674a6abc1f1f85775b SHA512 a46899e6a71c6fc5ad8586eae8dd718998de1ab30fe7c4b396a6291a54a63057c229c86c195c59e790bff13daa628adcb0caaacb05b1d58683e493fd6aa7fc3b WHIRLPOOL 467b1730a6e6ad494a00063c85bd90c34019df8730ce3a74b60d635f6f574ca0542fa3e2769beb1cecbe0feba2356662f0a2f35021ae425be52cdf1e63d73a1c
 DIST jnr-ffi-1.0.6.tar.gz 168393 SHA256 b049161d4e327085d3c9074dd97c41000fb812b8c5ea6c70a75474db469b81a1 SHA512 7673f9d5a513713bff5992a69db848315f7961a3417c4a247bb26226535d25172b6de26bc4ecc58ae8889da2ba62de40a6e434fb3a4b21a820962e2bce2ba2fa WHIRLPOOL b39831407e3210ce5736842bce4a5ade2d1727abfcfd159ae2d376e78c8fe4f88b3757e7a97e06c56aa47845fded054506f27141ab057a9266d3b06dba0c08c1
-DIST jnr-ffi-2.0.2.tar.gz 170768 SHA256 84866283259fcb1ee7804f264bc516e966a730d162e423e07ef147eca80f7dc5 SHA512 65912f612860a329ebbab06e447ae72de7ac2f48780be1f6c565c4286629554eef2cd4fa7db7422ddb0540bd9da4479d9544ff6f61a1f209df22b92b62e28e26 WHIRLPOOL 4983889d93c2d5dc763680dced977741ccfe98119243eb03612217cf253d2913d8e628d7959f2e17905fc818fbe62ab922c0497907afb7b4001432b1084d9335
+DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
index bf78106b7b9d..61d3a8131b07 100644
--- a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.3 2015/03/29 00:27:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.4 2015/04/02 22:13:15 chewi Exp $
 
 EAPI="5"
 
@@ -31,12 +31,8 @@ DEPEND="${COMMON_DEP}
 		>=dev-java/junit-4.8:4
 	)"
 
-# Yeah, well.. don't ask me why.
-S="${WORKDIR}/jnr-${PN}-c0b5ebf"
-
 java_prepare() {
 	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
 	epatch "${FILESDIR}"/${PN}-1.0.6-junit48.patch
 }
 
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
index fda924319fee..9339005fe72f 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.2 2015/03/29 00:27:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.4 2015/04/02 22:37:02 chewi Exp $
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2 vcs-snapshot
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An abstracted interface to invoking native functions from java"
 HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="2"
@@ -46,9 +46,6 @@ EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 
 src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
 	# build native test library
 	emake BUILD_DIR=build -f libtest/GNUmakefile
 
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
index 1cb15ffe3d60..4d53de80121d 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild,v 1.1 2015/03/21 21:38:09 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild,v 1.2 2015/04/02 22:55:40 chewi Exp $
 
 EAPI="5"
 
@@ -39,13 +39,12 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
 JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
 JAVA_ANT_ENCODING="UTF-8"
 
-EANT_GENTOO_CLASSPATH="jnr-ffi-1"
+EANT_GENTOO_CLASSPATH="jnr-ffi-2"
 EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 
-# TODO: Test fails. Investigate why?
-# src_test() {
-# 	java-pkg-2_src_test
-# }
+src_test() {
+	java-pkg-2_src_test
+}
 
 src_install() {
 	java-pkg_dojar target/${PN}.jar
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
index 98098970a2d2..4bb073bdd218 100644
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild,v 1.2 2013/10/23 18:27:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild,v 1.3 2015/04/02 18:14:35 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -39,4 +39,4 @@ src_install() {
 	use source && java-pkg_dosrc src/main/java/jnr
 	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
 	use doc && java-pkg_dojavadoc target/site/apidocs
-}
\ No newline at end of file
+}
diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r1.ebuild
index 00246e8ed4dd..cb9c8b26ee21 100644
--- a/dev-java/libg/libg-2.1.0-r1.ebuild
+++ b/dev-java/libg/libg-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libg/libg-2.1.0-r1.ebuild,v 1.2 2014/08/10 20:21:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libg/libg-2.1.0-r1.ebuild,v 1.3 2015/04/02 18:32:12 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 # its own turn again depends on aQute.libg again; we can temporarily assume that
 # if bndlib tests pass that libg is sufficiently tested, in the future we should
 # look whether it is feasible to combine the packages or otherwise temporarily
-# build biz.aquite.bndlib and biz.aqute.junit in this package. 
+# build biz.aquite.bndlib and biz.aqute.junit in this package.
 RESTRICT="test"
 
 DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/logback/logback-1.0.13.ebuild b/dev-java/logback/logback-1.0.13.ebuild
index 1c1cee5d3f56..65cd51ac39cb 100644
--- a/dev-java/logback/logback-1.0.13.ebuild
+++ b/dev-java/logback/logback-1.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/logback-1.0.13.ebuild,v 1.1 2013/12/23 07:38:53 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/logback-1.0.13.ebuild,v 1.2 2015/04/02 18:32:56 mr_bones_ Exp $
 
 EAPI=5
 
@@ -39,7 +39,7 @@ java_prepare() {
 	find "${S}" -name "*.jar" -delete || die
 
 	use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die
-	# remove the next line when we have jetty in the tree 
+	# remove the next line when we have jetty in the tree
 	rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die
 
 	use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7"
diff --git a/dev-java/opencsv/opencsv-2.3.ebuild b/dev-java/opencsv/opencsv-2.3.ebuild
index cb2031494f90..007dba39c83c 100644
--- a/dev-java/opencsv/opencsv-2.3.ebuild
+++ b/dev-java/opencsv/opencsv-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/opencsv/opencsv-2.3.ebuild,v 1.1 2014/07/11 17:49:16 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/opencsv/opencsv-2.3.ebuild,v 1.2 2015/04/02 18:15:18 mr_bones_ Exp $
 
 EAPI=5
 
@@ -34,4 +34,4 @@ src_install() {
 	java-pkg_newjar deploy/${P}.jar ${PN}.jar
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc src/au
-}
\ No newline at end of file
+}
diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
index 0875c25174bf..087659eabf17 100644
--- a/dev-java/pdfbox/pdfbox-1.8.8.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.2 2015/02/22 12:01:04 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/pdfbox/pdfbox-1.8.8.ebuild,v 1.3 2015/04/02 18:33:40 mr_bones_ Exp $
 EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
@@ -61,7 +61,7 @@ src_test() {
 	# So let's move our precious jar to another dir
 	mv target/${P}.jar ${P}.jar
 
-	# TODO: not all tests pass; investigate why. 
+	# TODO: not all tests pass; investigate why.
 	# (is it our business or upstream's?)
 	java-pkg-2_src_test
 }
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
index dec801996929..e1b1bbbfae47 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild,v 1.1 2013/11/30 09:49:32 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild,v 1.2 2015/04/02 18:16:01 mr_bones_ Exp $
 
 EAPI=5
 
@@ -45,4 +45,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
index bffeb022eb59..2d5248e6a469 100644
--- a/dev-java/snappy/snappy-1.0.3_rc3.ebuild
+++ b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snappy/snappy-1.0.3_rc3.ebuild,v 1.1 2013/11/24 15:09:03 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snappy/snappy-1.0.3_rc3.ebuild,v 1.2 2015/04/02 18:16:44 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -63,4 +63,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
index 8d110684c982..f8199cd8ce8c 100644
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snappy/snappy-1.1.0.1.ebuild,v 1.1 2013/11/24 15:09:03 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snappy/snappy-1.1.0.1.ebuild,v 1.2 2015/04/02 18:16:44 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -63,4 +63,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/spring-aop/spring-aop-3.2.4.ebuild b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
index ed31333d5f20..a042efca3f68 100644
--- a/dev-java/spring-aop/spring-aop-3.2.4.ebuild
+++ b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spring-aop/spring-aop-3.2.4.ebuild,v 1.1 2013/10/18 16:55:36 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spring-aop/spring-aop-3.2.4.ebuild,v 1.2 2015/04/02 18:17:27 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -70,4 +70,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/spring-expression/spring-expression-3.2.4.ebuild b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
index 08d2f6123d79..d91aee485edc 100644
--- a/dev-java/spring-expression/spring-expression-3.2.4.ebuild
+++ b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/spring-expression/spring-expression-3.2.4.ebuild,v 1.1 2013/10/18 16:59:16 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/spring-expression/spring-expression-3.2.4.ebuild,v 1.2 2015/04/02 18:18:11 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -58,4 +58,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/dev-java/stax-ex/stax-ex-1.0-r2.ebuild b/dev-java/stax-ex/stax-ex-1.0-r2.ebuild
index 68d764a3f071..261bfa71387b 100644
--- a/dev-java/stax-ex/stax-ex-1.0-r2.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/stax-ex/stax-ex-1.0-r2.ebuild,v 1.1 2014/08/17 08:47:21 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/stax-ex/stax-ex-1.0-r2.ebuild,v 1.2 2015/04/02 18:18:54 mr_bones_ Exp $
 
 EAPI=5
 
@@ -31,4 +31,4 @@ S="${WORKDIR}/${P}"
 
 src_prepare() {
 	rm "${S}"/build.xml || die
-}
\ No newline at end of file
+}
diff --git a/dev-java/tablelayout/tablelayout-20090826.ebuild b/dev-java/tablelayout/tablelayout-20090826.ebuild
index ab9149004d08..83d12267f01c 100644
--- a/dev-java/tablelayout/tablelayout-20090826.ebuild
+++ b/dev-java/tablelayout/tablelayout-20090826.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/tablelayout-20090826.ebuild,v 1.1 2015/03/22 09:08:07 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tablelayout/tablelayout-20090826.ebuild,v 1.2 2015/04/02 18:19:37 mr_bones_ Exp $
 
 EAPI=5
 
@@ -25,4 +25,4 @@ JAVA_SRC_DIR="src"
 java_prepare() {
 	unzip TableLayout-src-2009-08-26.jar -d src || die
 	rm *.jar || die
-}
\ No newline at end of file
+}
diff --git a/dev-java/testng/testng-6.8-r2.ebuild b/dev-java/testng/testng-6.8-r2.ebuild
index c54fe8d0bbe6..521b4e81d7bc 100644
--- a/dev-java/testng/testng-6.8-r2.ebuild
+++ b/dev-java/testng/testng-6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/testng/testng-6.8-r2.ebuild,v 1.2 2014/08/10 20:25:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/testng/testng-6.8-r2.ebuild,v 1.3 2015/04/02 18:34:23 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -59,7 +59,7 @@ java_prepare() {
 	#     TrueParallelTest - Doesn't always work, especially not on a system
 	#                        under load; since this could fail during parallel
 	#                        emerges, we assume the underlying functionality to
-	#                        work as it has definitely succeeded under lower load. 
+	#                        work as it has definitely succeeded under lower load.
 	sed -i '/test.thread.TrueParallelTest/d' src/test/resources/testng.xml || die
 
 	mkdir lib || die
diff --git a/dev-java/trident/trident-1.3.ebuild b/dev-java/trident/trident-1.3.ebuild
index 271732a21332..514fa3e069b8 100644
--- a/dev-java/trident/trident-1.3.ebuild
+++ b/dev-java/trident/trident-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/trident/trident-1.3.ebuild,v 1.1 2014/07/11 17:52:10 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/trident/trident-1.3.ebuild,v 1.2 2015/04/02 18:20:20 mr_bones_ Exp $
 
 EAPI=5
 
@@ -44,4 +44,4 @@ src_install() {
 	java-pkg_dojar drop/${PN}.jar
 
 	use source && java-pkg_dosrc src/*
-}
\ No newline at end of file
+}
diff --git a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
index 86a094b31439..0cb9ba3b18aa 100644
--- a/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
+++ b/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild,v 1.1 2014/08/17 08:51:39 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlstreambuffer/xmlstreambuffer-1.5.3.ebuild,v 1.2 2015/04/02 18:21:04 mr_bones_ Exp $
 
 EAPI=5
 
@@ -26,4 +26,4 @@ DEPEND=">=virtual/jdk-1.5
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
 
-JAVA_GENTOO_CLASSPATH="stax-ex-1"
\ No newline at end of file
+JAVA_GENTOO_CLASSPATH="stax-ex-1"
diff --git a/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild b/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild
index 52ddab5edb72..ac262620dd69 100644
--- a/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild
+++ b/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild,v 1.3 2015/01/04 15:29:10 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-5.0.1_pre20131115.ebuild,v 1.4 2015/04/02 18:35:06 mr_bones_ Exp $
 
 EAPI=5
 
@@ -64,7 +64,7 @@ src_install() {
 	addpredict /usr/$(get_libdir)/crt1.o
 	addpredict /usr/$(get_libdir)/crtn.o
 
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary. 
+	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
 	# We must use XT_PAX to run the installer.
 	if [[ ${PAX_MARKINGS} == "XT" ]]; then
 		pax-mark m ${P}.run
diff --git a/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild b/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild
index b8940d645552..92116f7b1af1 100644
--- a/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild
+++ b/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild,v 1.1 2015/02/28 21:55:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-5.0.5_pre20150226.ebuild,v 1.2 2015/04/02 18:35:06 mr_bones_ Exp $
 
 EAPI=5
 
@@ -66,7 +66,7 @@ src_install() {
 #		addpredict /usr/${libdir}/crtn.o
 #	done
 
-	# EI_PAX marking is obsolete and PT_PAX breaks the binary. 
+	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
 	# We must use XT_PAX to run the installer.
 	if [[ ${PAX_MARKINGS} == "XT" ]]; then
 		pax-mark m ${P}.run
diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.2.ebuild
index fdddb6f2ef8d..c8336ecbccc7 100644
--- a/dev-lang/luajit/luajit-2.0.2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.2.ebuild,v 1.5 2014/08/10 08:24:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.2.ebuild,v 1.6 2015/04/02 19:49:53 maekke Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/php/php-5.4.39.ebuild b/dev-lang/php/php-5.4.39.ebuild
index 9545bd3ef404..0388d40ad9bc 100644
--- a/dev-lang/php/php-5.4.39.ebuild
+++ b/dev-lang/php/php-5.4.39.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.39.ebuild,v 1.8 2015/03/31 19:03:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.39.ebuild,v 1.9 2015/04/02 19:57:47 maekke Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.5.23.ebuild b/dev-lang/php/php-5.5.23.ebuild
index ef15892d691e..e04ab00436b2 100644
--- a/dev-lang/php/php-5.5.23.ebuild
+++ b/dev-lang/php/php-5.5.23.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.23.ebuild,v 1.8 2015/03/31 19:03:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.23.ebuild,v 1.9 2015/04/02 19:58:49 maekke Exp $
 
 EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/tcl/tcl-8.5.17.ebuild b/dev-lang/tcl/tcl-8.5.17.ebuild
index a203de92ec7e..e4e0b8ef1bc9 100644
--- a/dev-lang/tcl/tcl-8.5.17.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.8 2015/04/01 08:25:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.9 2015/04/02 20:20:08 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/tk-8.5.17.ebuild b/dev-lang/tk/tk-8.5.17.ebuild
index 45b1dc4158d1..6391be0cd1cb 100644
--- a/dev-lang/tk/tk-8.5.17.ebuild
+++ b/dev-lang/tk/tk-8.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.17.ebuild,v 1.8 2015/04/01 08:25:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.17.ebuild,v 1.9 2015/04/02 20:20:56 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug threads truetype aqua xscreensaver"
 
 RDEPEND="
diff --git a/dev-libs/libflatarray/libflatarray-0.1.1.ebuild b/dev-libs/libflatarray/libflatarray-0.1.1.ebuild
index 4fd634fa19a3..d3ee3194030b 100644
--- a/dev-libs/libflatarray/libflatarray-0.1.1.ebuild
+++ b/dev-libs/libflatarray/libflatarray-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libflatarray/libflatarray-0.1.1.ebuild,v 1.2 2014/12/02 10:01:22 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libflatarray/libflatarray-0.1.1.ebuild,v 1.3 2015/04/02 18:21:47 mr_bones_ Exp $
 
 EAPI=5
 
@@ -46,4 +46,4 @@ src_install() {
 
 src_test() {
 	cmake-utils_src_make test
-}
\ No newline at end of file
+}
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index a93e129ae9c9..8ca58bbb381a 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libltdl/libltdl-2.4.6.ebuild,v 1.8 2015/04/01 08:32:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libltdl/libltdl-2.4.6.ebuild,v 1.9 2015/04/02 20:02:43 maekke Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/openct/openct-0.6.20-r3.ebuild b/dev-libs/openct/openct-0.6.20-r3.ebuild
index a1ecc1686320..e81f6507a3e0 100644
--- a/dev-libs/openct/openct-0.6.20-r3.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.14 2014/11/06 05:36:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.15 2015/04/02 18:21:41 mr_bones_ Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic multilib udev user
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
-SRC_URI="sourceforge://opensc/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index e3c32bfd5451..418405b96f0d 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r4.ebuild,v 1.2 2014/11/06 05:36:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r4.ebuild,v 1.3 2015/04/02 18:21:41 mr_bones_ Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic multilib udev user
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
-SRC_URI="sourceforge://opensc/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
index 7ba398469b2a..c99ef4abb852 100644
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
@@ -1,6 +1,6 @@
 http://bugs.gentoo.org/181438
 http://bugs.gentoo.org/327421
-https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
+https://rt.openssl.org/Ticket/Display.html?id=3331&user=guest&pass=guest
 
 make sure we respect LDFLAGS
 
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch b/dev-libs/openssl/files/openssl-1.0.2a-malloc-typo.patch
index e7995cc9d5bd..831e5759a260 100644
--- 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,3 +1,5 @@
+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
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-build.patch
index 280b8e0b5742..f4226c3b6d38 100644
--- 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,4 +1,5 @@
-http://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
+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
@@ -43,23 +44,6 @@ http://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
  
  lint:
  	@target=lint; $(RECURSIVE_MAKE)
---- openssl-1.0.2a/crypto/objects/Makefile
-+++ openssl-1.0.2a/crypto/objects/Makefile
-@@ -44,11 +44,11 @@
- # objects.pl both reads and writes obj_mac.num
- obj_mac.h: objects.pl objects.txt obj_mac.num
- 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
--	@sleep 1; touch obj_mac.h; sleep 1
- 
--obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
-+# This doesn't really need obj_mac.h, but since that rule reads & writes
-+# obj_mac.num, we can't run in parallel with it.
-+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
- 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
--	@sleep 1; touch obj_xref.h; sleep 1
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 --- openssl-1.0.2a/engines/Makefile
 +++ openssl-1.0.2a/engines/Makefile
 @@ -72,7 +72,7 @@
@@ -96,55 +80,31 @@ http://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
  
  build_crypto:
 -	@dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
--	@dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
--	@dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
--	@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
--	@dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
--	@dir=tools; 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:
-@@ -536,9 +536,9 @@
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: install_docs install_sw
- 
--install_sw:
-+install_dirs:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -547,12 +547,19 @@
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
-+	@$(PERL) $(TOP)/util/mkdir-p.pl \
-+		$(INSTALL_PREFIX)$(MANDIR)/man1 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man3 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man5 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man7
-+
-+install_sw: install_dirs
- 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
- 	do \
+@@ -555,7 +555,7 @@
  	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  	done;
@@ -153,20 +113,6 @@ http://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
  	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  	do \
  		if [ -f "$$i" ]; then \
-@@ -636,12 +643,7 @@
- 		done; \
- 	done
- 
--install_docs:
--	@$(PERL) $(TOP)/util/mkdir-p.pl \
--		$(INSTALL_PREFIX)$(MANDIR)/man1 \
--		$(INSTALL_PREFIX)$(MANDIR)/man3 \
--		$(INSTALL_PREFIX)$(MANDIR)/man5 \
--		$(INSTALL_PREFIX)$(MANDIR)/man7
-+install_docs: install_dirs
- 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- 	here="`pwd`"; \
- 	filecase=; \
 --- openssl-1.0.2a/Makefile.shared
 +++ openssl-1.0.2a/Makefile.shared
 @@ -105,6 +105,7 @@
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch
new file mode 100644
index 000000000000..0198818c5fa3
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch
@@ -0,0 +1,64 @@
+https://rt.openssl.org/Ticket/Display.html?id=3736&user=guest&pass=guest
+
+From aba899f2eca21e11e5e9797bf8258e7265dea9f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 8 Mar 2015 01:32:01 -0500
+Subject: [PATCH] fix parallel install with dir creation
+
+The mkdir-p.pl does not handle parallel creation of directories.
+This comes up when the install_sw and install_docs rules run and
+both call mkdir-p.pl on sibling directory trees.
+
+Instead, lets create a single install_dirs rule that makes all of
+the dirs we need, and have these two install steps depend on that.
+---
+ Makefile.org | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index a6d9471..78e6143 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -536,9 +536,9 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: install_docs install_sw
+ 
+-install_sw:
++install_dirs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -547,6 +547,13 @@
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++	@$(PERL) $(TOP)/util/mkdir-p.pl \
++		$(INSTALL_PREFIX)$(MANDIR)/man1 \
++		$(INSTALL_PREFIX)$(MANDIR)/man3 \
++		$(INSTALL_PREFIX)$(MANDIR)/man5 \
++		$(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -636,12 +643,7 @@
+ 		done; \
+ 	done
+ 
+-install_docs:
+-	@$(PERL) $(TOP)/util/mkdir-p.pl \
+-		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+-- 
+2.3.4
+
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch
new file mode 100644
index 000000000000..a7d6f4effea7
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch
@@ -0,0 +1,37 @@
+https://rt.openssl.org/Ticket/Display.html?id=3737&user=guest&pass=guest
+
+From ce279d4361e07e9af9ceca8a6e326e661758ad53 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 8 Mar 2015 01:34:48 -0500
+Subject: [PATCH] fix parallel generation of obj headers
+
+The current code has dummy sleep/touch commands to try and work
+around the parallel issue, but that is obviously racy.  Instead
+lets force one of the files to depend on the other so we know
+they'll never run in parallel.
+---
+ crypto/objects/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
+index ad2db1e..7d32504 100644
+--- a/crypto/objects/Makefile
++++ b/crypto/objects/Makefile
+@@ -44,11 +44,11 @@
+ # objects.pl both reads and writes obj_mac.num
+ obj_mac.h: objects.pl objects.txt obj_mac.num
+ 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
+-	@sleep 1; touch obj_mac.h; sleep 1
+ 
+-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
++# This doesn't really need obj_mac.h, but since that rule reads & writes
++# obj_mac.num, we can't run in parallel with it.
++obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
+ 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
+-	@sleep 1; touch obj_xref.h; sleep 1
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-- 
+2.3.4
+
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch
new file mode 100644
index 000000000000..d894f2c87e5f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch
@@ -0,0 +1,61 @@
+From cc81af135bda47eaa6956a0329cbbc55bf993ac1 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 3 Apr 2015 01:16:23 -0400
+Subject: [PATCH] fix race when symlink shareds libs
+
+When the crypto/ssl targets attempt to build their shared libs, they run:
+	cd ..; make libcrypto.so.1.0.0
+The top level Makefile in turn runs the build-shared target for that lib.
+
+The build-shared target depends on both do_$(SHLIB_TARGET) & link-shared.
+When building in parallel, make is allowed to run both of these.  They
+both run Makefile.shared for their respective targets:
+do_$(SHLIB_TARGET) ->
+	link_a.linux-shared ->
+	link_a.gnu ->
+	...; $(LINK_SO_A) ->
+	$(LINK_SO) ->
+	$(SYMLINK_SO)
+link-shared ->
+	symlink.linux-shared ->
+	symlink.gnu ->
+	...; $(SYMLINK_SO)
+
+The shell code for SYMLINK_SO attempts to do a [ -e lib ] check, but fails
+basic TOCTOU semantics.  Depending on the load, that means two processes
+will run the sequence:
+	rm -f libcrypto.so
+	ln -s libcrypto.so.1.0.0 libcrypto.so
+
+Which obviously fails:
+	ln: failed to create symbolic link 'libcrypto.so': File exists
+
+Since we know do_$(SHLIB_TARGET) will create the symlink for us, don't
+bother depending on link-shared at all in the top level Makefile when
+building things.
+
+Reported-by: Martin von Gagern <Martin.vGagern@gmx.net>
+URL: https://bugs.gentoo.org/545028
+---
+ Makefile.org | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.org b/Makefile.org
+index 890bfe4..576c60e 100644
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -350,7 +350,10 @@ link-shared:
+ 		libs="$$libs -l$$i"; \
+ 	done
+ 
+-build-shared: do_$(SHLIB_TARGET) link-shared
++# The link target in Makefile.shared will create the symlink for us, so no need
++# to call link-shared directly.  Doing so will cause races with two processes
++# trying to symlink the lib.
++build-shared: do_$(SHLIB_TARGET)
+ 
+ do_$(SHLIB_TARGET):
+ 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
+-- 
+2.3.4
+
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
index c2c3a8eff5af..3a005c9b099d 100644
--- a/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
+++ b/dev-libs/openssl/files/openssl-1.0.2a-x32-asm.patch
@@ -1,3 +1,5 @@
+https://rt.openssl.org/Ticket/Display.html?id=3759&user=guest&pass=guest
+
 From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Sat, 21 Mar 2015 06:01:25 -0400
diff --git a/dev-libs/openssl/openssl-1.0.2a.ebuild b/dev-libs/openssl/openssl-1.0.2a.ebuild
index 92ccfc149b5d..86acfdea4f06 100644
--- a/dev-libs/openssl/openssl-1.0.2a.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.6 2015/03/21 11:02:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2a.ebuild,v 1.9 2015/04/03 05:44:45 vapier Exp $
 
 EAPI="4"
 
@@ -60,9 +60,12 @@ src_prepare() {
 		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}"/${PN}-1.0.2a-malloc-typo.patch #543828
+		epatch "${FILESDIR}"/${P}-malloc-typo.patch #543828
 		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
 
 		epatch_user #332661
diff --git a/dev-libs/qof/qof-0.8.8.ebuild b/dev-libs/qof/qof-0.8.8.ebuild
index 04a14fa88ba5..3fed85be8999 100644
--- a/dev-libs/qof/qof-0.8.8.ebuild
+++ b/dev-libs/qof/qof-0.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.8.ebuild,v 1.3 2015/03/15 13:18:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.8.ebuild,v 1.4 2015/04/02 18:35:49 mr_bones_ Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -36,7 +36,7 @@ src_prepare() {
 	# Remove some CFLAGS
 	epatch "${FILESDIR}"/${PN}-0.8.8-cflags.patch
 
-	# Delay build of unittests, bug #197999 
+	# Delay build of unittests, bug #197999
 	epatch "${FILESDIR}"/${PN}-0.8.8-unittest.patch
 
 	# Fix use and build with yacc
diff --git a/dev-libs/quazip/quazip-0.6.2-r1.ebuild b/dev-libs/quazip/quazip-0.6.2-r1.ebuild
index e4ceaff720cf..ffa9167eba8a 100644
--- a/dev-libs/quazip/quazip-0.6.2-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.6.2-r1.ebuild,v 1.6 2015/03/31 07:47:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/quazip/quazip-0.6.2-r1.ebuild,v 1.7 2015/04/02 20:11:06 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
index 82b13e621d5c..95efb98f534d 100644
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild
+++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.5 2014/03/01 22:19:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.3.ebuild,v 1.6 2015/04/02 18:36:32 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 src_prepare() {
 
-	# Aclocal 1.13 deprecated error #467674	
+	# Aclocal 1.13 deprecated error #467674
 	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
 
 	autotools-utils_src_prepare
diff --git a/dev-libs/ucommon/ucommon-6.1.8.ebuild b/dev-libs/ucommon/ucommon-6.1.8.ebuild
index 858c5a1c74d8..2f062b60cde1 100644
--- a/dev-libs/ucommon/ucommon-6.1.8.ebuild
+++ b/dev-libs/ucommon/ucommon-6.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.1.8.ebuild,v 1.1 2014/06/27 08:46:59 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.1.8.ebuild,v 1.2 2015/04/02 18:36:32 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/6.1/disable_rtf_gen_doxy.patch
 
 src_prepare() {
 
-	# Aclocal 1.13 deprecated error BGO #467674	
+	# Aclocal 1.13 deprecated error BGO #467674
 	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
 
 	autotools-utils_src_prepare
diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index ba5b741753ec..8212ec6ce94d 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1 +1 @@
-DIST xml-security-c-1.6.1.tar.gz 864366 SHA256 73931a55d6925a82416ea48f8d6f1b8ed591368e1dfc30574fe43904b7c62fcd SHA512 34a17082ade3f327bccf7f4d7e4822caafc3d74f7bbbe37e7d5670917bd3f645b37ba7e9189f6feb1312b68deac2d52bb96c127a276952f9dddb0accbf50a95e WHIRLPOOL a0da79dcb435b8b5f900a5e87b0b46b7adaa54022b38ac48e68e59692250e410133763f8373952d45d78afe0d0311f09633357396fe9aae350d2f5eea3483103
+DIST xml-security-c-1.7.3.tar.gz 909320 SHA256 e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583 SHA512 ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2 WHIRLPOOL 5aba039916ffabdb6394c5a97ce10027a546cbba9b7978bfde06db22ee48e6820a42db9d1e1095fc2ef7235cb2e6f948bbe3fd6dcaf5e99f16316111a28a717b
diff --git a/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild b/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
similarity index 79%
rename from dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild
rename to dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
index 364e957500bb..4457daa2d7ae 100644
--- a/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild
+++ b/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/xml-security-c-1.6.1.ebuild,v 1.3 2014/08/10 20:40:37 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild,v 1.1 2015/04/02 19:27:51 pinkbyte Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="Apache C++ XML security libraries"
 HOMEPAGE="http://santuario.apache.org/"
 SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="debug examples nss static-libs xalan"
 
 RDEPEND=">=dev-libs/xerces-c-3.1
@@ -21,8 +23,11 @@ RDEPEND=">=dev-libs/xerces-c-3.1
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+DOCS=( CHANGELOG.txt NOTICE.txt )
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-nss-compilation-fix.patch"
+	epatch "${FILESDIR}/1.6.1-nss-compilation-fix.patch"
+	epatch_user
 }
 
 src_configure() {
@@ -35,7 +40,6 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="CHANGELOG.txt NOTICE.txt"
 	default
 	if use examples ; then
 		insinto /usr/share/doc/${PF}/examples
diff --git a/dev-lua/lgi/lgi-0.6.2-r1.ebuild b/dev-lua/lgi/lgi-0.6.2-r1.ebuild
index 16b0303d73ff..1c74f12cf1b3 100644
--- a/dev-lua/lgi/lgi-0.6.2-r1.ebuild
+++ b/dev-lua/lgi/lgi-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.6.2-r1.ebuild,v 1.1 2013/02/08 15:48:18 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.6.2-r1.ebuild,v 1.2 2015/04/02 18:22:41 mr_bones_ Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://github.com/downloads/pavouk/lgi/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="examples"
+IUSE="examples test"
 
 RDEPEND=">=dev-lang/lua-5.1
 		dev-libs/gobject-introspection
diff --git a/dev-lua/lgi/lgi-0.7.2.ebuild b/dev-lua/lgi/lgi-0.7.2.ebuild
index e34220405120..8f16ff88fd60 100644
--- a/dev-lua/lgi/lgi-0.7.2.ebuild
+++ b/dev-lua/lgi/lgi-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.7.2.ebuild,v 1.6 2014/03/14 04:05:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.7.2.ebuild,v 1.7 2015/04/02 18:22:41 mr_bones_ Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/0.7.2.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="examples"
+IUSE="examples test"
 
 RDEPEND=">=dev-lang/lua-5.1
 		dev-libs/gobject-introspection
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0.ebuild
new file mode 100644
index 000000000000..de9ef146e591
--- /dev/null
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-SessionData/IO-SessionData-1.30.0.ebuild,v 1.1 2015/04/02 21:18:24 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Session data support module for SOAP::Lite"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST=do
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
new file mode 100644
index 000000000000..86e32ada0dbe
--- /dev/null
+++ b/dev-perl/IO-SessionData/Manifest
@@ -0,0 +1 @@
+DIST IO-SessionData-1.03.tar.gz 5377 SHA256 64a4712a3edbb3fd10230db296c29c8c66f066adfbc0c3df6a48258fef392ddd SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e WHIRLPOOL 462aded0821b27b64e66e96a16e82103229e2f137825e8415f40ebb7f32e6b5a0ad279ff29cf8ed1ce2a3f529e0c7a2b55553dc819d8178742936560212c354c
diff --git a/dev-perl/IO-SessionData/metadata.xml b/dev-perl/IO-SessionData/metadata.xml
new file mode 100644
index 000000000000..801e9385a1e0
--- /dev/null
+++ b/dev-perl/IO-SessionData/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/Proc-Daemon/Manifest b/dev-perl/Proc-Daemon/Manifest
index c32bbbbebf69..19468ad9629a 100644
--- a/dev-perl/Proc-Daemon/Manifest
+++ b/dev-perl/Proc-Daemon/Manifest
@@ -1 +1,2 @@
 DIST Proc-Daemon-0.14.tar.gz 14464 SHA256 8010d461a146b8c288a7b321e6e41e5b47b1774cae8cd7ee66cf2deca80b6f92 SHA512 d51b62e6ada2fc6702d582244a7db6171e942d0f3311e7be39cf503a7a17b73ed40916c1430fc7366dd6c97d72eb3e7af554c2ad1bc6d8fbf240bf3a2ed630ca WHIRLPOOL 5e3aa00d66f17e39165cbbf3fc11cfb6d01ddd0d8b80c5c7c55742ae392f83ab75b111d888c9c7f9e4311ccb69d92811c650b3e67d7cd9397f3601e8a1751723
+DIST Proc-Daemon-0.19.tar.gz 22500 SHA256 b3f0fee4512f2e4c9f498d776dfe9aea1200f0b535a3a32c4d20c3b60a5f3dfa SHA512 11ed2c33f785692ee2ba7f8e15d2e729497ba44684f5764a29bf33752db675b565fc12241cb45a1d79b020543b03a74aa036400da41cdee933939bcc757a81fc WHIRLPOOL 5827eadb715a01f945b548668c60bbb2a8e03b275b077061cd0ad3fe42c6a49932c9a5a0a6e9d192f963447d47f15fe3e073e2958b03de9f8a8ec7231a5c4706
diff --git a/dev-perl/Proc-Daemon/Proc-Daemon-0.190.0.ebuild b/dev-perl/Proc-Daemon/Proc-Daemon-0.190.0.ebuild
new file mode 100644
index 000000000000..bc536f79087f
--- /dev/null
+++ b/dev-perl/Proc-Daemon/Proc-Daemon-0.190.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Proc-Daemon/Proc-Daemon-0.190.0.ebuild,v 1.1 2015/04/02 21:07:24 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=AKREAL
+MODULE_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="Run Perl program as a daemon process"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? ( dev-perl/Proc-ProcessTable )
+"
+
+SRC_TEST="do"
diff --git a/dev-perl/SOAP-Lite/Manifest b/dev-perl/SOAP-Lite/Manifest
index 2b11e45153f1..55a747e81be7 100644
--- a/dev-perl/SOAP-Lite/Manifest
+++ b/dev-perl/SOAP-Lite/Manifest
@@ -1,2 +1,2 @@
-DIST SOAP-Lite-0.715.tar.gz 233829 SHA256 77d837c405e9ff0d665532673c3e3f978e95e543d22d167323334a929eeb0145 SHA512 e83258c4058bfa25f27a6e920ea15a4e180fafdaf1084de7923bb939ffc017350ae565d9c1a76d3c749c051428734f292b2f5d14a93ed8a9d948a2bc3887b0e5 WHIRLPOOL 16b9741c1aae699e6df76ef28301f5130575869ad1c453fd6be6292b555e53f5e28474518d86390637360712ebabfd31fcc27ae4ddf92ca6124e2cbe08326c7c
 DIST SOAP-Lite-1.04.tar.gz 222598 SHA256 30dd8240cc79e58d3fa4d314f9bde174ca90a481ab5904f58c84bc8812bc7887 SHA512 3f9ac332ff1b914b9de155c9662f46838aaec8c0a45b29f8eac383286eea63bebfc6a4a5124dec14292176c45c6cc35ba06657a03cc0d3b1331fe9a9d6f17eaa WHIRLPOOL 5d1a9e595d83eaf82a2be4cb2a0afaf8c1fbe744433ab1e70e40ef8e522cb54e11ce0917ea1858a55d353da86290f95137690e2021d78f842c9ff4537f3df3c0
+DIST SOAP-Lite-1.14.tar.gz 276774 SHA256 a201bed80db9b76a4ada9768281489c070fb8a25f4481d1296c92a5111ce1756 SHA512 6ad26f69aeb7ebf1b05c64e30e42918f970a0eaaf6c764baa4cc21a931e13921ba3d4796175324bf3e4e5c11b05f59d84bb17a49d87a1579024b242e251255ab WHIRLPOOL 260301ed3a9468e4a255842963dfc6094e1773575f7ddb80feeaad6b39325df5a361d0e329a40b8a5ed31af8f14ee4bb2930bfc0bf719eac3b1dc9f2bbb18a16
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-0.715.0-r1.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-0.715.0-r1.ebuild
deleted file mode 100644
index a8f5c41f054a..000000000000
--- a/dev-perl/SOAP-Lite/SOAP-Lite-0.715.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SOAP-Lite/SOAP-Lite-0.715.0-r1.ebuild,v 1.1 2014/08/21 19:02:22 axs Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=MKUTTER
-MODULE_VERSION=0.715
-inherit perl-module eutils
-
-DESCRIPTION="Simple and lightweight interface to the SOAP protocol (sic) both on client and server side"
-
-IUSE="jabber ssl"
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-myconf="${myconf} --noprompt"
-
-# TESTS ARE DISABLED ON PURPOSE
-# This module attempts to access an external website for validation
-# of the MIME::Parser - not only is that bad practice in general,
-# but in this particular case the external site isn't even valid anymore# -mpc
-# 24/10/04
-SRC_TEST="do"
-
-DEPEND="
-	dev-perl/Class-Inspector
-	dev-perl/XML-Parser
-	dev-perl/libwww-perl
-	virtual/perl-libnet
-	dev-perl/MIME-Lite
-	virtual/perl-MIME-Base64
-	ssl? ( dev-perl/Crypt-SSLeay )
-	jabber? ( dev-perl/Net-Jabber )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	virtual/perl-IO-Compress
-	>=dev-perl/MIME-tools-5.413
-	virtual/perl-version
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# The author of this module put a dep for MIME::Parser 6.X - but the6.X
-	# release of MIME::Parser was a mistake during a change in maintainers on
-	# cpan. This patch alters the dependancy to the "real" stable version of
-	# MIME::Parser.
-	epatch "${FILESDIR}"/SOAP-Lite-0.710.08.patch
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-0.712_sysread.patch
-}
-
-src_test() {
-	has_version '>=www-apache/mod_perl-2' && export MOD_PERL_API_VERSION=2
-	perl-module_src_test
-}
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.140.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.140.0.ebuild
new file mode 100644
index 000000000000..3d6f63953a4d
--- /dev/null
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.140.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SOAP-Lite/SOAP-Lite-1.140.0.ebuild,v 1.1 2015/04/02 21:30:56 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=1.14
+inherit perl-module eutils
+
+DESCRIPTION="Simple and lightweight interface to the SOAP protocol (sic) both on client and server side"
+
+IUSE="jabber ssl test"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+myconf="${myconf} --noprompt"
+
+RDEPEND="
+	dev-perl/Class-Inspector
+	>=dev-perl/IO-SessionData-1.30.0
+	dev-perl/libwww-perl
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Task-Weaken
+	dev-perl/URI
+	dev-perl/XML-Parser
+	dev-perl/MIME-tools
+	ssl? (
+		dev-perl/IO-Socket-SSL
+		dev-perl/LWP-Protocol-https
+		dev-perl/Crypt-SSLeay
+	)
+	jabber? ( dev-perl/Net-Jabber )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+		dev-perl/Test-Warn
+		dev-perl/XML-Parser-Lite
+	)
+"
+
+SRC_TEST="do"
+
+src_test() {
+	has_version '>=www-apache/mod_perl-2' && export MOD_PERL_API_VERSION=2
+	perl-module_src_test
+}
diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch
deleted file mode 100644
index 14a5038fdb98..000000000000
--- a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.60.a.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -burN SOAP-Lite-0.60/Makefile.PL.old SOAP-Lite-0.60/Makefile.PL
---- SOAP-Lite-0.60/Makefile.PL.old	2004-10-29 11:07:34.665925280 -0400
-+++ SOAP-Lite-0.60/Makefile.PL	2004-10-29 11:08:02.491695120 -0400
-@@ -22,7 +22,7 @@
-   ["MIME messages","SOAP::MIMEParser",{"MIME::Parser" => 0},1],
-   ["SSL Support for TCP Transport","SOAP::Transport::TCP",{"IO::Socket::SSL" => 0},0],
-   ["Compression support for HTTP","SOAP::Transport::HTTP",{"Compress::Zlib" => 0},0],
--  ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "6.106"},0],
-+  ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "5.413"},0],
- );
- 
- use Getopt::Long;
diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch
deleted file mode 100644
index 0b1e6e8470bd..000000000000
--- a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.710.08.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar SOAP-Lite-0.710.08.orig/Makefile.PL SOAP-Lite-0.710.08/Makefile.PL
---- SOAP-Lite-0.710.08.orig/Makefile.PL	2008-06-28 11:37:20.000000000 -0700
-+++ SOAP-Lite-0.710.08/Makefile.PL	2008-12-07 23:42:03.341939336 -0800
-@@ -43,7 +43,7 @@
-     ["DIME messages","SOAP::Packager::DIME",{"IO::Scalar" => "2.105", "DIME::Tools" => 0.03, "Data::UUID" => "0.11"},0],
-     ["SSL Support for TCP Transport","SOAP::Transport::TCP",{"IO::Socket::SSL" => 0},0],
-     ["Compression support for HTTP","SOAP::Transport::HTTP",{"Compress::Zlib" => 0},0],
--    ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "6.106"},0],
-+    ["MIME interoperability w/ Axis","SOAP::Lite",{"MIME::Parser" => "5.413"},0],
- );
- 
- use Getopt::Long;
diff --git a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch b/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch
deleted file mode 100644
index 85289fcadaad..000000000000
--- a/dev-perl/SOAP-Lite/files/SOAP-Lite-0.712_sysread.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8f49c0e970261f59bc043a8104a9a730ec69dcf4 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Wed, 23 Mar 2011 18:04:19 +0100
-Subject: [PATCH] Use read() instead of sysread() when using mod_perl
-
-https://rt.cpan.org/Public/Bug/Display.html?id=58538
----
- lib/SOAP/Transport/HTTP.pm |   14 +++++++++++---
- 1 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/lib/SOAP/Transport/HTTP.pm b/lib/SOAP/Transport/HTTP.pm
-index f16b990..57ebbf3 100644
---- a/lib/SOAP/Transport/HTTP.pm
-+++ b/lib/SOAP/Transport/HTTP.pm
-@@ -566,9 +566,17 @@ sub handle {
-         if ( !$chunked ) {
-             my $buffer;
-             binmode(STDIN);
--            while ( sysread( STDIN, $buffer, $length ) ) {
--                $content .= $buffer;
--                last if ( length($content) >= $length );
-+            if ( defined($ENV{"MOD_PERL"}) ) {
-+                while ( read( STDIN, $buffer, $length ) ) {
-+                    $content .= $buffer;
-+                    last if ( length($content) >= $length );
-+                }
-+            }
-+            else {
-+                while ( sysread( STDIN, $buffer, $length ) ) {
-+                    $content .= $buffer;
-+                    last if ( length($content) >= $length );
-+                }
-             }
-         }
- 
--- 
-1.7.3.4
-
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
new file mode 100644
index 000000000000..1ac338bfd28a
--- /dev/null
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -0,0 +1 @@
+DIST XML-Parser-Lite-0.72.tar.gz 9382 SHA256 38c7110d9fc23042284e8584777a18f3e1c5c1974ab3df598df120c0922811bb SHA512 5d7d91e0ab19373845c0b1dfed8dfdce8326d84e55cbe5996dceebcc897dd741b0ef65ecefb7e05105caa7be8d74f4d6e9dce5ffa32f8745a8a19a1c3a6e4870 WHIRLPOOL a7d37912b24f99898a938d4f84391b40e466be456645b35620c6f92e115c3d388377f4f511a4b20d39bf9b9800a63b3871202cc6564f94d51e144c1290fd7ddf
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild
new file mode 100644
index 000000000000..b75e7f3da8e1
--- /dev/null
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.720.0.ebuild,v 1.1 2015/04/02 21:26:57 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=0.72
+inherit perl-module
+
+DESCRIPTION="Lightweight regexp-based XML parser"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST=do
diff --git a/dev-perl/XML-Parser-Lite/metadata.xml b/dev-perl/XML-Parser-Lite/metadata.xml
new file mode 100644
index 000000000000..801e9385a1e0
--- /dev/null
+++ b/dev-perl/XML-Parser-Lite/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 6b96c7038bfc..08ec709e45d5 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,2 +1,3 @@
+DIST cliff-1.10.1.tar.gz 46901 SHA256 ddfec39bf0de7b53666045c946d495ca070e538e5f92dc19588596c9bcc52c6e SHA512 9ebf7bcfb901053e91d7b56c92d709acdd71fee00140fc8b5aa2997580c4616a9811947808d943ce61f5aa8c8ea96e941482207781936d8f6df5d1605ce1dcb9 WHIRLPOOL 57b82eee91e60a67fae83aa6128f43f173896d8723082206a6ae87e4f341d044d67cdb5bea9e826e71bc88b8beff956daad609607800d63a28436ecb7ef67ed2
 DIST cliff-1.6.1.tar.gz 43250 SHA256 657402aa11b66f2e9cb075b9487907c3e053f0e50ae43a9e0aedf2dba7a6355e SHA512 02a870e3f1ccbde419c6f74d9daaae964b4013bc1e5d043231a71156539fc7ea4887fd1e97ec59bd95031087f210c5e2c9f08334ba051d3e75771a296016c217 WHIRLPOOL af6ada0d6057d591a1c79e6a595a00a3ceb7c11a2bac8b6f2b0d1cdbbe17fd6c256295cf6f4ef0171422d5d4766e0e3822ffb57133e9333975d725a03c1c2f31
 DIST cliff-1.8.0.tar.gz 44863 SHA256 a761e19cf9375739a5db94bba6fbcd2ed1a23484190740bb9631eeb01efdfebf SHA512 f16eeaf911bf9e613f7a6f85651a48dc43fe373d5ee09523c977ec8f80996610965683dc66b3e4c40dc5c65219046bd015ff4b85e98c70f5a60a0e03e34a58d5 WHIRLPOOL 108ea36366a1e82d899c523378101eb4c93a63ba049369b901b4a9586ae7b7801b3e82d705e52aee4feba423d244a76fbc2900dcfbc32295b8f5f451fc211968
diff --git a/dev-python/cliff/cliff-1.10.1.ebuild b/dev-python/cliff/cliff-1.10.1.ebuild
new file mode 100644
index 000000000000..adef3820a6a7
--- /dev/null
+++ b/dev-python/cliff/cliff-1.10.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cliff/cliff-1.10.1.ebuild,v 1.1 2015/04/02 20:00:20 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/dreamhost/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..24fc0486f405
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild,v 1.1 2015/04/02 17:34:02 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="http://github.com/davisp/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="tumbolia"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	ebegin 'patching setup.py'
+	sed \
+		-e '4ifrom codecs import open\n' \
+		-e '/LONG_DESC/s/))/), encoding = "utf-8")/' \
+		-i setup.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
index b4a69f444b2d..07844cbb15fa 100644
--- a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
+++ b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild,v 1.1 2014/04/02 07:23:20 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild,v 1.2 2015/04/02 18:22:30 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -26,4 +26,4 @@ S="${WORKDIR}/garden-${PV}"
 
 src_prepare() {
 	epatch "${FILESDIR}/remove_bat.patch"
-}
\ No newline at end of file
+}
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 1714f1b78949..1ad7e2fe28aa 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2-r1.ebuild,v 1.5 2015/03/09 00:03:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2-r1.ebuild,v 1.6 2015/04/02 18:37:17 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -54,7 +54,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	# Note; removed tests pass once package is emerged, 
+	# Note; removed tests pass once package is emerged,
 	# it's the suite's design that breaks form, not the tests' intended purpose
 	testr init
 	testr run || die "Testsuite failed under ${EPYTHON}"
diff --git a/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild b/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
index 1b1ef16eda1a..48e99bd60aed 100644
--- a/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
+++ b/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild,v 1.1 2013/04/27 12:02:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild,v 1.2 2015/04/02 18:38:00 mr_bones_ Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Coin3d binding for Python"
 HOMEPAGE="http://pivy.coin3d.org/"
 SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-#identical to latest debian tarball at 
+#identical to latest debian tarball at
 # http://ftp.de.debian.org/debian/pool/main/p/pivy/pivy_0.5.0~v609hg.orig.tar.bz2
 
 LICENSE="ISC"
diff --git a/dev-python/pycountry/pycountry-1.8.ebuild b/dev-python/pycountry/pycountry-1.8.ebuild
index 01a6ae763f0f..59549ceca48c 100644
--- a/dev-python/pycountry/pycountry-1.8.ebuild
+++ b/dev-python/pycountry/pycountry-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.8.ebuild,v 1.3 2014/10/04 14:16:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-1.8.ebuild,v 1.4 2015/04/02 18:38:44 mr_bones_ Exp $
 
 EAPI=5
 # pypy pending actioning of bug filed upstream
@@ -25,7 +25,7 @@ DOCS=( HISTORY.txt README TODO.txt )
 
 python_test() {
 	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	# and STILL 
+	# and STILL
 	pushd "${BUILD_DIR}"/lib > /dev/null
 	if [[ "${EPYTHON}" == pypy ]]; then
 		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 2986208d6383..1ec8795456fc 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1 +1,2 @@
 DIST python-barbicanclient-3.0.1.tar.gz 38349 SHA256 d298ee0fc9e785d44148d4590ac0d9eef05d560e379e98f75a7cb35ed6bfc7c8 SHA512 354d46e85d15af1b91ed4ded55918329d843b7b9d8374bb82a9fde771ca5e71336ecd2bcde65217338f85ffcf8910abb686e0e8853cb8bd0e0022c5298f8392a WHIRLPOOL b68f792f89df005bd1c14cebb44d6b4ba4aa3d391d66daf9714c74bbadd103f40785e8c9ebb8585a64608b3ff7e47ed102284efeffb1f30d49c2a6d5c9886446
+DIST python-barbicanclient-3.0.3.tar.gz 62286 SHA256 959aca2ce3af2eed0f57e2fa9f0f9a484e40adc6b371e2c0fcc588aae9ca2b18 SHA512 0974af19781029b75e9432005fd1a50a3026531927f3718bf42b999e20877cc126a0bdd37c2de311978c132a0bfa7dbe186eb4f2cc022b8aaf2b7dc3e5c9c794 WHIRLPOOL 36635ebb89a22c898a70ce77f3dee4a88fa6969e432a63b3d554ae5d0d53cf7d5cbc29d6e63300a7acc543a9cfb0428c1ecd71c1c13994138b5c3d490f5a1d9f
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
new file mode 100644
index 000000000000..99f82187261f
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild,v 1.1 2015/04/02 20:01:06 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
+	<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild
similarity index 95%
rename from dev-python/python-keystoneclient/python-keystoneclient-1.3.0.ebuild
rename to dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild
index 431d90ddd190..dbfa03b368be 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.0.ebuild,v 1.1 2015/03/27 19:39:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r1.ebuild,v 1.1 2015/04/02 19:56:39 prometheanfire Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rax-backup-schedule-python-novaclient-ext/Manifest b/dev-python/rax-backup-schedule-python-novaclient-ext/Manifest
deleted file mode 100644
index 4b6617b35967..000000000000
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rax_backup_schedule_python_novaclient_ext-0.1.2.tar.gz 3090 SHA256 90714932d20928e89f03a1e40c8bbe0ebf911cdf5faae9072b98eb14648363c0 SHA512 fd363e55ad4fe55962a14b29c8daebde81a564d816dc6f55a0044e47aae32a621ddf7968941a29e69256e4bbc9ca02bb44e6045aaf602bed5b87cc4a71316703 WHIRLPOOL 1405818cdae150b7b846d9e722250d8a1e08bd739764adc91680404f485e6d0182b148b1de317a3a8027a5bd50cb886ccbd95b1d45824d405f1c53c8c194a482
diff --git a/dev-python/rax-backup-schedule-python-novaclient-ext/metadata.xml b/dev-python/rax-backup-schedule-python-novaclient-ext/metadata.xml
deleted file mode 100644
index 6adb006d20ee..000000000000
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
-    Adds backup-schedule extension support to python-novaclient.
-  </longdescription>
-</pkgmetadata>
-
diff --git a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2-r1.ebuild b/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2-r1.ebuild
deleted file mode 100644
index e1691405e20c..000000000000
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2-r1.ebuild,v 1.1 2014/04/14 19:24:05 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
-HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
-SRC_URI="mirror://pypi/${PN:0:1}/rax_backup_schedule_python_novaclient_ext/rax_backup_schedule_python_novaclient_ext-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/rax_backup_schedule_python_novaclient_ext-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild b/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild
deleted file mode 100644
index 4907e07f1aaa..000000000000
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-0.1.2.ebuild,v 1.2 2013/05/03 18:50:36 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
-HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
-SRC_URI="mirror://pypi/${PN:0:1}/rax_backup_schedule_python_novaclient_ext/rax_backup_schedule_python_novaclient_ext-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/rax_backup_schedule_python_novaclient_ext-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild b/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild
deleted file mode 100644
index 96964b9331df..000000000000
--- a/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rax-backup-schedule-python-novaclient-ext/rax-backup-schedule-python-novaclient-ext-9999.ebuild,v 1.3 2014/04/14 19:24:05 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2
-
-EGIT_REPO_URI="git://github.com/rackspace/rax_backup_schedule_python_novaclient_ext.git
-	https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext.git"
-
-DESCRIPTION="Disk Config extension for python-novaclient"
-HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-
-S="${WORKDIR}/rax_backup_schedule_python_novaclient_ext-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrapy/scrapy-0.24.2.ebuild b/dev-python/scrapy/scrapy-0.24.2.ebuild
index 5bfc96e5cbdb..fbc83eea3cae 100644
--- a/dev-python/scrapy/scrapy-0.24.2.ebuild
+++ b/dev-python/scrapy/scrapy-0.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.24.2.ebuild,v 1.1 2014/07/14 06:43:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.24.2.ebuild,v 1.2 2015/04/02 18:39:29 mr_bones_ Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=net-proxy/mitmproxy-0.10[${PYTHON_USEDEP}]
 		net-ftp/vsftpd )"
-# pytest-twisted listed as a test dep but not in portage. 
+# pytest-twisted listed as a test dep but not in portage.
 # Testsuite currently survives without it, so appears optional
 
 REQUIRED_USE="test? ( ssl boto )"
diff --git a/dev-python/scrapy/scrapy-0.25.1.ebuild b/dev-python/scrapy/scrapy-0.25.1.ebuild
index 07751e209bc5..11628b96be99 100644
--- a/dev-python/scrapy/scrapy-0.25.1.ebuild
+++ b/dev-python/scrapy/scrapy-0.25.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.25.1.ebuild,v 1.2 2014/10/09 01:54:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.25.1.ebuild,v 1.3 2015/04/02 18:39:29 mr_bones_ Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=net-proxy/mitmproxy-0.10[${PYTHON_USEDEP}]
 		net-ftp/vsftpd )"
-# pytest-twisted listed as a test dep but not in portage. 
+# pytest-twisted listed as a test dep but not in portage.
 # Testsuite currently survives without it, so appears optional
 
 REQUIRED_USE="test? ( ssl boto )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index 59c926321e11..f07832254364 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild,v 1.7 2015/01/01 21:28:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild,v 1.8 2015/04/02 18:40:16 mr_bones_ Exp $
 
 EAPI=5
-# py3 appears underdone, 
+# py3 appears underdone,
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/testtools/testtools-1.7.1.ebuild b/dev-python/testtools/testtools-1.7.1.ebuild
index c5279b64b298..8f6169aea0f3 100644
--- a/dev-python/testtools/testtools-1.7.1.ebuild
+++ b/dev-python/testtools/testtools-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.7.1.ebuild,v 1.2 2015/03/30 16:19:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.7.1.ebuild,v 1.3 2015/04/02 19:55:55 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~arm ~hppa"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index c81907b54b20..f9156d68d0ec 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traceback2/traceback2-1.4.0.ebuild,v 1.2 2015/03/30 16:16:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traceback2/traceback2-1.4.0.ebuild,v 1.3 2015/04/02 19:53:23 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~arm ~hppa"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
index 9844e0057b71..15a357814fc1 100644
--- a/dev-python/ujson/ujson-1.33.ebuild
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ujson-1.33.ebuild,v 1.6 2015/03/09 00:01:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ujson-1.33.ebuild,v 1.7 2015/04/02 18:40:59 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -30,7 +30,7 @@ PATCHES=(
 
 python_test() {
 	# See setup.py; line 72. Again "${S}" is used for reading tests
-	# Since py3_2 is first in the queue it needs its own copy 
+	# Since py3_2 is first in the queue it needs its own copy
 	# or else all py2s to follow will be reading read py3 tests
 	if [[ "${EPYTHON}" =~ 'python3' ]]; then
 		cd "${BUILD_DIR}"/lib || die
diff --git a/dev-python/unidecode/unidecode-0.04.17.ebuild b/dev-python/unidecode/unidecode-0.04.17.ebuild
index 7873043da501..666f337c5fcf 100644
--- a/dev-python/unidecode/unidecode-0.04.17.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.17.ebuild,v 1.7 2015/04/01 08:19:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.17.ebuild,v 1.8 2015/04/02 20:15:38 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/unittest2/unittest2-1.0.1.ebuild b/dev-python/unittest2/unittest2-1.0.1.ebuild
index 7e060cbc6091..5b895fd8ea9b 100644
--- a/dev-python/unittest2/unittest2-1.0.1.ebuild
+++ b/dev-python/unittest2/unittest2-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.0.1.ebuild,v 1.2 2015/03/30 16:17:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.0.1.ebuild,v 1.3 2015/04/02 19:54:07 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~arm ~hppa"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/yubiotp/yubiotp-0.2.1.ebuild b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
index 7d9d06fa478a..99beab0caf84 100644
--- a/dev-python/yubiotp/yubiotp-0.2.1.ebuild
+++ b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yubiotp/yubiotp-0.2.1.ebuild,v 1.1 2014/12/28 09:32:47 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yubiotp/yubiotp-0.2.1.ebuild,v 1.2 2015/04/02 18:23:13 mr_bones_ Exp $
 
 EAPI=5
 
@@ -31,4 +31,4 @@ DEPEND="test? ( ${CDEPEND} )"
 
 python_test() {
 	esetup.py test
-}
\ No newline at end of file
+}
diff --git a/dev-ruby/hashr/hashr-0.0.22.ebuild b/dev-ruby/hashr/hashr-0.0.22.ebuild
index 6c315e7968e8..5d948d2c9f7f 100644
--- a/dev-ruby/hashr/hashr-0.0.22.ebuild
+++ b/dev-ruby/hashr/hashr-0.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashr/hashr-0.0.22.ebuild,v 1.1 2014/06/14 12:03:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashr/hashr-0.0.22.ebuild,v 1.2 2015/04/02 18:23:55 mr_bones_ Exp $
 
 EAPI=5
 
@@ -23,4 +23,4 @@ ruby_add_bdepend "test? ( dev-ruby/test_declarative )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/d' test/test_helper.rb || die
-}
\ No newline at end of file
+}
diff --git a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
index 17b73e7510ca..50ae190fcd1f 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10-r1.ebuild,v 1.11 2015/04/01 08:27:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/log4r/log4r-1.1.10-r1.ebuild,v 1.12 2015/04/02 20:21:58 maekke Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -20,7 +20,7 @@ IUSE=""
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild b/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild
index 9aed5f888e5c..cb0e3d530b97 100644
--- a/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild
+++ b/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild,v 1.1 2014/11/02 18:47:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/prawn-table/prawn-table-0.2.1.ebuild,v 1.2 2015/04/02 18:41:43 mr_bones_ Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -26,6 +26,6 @@ ruby_add_bdepend "test? ( dev-ruby/mocha
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/s/^/#/" spec/spec_helper.rb || die
 	# Remove failing test
-	# See https://github.com/prawnpdf/prawn-table/issues/10 
+	# See https://github.com/prawnpdf/prawn-table/issues/10
 	sed -i -e "/Prints table on one page when using subtable with colspan > 1/,+24 s/^/#/" spec/table_spec.rb || die
 }
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
index a769c41436a6..e2f6d259a166 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild,v 1.1 2014/10/04 09:35:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8-r2.ebuild,v 1.2 2015/04/02 18:42:28 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ IUSE="graph test"
 REQUIRED_USE="test? ( graph )"
 
 # Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph 
+# requires rrd_xport which requires rrd_graph
 RDEPEND="
 	~net-analyzer/rrdtool-${PV}[graph=]
 "
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
index eee220cd633e..bfbf50608e44 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.13 2014/09/20 21:13:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.14 2015/04/02 18:42:28 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 
 # Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph 
+# requires rrd_xport which requires rrd_graph
 RDEPEND="${RDEPEND} net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1"
 DEPEND="${DEPEND} net-analyzer/rrdtool[graph]"
 
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
index 435a6408995a..82e9de52c5f2 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild,v 1.1 2014/10/04 09:35:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.9.ebuild,v 1.2 2015/04/02 18:42:28 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ IUSE="graph test"
 REQUIRED_USE="test? ( graph )"
 
 # Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph 
+# requires rrd_xport which requires rrd_graph
 RDEPEND="
 	~net-analyzer/rrdtool-${PV}[graph=]
 "
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild
index 5387effb508f..7cd96bf9e37d 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild,v 1.1 2015/03/13 07:39:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc2.ebuild,v 1.2 2015/04/02 18:42:28 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ IUSE="graph test"
 REQUIRED_USE="test? ( graph )"
 
 # Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph 
+# requires rrd_xport which requires rrd_graph
 RDEPEND="
 	~net-analyzer/rrdtool-${PV}[graph=]
 "
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild
index 2b9b15f4734b..7c4507c9e53b 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild,v 1.1 2014/11/17 14:17:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets-rails/sprockets-rails-2.2.0.ebuild,v 1.2 2015/04/02 18:43:14 mr_bones_ Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -36,7 +36,7 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Avoid tests that fail on a custom manifest name. It is not clear
 	# if this is related to Rails 4.2, and the current sprockets
-	# version already in the tree only works with this newer 
+	# version already in the tree only works with this newer
 	# sprockets-rails version.
 	rm test/test_task.rb || die
 }
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild
index 371311cad610..8126f15dc9c0 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild,v 1.1 2014/12/22 12:13:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sprockets-rails/sprockets-rails-2.2.2.ebuild,v 1.2 2015/04/02 18:43:14 mr_bones_ Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -36,7 +36,7 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Avoid tests that fail on a custom manifest name. It is not clear
 	# if this is related to Rails 4.2, and the current sprockets
-	# version already in the tree only works with this newer 
+	# version already in the tree only works with this newer
 	# sprockets-rails version.
 	rm test/test_task.rb || die
 }
diff --git a/dev-tcltk/bwidget/bwidget-1.9.7.ebuild b/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
index d52d407fb82a..8f896d073123 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.7.ebuild,v 1.8 2015/04/01 08:27:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.9.7.ebuild,v 1.9 2015/04/02 20:12:09 maekke Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcllib/${P}.zip"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="dev-lang/tk"
diff --git a/dev-util/cmocka/cmocka-0.4.1.ebuild b/dev-util/cmocka/cmocka-0.4.1.ebuild
index b9a68e2e27a2..b18e5247d5f1 100644
--- a/dev-util/cmocka/cmocka-0.4.1.ebuild
+++ b/dev-util/cmocka/cmocka-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmocka/cmocka-0.4.1.ebuild,v 1.3 2014/11/25 08:41:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmocka/cmocka-0.4.1.ebuild,v 1.4 2015/04/02 16:21:40 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://open.cryptomilk.org/attachments/download/42/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/cppcheck/cppcheck-1.67.ebuild b/dev-util/cppcheck/cppcheck-1.67.ebuild
index abd387040b1a..555a8e72df33 100644
--- a/dev-util/cppcheck/cppcheck-1.67.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.67.ebuild,v 1.3 2015/02/27 10:14:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.67.ebuild,v 1.4 2015/04/02 18:43:59 mr_bones_ Exp $
 
 EAPI=5
 
@@ -74,7 +74,7 @@ src_test() {
 	mv -v cli/cppcheckexecutor.o{,.final}
 	#trigger recompile with CFGDIR inside ${S}
 	emake check CFGDIR="${S}/cfg"
-	# restore 
+	# restore
 	mv -v ${PN}{.final,}
 	mv -v lib/library.o{.final,}
 	mv -v cli/cppcheckexecutor.o{.final,}
diff --git a/dev-util/cppcheck/cppcheck-1.68.ebuild b/dev-util/cppcheck/cppcheck-1.68.ebuild
index 286959dba481..c448d3f74cb9 100644
--- a/dev-util/cppcheck/cppcheck-1.68.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.68.ebuild,v 1.1 2015/02/27 10:26:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.68.ebuild,v 1.2 2015/04/02 18:43:59 mr_bones_ Exp $
 
 EAPI=5
 
@@ -74,7 +74,7 @@ src_test() {
 	mv -v cli/cppcheckexecutor.o{,.final}
 	#trigger recompile with CFGDIR inside ${S}
 	emake check CFGDIR="${S}/cfg"
-	# restore 
+	# restore
 	mv -v ${PN}{.final,}
 	mv -v lib/library.o{.final,}
 	mv -v cli/cppcheckexecutor.o{.final,}
diff --git a/dev-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild
index ce8f97e42b48..60ba18dc54cf 100644
--- a/dev-util/intltool/intltool-0.50.2-r1.ebuild
+++ b/dev-util/intltool/intltool-0.50.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.50.2-r1.ebuild,v 1.14 2014/04/06 15:44:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.50.2-r1.ebuild,v 1.15 2015/04/02 18:44:42 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
 
 src_prepare() {
-	# Use plain localedir to install mo files to, rather than trying to 
+	# Use plain localedir to install mo files to, rather than trying to
 	# guess one, bug #432848#c11
 	epatch "${FILESDIR}/${P}-localedir-fix.patch"
 
diff --git a/dev-util/ninja/ninja-1.4.0.ebuild b/dev-util/ninja/ninja-1.4.0.ebuild
index 63882dfe21e7..934f35c8e1a6 100644
--- a/dev-util/ninja/ninja-1.4.0.ebuild
+++ b/dev-util/ninja/ninja-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.4.0.ebuild,v 1.11 2014/08/10 21:28:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.4.0.ebuild,v 1.12 2015/04/02 18:45:26 mr_bones_ Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS 
+	# configure.py uses CFLAGS instead of CXXFLAGS
 	export CFLAGS=${CXXFLAGS}
 
 	run_for_build "${PYTHON}" bootstrap.py --verbose || die
diff --git a/dev-util/ninja/ninja-1.5.1.ebuild b/dev-util/ninja/ninja-1.5.1.ebuild
index 83116d80a56d..9467f9df3103 100644
--- a/dev-util/ninja/ninja-1.5.1.ebuild
+++ b/dev-util/ninja/ninja-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.5.1.ebuild,v 1.9 2014/11/04 09:23:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.5.1.ebuild,v 1.10 2015/04/02 18:45:26 mr_bones_ Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS 
+	# configure.py uses CFLAGS instead of CXXFLAGS
 	export CFLAGS=${CXXFLAGS}
 
 	run_for_build "${PYTHON}" bootstrap.py --verbose || die
diff --git a/dev-util/ninja/ninja-1.5.3.ebuild b/dev-util/ninja/ninja-1.5.3.ebuild
index 74c980ca7d45..fffa9cc867fd 100644
--- a/dev-util/ninja/ninja-1.5.3.ebuild
+++ b/dev-util/ninja/ninja-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.5.3.ebuild,v 1.1 2014/12/05 08:06:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.5.3.ebuild,v 1.2 2015/04/02 18:45:26 mr_bones_ Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS 
+	# configure.py uses CFLAGS instead of CXXFLAGS
 	export CFLAGS=${CXXFLAGS}
 
 	run_for_build "${PYTHON}" bootstrap.py --verbose || die
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index a2234a0ce8d8..2feba4e27e71 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -5,3 +5,4 @@ DIST gitolite-gentoo-3.6.1.tar.bz2 140554 SHA256 db138b8f616322f0b9c5fb466c579f6
 DIST gitolite-gentoo-3.6.2.1.tar.bz2 143357 SHA256 5304b50e5b2b89990503c59bf1b1e9c8de25f1e8ae6bef24ef8bd2190d5b0007 SHA512 53ae6549a819437d2481249707156eb0f68cccd289bbb40affedd1f7cdda620b974f8e7ee6853c196728cdccf0eb9f8f340a132538dcbf0b653fb69e08d40b9d WHIRLPOOL 7cc1fbe2441a3bd5cfcb092e32f5c2a50d0e85b489853aff3979b0586b2da111a60285516ae3f7d46d68bbe2aa4b82ddcb6d43440d73f8c84494f074f4b2eadf
 DIST gitolite-gentoo-3.6.2.2.tar.bz2 143601 SHA256 bc5841306567a43c63b542cceab7661cfd9b46f4f8b3651fbf14e13ad8a1f0f1 SHA512 431df7002d146d321199ff5ae324177f5b14b1a0ae8e87288ff15a8670eec9e55637d8a6d28d4eac2ff2a54f3f38e3aa700257c5321c73133fcb09037fb384f8 WHIRLPOOL 35abdcfe6b493e808e77f3b7e4c8ab7dc932365db6db73a90788cf9fce6cc130f9c90a4d9d5cbeb79d6f9a35f69141695ac8303dd83da8688852c33e2df7db1d
 DIST gitolite-gentoo-3.6.2.3.tar.bz2 143658 SHA256 cfc0329d930513d99dc6c52bb4ecb1b0486e73ae7f02a81bfd5d57b79ff19966 SHA512 9b8ddaad043d9c7cdbcb027fcbfd36cd09ce2cfaf0b102deee037977461d54942fd7ac019373876f9f4ab04250f78c8565c73494b7b9fc0e42e140d878cc303f WHIRLPOOL 25bc3ab404b00dc1f804777be3609a4db6ac47ad6b27a0fdbb33cca8e35d8ccfc52b44e29d5a0670f9fad3006264bf8056de16d0f67a1586c16abc7eb0fc457b
+DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 SHA256 37153036346a7efded1eacfbc11740319dc8b398c27479a2c2cef3a8327a81f7 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7 WHIRLPOOL 6f7be9a57dfe30c452abe3f084adef61123e409a48ba110fb726ae91cb02a1cadb8e36f23d0d84be6c8d3392baba3af81215d8e9436ed0e130e618d85d52938d
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
new file mode 100644
index 000000000000..22b1d23ca4d1
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild,v 1.1 2015/04/02 16:37:09 robbat2 Exp $
+
+EAPI=5
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tools vim-syntax"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )
+	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
+	dev-perl/JSON"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	echo "${PF}-gentoo" > src/VERSION
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr.html first!"
+		ewarn
+		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
+		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
+		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
+		ewarn
+	fi
+
+	# bug 352291
+	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
+	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
+		ewarn
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+		elog "Especially if you're migrating from gitosis."
+		ewarn
+	fi
+}
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
index b2d242491d8e..e9a601052a06 100644
--- a/games-fps/quake4-bin/Manifest
+++ b/games-fps/quake4-bin/Manifest
@@ -1,2 +1 @@
-DIST quake4-linux-1.3-2.x86.run 239448644 SHA256 d85d62791aaf56039f131997ccadbddeac17f83d7420102ca5a059af1f284252
 DIST quake4-linux-1.4.2.x86.run 287552973 SHA256 9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a SHA512 a6a390a8f46c7e696fe865d0688c9a95eb0d9e32ad62ecb796dcc03618994ec065e8c74358518221cb6c8771d2414ed7e144c77a1a8ecd4ae9ce6406459c5f36 WHIRLPOOL 14064a8553a3e4b4defb74e450beaade3b687c7b102ad71881c0fa86f5e3f0e848f2b6e6c896a1c6e8bc3faadc8969535e30dfb315e9009ae902c64de1bbed9a
diff --git a/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild b/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild
deleted file mode 100644
index 629ff22c5e82..000000000000
--- a/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild,v 1.11 2012/02/08 21:20:12 vapier Exp $
-
-inherit eutils unpacker versionator games
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
-HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${MY_PV}.x86.run"
-
-LICENSE="QUAKE4"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="alsa cdinstall dedicated opengl"
-RESTRICT="strip"
-
-UIDEPEND="virtual/opengl
-	x86? (
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		media-libs/libsdl
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-xlibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1
-		)
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
-RDEPEND="sys-libs/glibc
-	dedicated? ( app-misc/screen )
-	amd64? ( app-emulation/emul-linux-x86-baselibs )
-	opengl? ( ${UIDEPEND} )
-	cdinstall? ( games-fps/quake4-data )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/quake4
-Ddir=${D}/${dir}
-
-QA_TEXTRELS="${dir}/libSDL-1.2.id.so.0
-	${dir}/pb/pbags.so
-	${dir}/pb/pbcl.so
-	${dir}/pb/pbag.so
-	${dir}/pb/pbsv.so
-	${dir}/pb/pbcls.so"
-QA_EXECSTACK="${dir}/quake4.x86
-	${dir}/libSDL-1.2.id.so.0
-	${dir}/q4ded.x86
-	${dir}/libgcc_s.so.1
-	${dir}/quake4smp.x86
-	${dir}/libstdc++.so.6"
-
-src_install() {
-	insinto "${dir}"
-	exeinto "${dir}"
-
-	doins *.txt README q4icon.bmp us/version.info README-1.3.htm || die "docs"
-	doins -r pb || die "pb"
-	doexe openurl.sh || die "openurl.sh"
-	doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
-		bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
-		bin/Linux/x86/libSDL-1.2.id.so.0 bin/Linux/x86/quake4smp.x86 \
-		|| die "doexe x86 exes/libs"
-
-	insinto "${dir}"/q4base
-	doins q4base/* us/q4base/* || die "doins q4base"
-	if use dedicated
-	then
-		games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
-	fi
-
-	if use opengl || ! use dedicated
-	then
-		games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
-		games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
-#		doicon ${FILESDIR}/quake4.png || die "copying icon"
-#		make_desktop_entry quake4 "Quake IV" quake4
-#		make_desktop_entry quake4-smp "Quake IV (SMP)" quake4
-		newicon q4icon.bmp quake4.bmp || die "copying icon"
-		make_desktop_entry quake4 "Quake IV" /usr/share/pixmaps/quake4.bmp
-		make_desktop_entry quake4-smp "Quake IV (SMP)" /usr/share/pixmaps/quake4.bmp
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall
-	then
-		elog "You need to copy pak001.pk4 through pak012.pk4, along with"
-		elog "zpak*.pk4 from either your installation media or your hard drive"
-		elog "to ${dir}/q4base before running the game."
-		echo
-	fi
-	if use opengl || ! use dedicated
-	then
-		elog "To play the game run:"
-		elog " quake4"
-		echo
-	fi
-}
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
index c31b408c981a..86325d33bf0b 100644
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild,v 1.1 2014/07/09 19:48:17 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild,v 1.2 2015/04/02 16:12:08 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="cdinstall dedicated linguas_cs linguas_fr linguas_it linguas_pl linguas_ru"
 RESTRICT="strip"
 
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index c2ad1c837444..2b49efbca52c 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,2 +1 @@
-DIST linuxconsoletools-1.4.4.tar.bz2 40867 SHA256 61ac023a6944c1bc1c3ac56b9c281a3148f4d63557a1e239523d4de638dac4a8 SHA512 ab2f15e26da3705cea35e26dda149f83d5792b0643aa8f684854be26d98a69943cfac3f07c8eac83485a289c9bdc7d41ad3af8990cec0a168b6b6e30381ee33a WHIRLPOOL 6347a4e2dbfb518da9f1ad9e3f7c45c59c49e64b4fe025927f26c7ddec52dad0507a58790a27f6d7077e1a314d5e812219d6132104720c4ea55205fc295a69d3
 DIST linuxconsoletools-1.4.8.tar.bz2 43964 SHA256 23c4ac595f608e25f472d947c4193233f763f37ae0cf6b48141d33443a4cee6a SHA512 ea3a0baa3f163e10a4c76f58977a96d91d91bddb1a75cea5195b0a631c11ca55e40730aaa0d1965404837595c4a7fd8b75c3dd7785fe0e47ee2c90021341f262 WHIRLPOOL c02960d5e171efef3739f440a903ae9b14bec8b6ab4de2181ea691aa78c870f81b291ac98e313d234778fb59c4be8e53242cb46db019f3dffdbd8f26ddcbb113
diff --git a/games-util/joystick/files/joystick-1.4.4-build.patch b/games-util/joystick/files/joystick-1.4.4-build.patch
deleted file mode 100644
index f888ccd18812..000000000000
--- a/games-util/joystick/files/joystick-1.4.4-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- linuxconsoletools-1.4.4.orig/docs/Makefile
-+++ linuxconsoletools-1.4.4/docs/Makefile
-@@ -20,13 +20,17 @@
- # 02110-1301 USA.
- 
- MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
--		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+		  ffset.1 ffcfstress.1 jscal-store.1 \
- 		  jscal-restore.1
- 
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX          ?= /usr/local
- 
- install:
- 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
--	install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
-+	install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
- 
- .PHONY: install
---- linuxconsoletools-1.4.4.orig/utils/Makefile
-+++ linuxconsoletools-1.4.4/utils/Makefile
-@@ -27,9 +27,13 @@
- 
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store
- 
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX          ?= /usr/local
- 
- compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.4.4.ebuild b/games-util/joystick/joystick-1.4.4.ebuild
deleted file mode 100644
index e21be9809750..000000000000
--- a/games-util/joystick/joystick-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.4.ebuild,v 1.5 2013/06/30 21:09:53 ago Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/libsdl:0[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}
diff --git a/games-util/joystick/joystick-1.4.8.ebuild b/games-util/joystick/joystick-1.4.8.ebuild
index ad13e9a98858..0cd03d270569 100644
--- a/games-util/joystick/joystick-1.4.8.ebuild
+++ b/games-util/joystick/joystick-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8.ebuild,v 1.3 2015/03/25 13:45:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8.ebuild,v 1.4 2015/04/02 20:07:08 maekke Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc x86"
 IUSE="sdl"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
index cf7f41162f12..2ae4a27c4039 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild,v 1.1 2015/03/03 23:48:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild,v 1.2 2015/04/02 18:46:11 mr_bones_ Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=true
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# pure-python module is better managed manually, see src_install 
+	# pure-python module is better managed manually, see src_install
 	sed -e 's:python::g' \
 		-i Makefile.am || die
 
diff --git a/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild b/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
index 7411621da684..d1c19aded0be 100644
--- a/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
+++ b/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild,v 1.5 2015/02/17 11:06:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.14.3.ebuild,v 1.6 2015/04/02 19:45:11 kensington Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DEPEND="
 RDEPEND="!<kde-base/konq-plugins-4.6"
 
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="minimal"
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
 MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
@@ -69,6 +69,76 @@ src_prepare() {
 	# quick workaround for bug 493278
 	find "${S}" -name "akonadi_knut_resource*" -delete
 
+				# Drop translations that get installed with plasma 5 and kde apps 5 packages
+				if use minimal; then
+
+					# KDE Workspace 4
+					rm -f "${S}"/*/messages/kde-workspace/{freespacenotifier,\
+joystick,kaccess,kcmaccess,kcm_autostart,kcmbell,kcmcolors,kcm_desktoppaths,\
+kcm_desktopthemedetails,kcmdevinfo,kcmfonts,kcm_infobase,kcminfo,\
+kcm_infosummary,kcminit,kcminput,kcmkclock,kcmkeyboard,kcmkeys,\
+kcmkwincompositing,kcmkwindecoration,kcm_kwindesktop,kcmkwinrules,\
+kcmkwinscreenedges,kcm-kwin-scripts,kcm_kwintabbox,kcmkwm,kcmlaunch,kcm_memory,\
+kcmnic,kcmopengl,kcm_pci,kcmsamba,kcmsmserver,kcm_solid_actions,\
+kcm_standard_actions,kcmstyle,kcmusb,kcmview1394,kcmworkspaceoptions,kfontinst,\
+khotkeys,kinfocenter,klipper,kmenuedit,krdb,krunner,kscreenlocker_greet,\
+kscreenlocker,ksgrd,ksmserver,ksplashthemes,ksysguardlsofwidgets,ksysguard,\
+ktouchpadenabler,kwin_clients,kwin_effects,kwin,kwin_scripting,libkdecorations,\
+libkworkspace,liboxygenstyleconfig,libpowerdevilcommonconfig,libtaskmanager,\
+plasma_applet_quicklaunch,plasma_applet_system-monitor,\
+plasma_applet_webbrowser,plasma_containmentactions_contextmenu,\
+plasma_containmentactions_switchwindow,plasma_engine_keystate,\
+plasma_engine_mpris2,plasma_engine_network,plasma_engine_notifications,\
+plasma_engine_rss,plasma_engine_share,plasma_engine_soliddevice,\
+plasma_engine_weather,plasma_runner_activities,plasma_runner_bookmarksrunner,\
+plasma_runner_calculatorrunner,plasma_runner_kill,plasma_runner_locations,\
+plasma_runner_placesrunner,plasma_runner_plasma-desktop,\
+plasma_runner_powerdevil,plasma_runner_recentdocuments,plasma_runner_services,\
+plasma_runner_sessions,plasma_runner_shell,plasma_runner_solid,\
+plasma_runner_webshortcuts,plasma_runner_windowedwidgets,plasma_runner_windows,\
+powerdevilactivitiesconfig,powerdevilglobalconfig,powerdevil,\
+powerdevilprofilesconfig,processcore,processui,systemsettings}.po
+
+					# KDE Runtime 4
+					rm -f "${S}"/*/messages/kde-runtime/{attica_kde,drkonqi,\
+filetypes,htmlsearch,kcmcomponentchooser,kcm_emoticons,kcmhtmlsearch,\
+kcmicons,kcmkded,kcmnotify,kcm_phonon,kcmshell,kdesu,kglobalaccel,\
+khelpcenter,kio_applications,kio_archive,kio_bookmarks,kioclient,\
+kio_fish,kio_info,kio_man,kio_nfs,kio_recentdocuments,kio_remote,\
+kio_sftp,kio_smb,kio_thumbnail,kmimetypefinder,knetattach,kstart,\
+ktraderclient,phonon_kde,soliduiserver}.po
+
+					# KDE Plasma Addons 4
+					rm -f "${S}"/*/messages/kdeplasma-addons/{konqprofiles,\
+konsoleprofiles,lancelot,liblancelot-datamodels,libplasma_groupingcontainment,\
+libplasmaweather,plasma_applet_binaryclock,plasma_applet_bookmarks,\
+plasma_applet_bubblemon,plasma_applet_CharSelectApplet,plasma_applet_comic,\
+plasma_applet_fifteenPuzzle,plasma_applet_fileWatcher,plasma_applet_frame,\
+plasma_applet_groupingpanel,plasma_applet_incomingmsg,\
+plasma_applet_knowledgebase,plasma_applet_kolourpicker,plasma_applet_leavenote,\
+plasma_applet_life,plasma_applet_luna,plasma_applet_magnifique,\
+plasma_applet_microblog,plasma_applet_news,plasma_applet_plasmaboard,\
+plasma_applet_previewer,plasma_applet_qalculate,plasma_applet_qstardict,\
+plasma_applet_rssnow,plasma_applet_showdashboard,plasma_applet_showdesktop,\
+plasma_applet_spellcheck,plasma_applet_unitconverter,plasma_applet_weather,\
+plasma_applet_weatherstation,plasma_applet_webslice,\
+plasma_packagestructure_comic,plasma_runner_audioplayercontrol,\
+plasma_runner_browserhistory,plasma_runner_CharacterRunner,\
+plasma_runner_contacts,plasma_runner_converterrunner,plasma_runner_datetime,\
+plasma_runner_events,plasma_runner_katesessions,\
+plasma_runner_konquerorsessions,plasma_runner_konsolesessions,\
+plasma_runner_kopete,plasma_runner_krunner_dictionary,plasma_runner_mediawiki,\
+plasma_runner_spellcheckrunner,plasma_runner_translator,plasma_runner_youtube}.po
+
+					# KDELIBS 4
+					rm -f "${S}"/*/messages/kdelibs/{akonadi_baloo_indexer,\
+baloo_file,baloo_file_extractor,baloosearch,balooshow,kcm_baloofile,kfilemetadata,\
+kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
+
+					# KDE Applications 4
+					rm -f "${S}"/*/messages/applications/useraccount.po
+				fi
+
 	kde4-base_src_prepare
 }
 
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
index fd955dbc2cd1..b35d0aef18e7 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild,v 1.5 2015/02/17 11:06:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild,v 1.6 2015/04/02 18:24:40 mr_bones_ Exp $
 
 EAPI=5
 
@@ -34,4 +34,4 @@ src_configure() {
 	)
 
 	kde4-meta_src_configure
-}
\ No newline at end of file
+}
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild
index e35febfb94a4..b3db1b18bcce 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild,v 1.1 2015/03/29 11:33:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.11.17.ebuild,v 1.2 2015/04/02 18:24:40 mr_bones_ Exp $
 
 EAPI=5
 
@@ -34,4 +34,4 @@ src_configure() {
 	)
 
 	kde4-meta_src_configure
-}
\ No newline at end of file
+}
diff --git a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild
index 9bed6721785e..13941911cf1e 100644
--- a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild
+++ b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild,v 1.1 2013/06/22 16:35:59 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2-r1.ebuild,v 1.2 2015/04/02 18:46:55 mr_bones_ Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde-look.org/content/show.php?content=103928"
 SRC_URI="http://dev.gentooexperimental.org/~hwoarang/projects/plasma-emergelog/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-# Included LICENSE is GPL-2, but all headers say 3+. hwoarang said 
+# Included LICENSE is GPL-2, but all headers say 3+. hwoarang said
 # that it can be licensed as 3+
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
diff --git a/mate-base/mate-menus/mate-menus-1.8.0.ebuild b/mate-base/mate-menus/mate-menus-1.8.0.ebuild
index 8661293d10f9..679c766f1d09 100644
--- a/mate-base/mate-menus/mate-menus-1.8.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/mate-menus-1.8.0.ebuild,v 1.4 2014/07/02 09:46:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/mate-menus-1.8.0.ebuild,v 1.5 2015/04/02 18:47:39 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -51,7 +51,7 @@ src_configure() {
 		$(use_enable python) \
 		$(use_enable introspection)"
 
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API 
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
 	# usage checks.
 	if ! use debug ; then
 		G2CONF="${G2CONF} --enable-debug=minimum"
diff --git a/media-gfx/assimp/assimp-3.0.1270.ebuild b/media-gfx/assimp/assimp-3.0.1270.ebuild
index 0ae45042d12c..71eba2a17b8a 100644
--- a/media-gfx/assimp/assimp-3.0.1270.ebuild
+++ b/media-gfx/assimp/assimp-3.0.1270.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/assimp/assimp-3.0.1270.ebuild,v 1.1 2013/05/22 06:56:32 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/assimp/assimp-3.0.1270.ebuild,v 1.2 2015/04/02 18:25:23 mr_bones_ Exp $
 
 EAPI=5
 
@@ -33,4 +33,4 @@ src_configure() {
 	)
 
 	cmake-utils_src_configure
-}
\ No newline at end of file
+}
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index d93906749b08..def970911e6e 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.3 2014/07/28 15:40:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.4 2015/04/02 18:48:25 mr_bones_ Exp $
 
 EAPI=5
 
@@ -115,8 +115,8 @@ src_configure() {
 
 	# TODO to remove embedded dependencies:
 	#
-	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ 
-	#                (under src/zipios++) will be used 
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
+	#                (under src/zipios++) will be used
 	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
 	#                (external salomesmesh is available in "science" overlay)
 
diff --git a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
index 1042d3d43a58..2afc6161b4a8 100644
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.3 2014/10/13 08:30:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.4 2015/04/02 18:48:25 mr_bones_ Exp $
 
 EAPI=5
 
@@ -106,8 +106,8 @@ src_configure() {
 
 	# TODO to remove embedded dependencies:
 	#
-	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ 
-	#                (under src/zipios++) will be used 
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
+	#                (under src/zipios++) will be used
 	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
 	#                (external salomesmesh is available in "science" overlay)
 
diff --git a/media-gfx/freecad/freecad-0.14.3702.ebuild b/media-gfx/freecad/freecad-0.14.3702.ebuild
index 7188c83d095a..ce93c9bc4f54 100644
--- a/media-gfx/freecad/freecad-0.14.3702.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702.ebuild,v 1.1 2014/07/29 20:36:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702.ebuild,v 1.2 2015/04/02 18:48:25 mr_bones_ Exp $
 
 EAPI=5
 
@@ -102,8 +102,8 @@ src_configure() {
 
 	# TODO to remove embedded dependencies:
 	#
-	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ 
-	#                (under src/zipios++) will be used 
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
+	#                (under src/zipios++) will be used
 	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
 	#                (external salomesmesh is available in "science" overlay)
 
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 24273f919db8..346c9cf0fc33 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.4 2014/11/12 16:52:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.5 2015/04/02 18:48:25 mr_bones_ Exp $
 
 EAPI=5
 
@@ -104,8 +104,8 @@ src_configure() {
 
 	# TODO to remove embedded dependencies:
 	#
-	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ 
-	#                (under src/zipios++) will be used 
+	#	-DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++
+	#                (under src/zipios++) will be used
 	#	salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version
 	#                (external salomesmesh is available in "science" overlay)
 
diff --git a/media-gfx/freepv/freepv-0.3.0-r3.ebuild b/media-gfx/freepv/freepv-0.3.0-r3.ebuild
deleted file mode 100644
index 1c7807869cd9..000000000000
--- a/media-gfx/freepv/freepv-0.3.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r3.ebuild,v 1.5 2011/06/16 15:44:05 voyageur Exp $
-
-EAPI=2
-inherit cmake-utils eutils
-
-DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
-HOMEPAGE="http://freepv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/freeglut
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-noplugin.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	sed -i \
-		-e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
-		src/libfreepv/JpegReader.cpp || die 'jpeg sed failed'
-
-	sed -i -e 's:^INSTALL(.*)::' \
-		src/libfreepv/CMakeLists.txt || die 'static lib install sed failed'
-}
diff --git a/media-gfx/gthumb/gthumb-3.2.7.ebuild b/media-gfx/gthumb/gthumb-3.2.7.ebuild
index 3225045ac912..d396934fb195 100644
--- a/media-gfx/gthumb/gthumb-3.2.7.ebuild
+++ b/media-gfx/gthumb/gthumb-3.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.7.ebuild,v 1.3 2014/05/04 12:10:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.7.ebuild,v 1.4 2015/04/02 18:49:11 mr_bones_ Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
 #	gnome-base/gnome-common
 
 src_prepare() {
-	# Remove unwanted CFLAGS added with USE=debug 
+	# Remove unwanted CFLAGS added with USE=debug
 	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
 		-i configure.ac -i configure || die
 
diff --git a/media-gfx/gthumb/gthumb-3.2.8.ebuild b/media-gfx/gthumb/gthumb-3.2.8.ebuild
index cbd077546248..f723da1c39d0 100644
--- a/media-gfx/gthumb/gthumb-3.2.8.ebuild
+++ b/media-gfx/gthumb/gthumb-3.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.8.ebuild,v 1.3 2014/07/23 15:19:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.8.ebuild,v 1.4 2015/04/02 18:49:11 mr_bones_ Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
 #	gnome-base/gnome-common
 
 src_prepare() {
-	# Remove unwanted CFLAGS added with USE=debug 
+	# Remove unwanted CFLAGS added with USE=debug
 	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
 		-i configure.ac -i configure || die
 
diff --git a/media-libs/celt/celt-0.11.1-r1.ebuild b/media-libs/celt/celt-0.11.1-r1.ebuild
index 3d368575d3b0..4b4a30f70fe1 100644
--- a/media-libs/celt/celt-0.11.1-r1.ebuild
+++ b/media-libs/celt/celt-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.11.1-r1.ebuild,v 1.8 2015/02/24 08:55:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/celt/celt-0.11.1-r1.ebuild,v 1.9 2015/04/02 16:19:47 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="ogg static-libs"
 
 DEPEND="ogg? ( media-libs/libogg )"
diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild
index 61e15ad6fa65..99beb248d340 100644
--- a/media-libs/freeimage/freeimage-3.15.4.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.9 2014/08/09 18:36:35 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.10 2015/04/02 16:51:03 aballier Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index f60a328a89e5..26e5ed16794c 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.15 2015/02/26 18:25:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.16 2015/04/02 18:49:57 mr_bones_ Exp $
 
 EAPI=5
 
@@ -97,7 +97,7 @@ src_configure() {
 	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
 	#
 	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	# 
+	#
 	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
 	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
 	#
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 3c3225b256de..65401feb4726 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.9 2015/02/26 18:25:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.10 2015/04/02 18:49:57 mr_bones_ Exp $
 
 EAPI=5
 
@@ -77,7 +77,7 @@ src_configure() {
 	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
 	#
 	#  - Parameter --disable-workshop disables any use of Lua, effectivly
-	# 
+	#
 	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
 	#    upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=654675
 	#
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.ebuild b/media-libs/libmkv/libmkv-0.6.5.1.ebuild
index 85886578af27..44a33bbd57f1 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.ebuild
+++ b/media-libs/libmkv/libmkv-0.6.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmkv/libmkv-0.6.5.1.ebuild,v 1.4 2014/08/10 21:09:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmkv/libmkv-0.6.5.1.ebuild,v 1.5 2015/04/02 18:26:07 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -17,4 +17,4 @@ KEYWORDS="amd64 x86"
 src_prepare()
 {
 	eautoreconf
-}
\ No newline at end of file
+}
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index cfca09fd2921..be33e021149e 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild,v 1.7 2015/03/12 08:23:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild,v 1.8 2015/04/03 05:56:36 maekke Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa x86"
+KEYWORDS="~alpha amd64 arm ~hppa x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..4276bb7371a7
--- /dev/null
+++ b/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild,v 1.1 2015/04/02 15:46:31 kensington Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Unofficial taglib plugins maintained by the Amarok team"
+HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=media-libs/taglib-1.6
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog )
diff --git a/media-libs/x265/x265-1.5.ebuild b/media-libs/x265/x265-1.5.ebuild
index b5094c6f256b..3314ff606a37 100644
--- a/media-libs/x265/x265-1.5.ebuild
+++ b/media-libs/x265/x265-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.5.ebuild,v 1.3 2015/03/18 06:38:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.5.ebuild,v 1.4 2015/04/02 16:22:50 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm hppa ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index f690a5792d19..6e8117e5f85c 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.35-r1.ebuild,v 1.12 2015/02/28 13:32:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.35-r1.ebuild,v 1.13 2015/04/02 16:21:15 jer Exp $
 
 EAPI=5
 inherit eutils libtool multilib-minimal
@@ -11,7 +11,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
index 5c9c1f269335..132b8a57cbf0 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild,v 1.6 2015/03/29 10:57:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild,v 1.7 2015/04/02 18:50:47 mr_bones_ Exp $
 
 EAPI="5"
 inherit eutils flag-o-matic multilib-minimal
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
-	# compatibility with recent releases 
+	# compatibility with recent releases
 	# TODO: likely apply them with libav-10 when it's out but there will
 	# probably be an upstream gst-libav release compatible at that time.
 	if has_version '>=media-video/ffmpeg-2.0' ; then
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
index 425ad1ee025c..151e09d777e1 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild,v 1.11 2014/10/11 13:16:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild,v 1.12 2015/04/02 18:50:47 mr_bones_ Exp $
 
 EAPI="5"
 inherit eutils flag-o-matic multilib-minimal
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
-	# compatibility with recent releases 
+	# compatibility with recent releases
 	# TODO: likely apply them with libav-10 when it's out but there will
 	# probably be an upstream gst-libav release compatible at that time.
 	if has_version '>=media-video/ffmpeg-2.0' ; then
diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
index baf9f283299a..729d00412460 100644
--- a/media-sound/cantata/cantata-1.5.1.ebuild
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.1 2015/02/03 16:23:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.2 2015/04/02 17:07:36 kensington Exp $
 
 EAPI=5
 
@@ -28,7 +28,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/qjson
 	sys-libs/zlib
 	x11-libs/libX11
 	|| ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
@@ -40,12 +39,16 @@ RDEPEND="
 	musicbrainz? ( media-libs/musicbrainz:5 )
 	qt5? (
 		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
 	!qt5? (
+		dev-libs/qjson
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild
index 95d133e30111..fd772385e4f6 100644
--- a/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild
+++ b/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild,v 1.2 2014/08/10 21:06:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild,v 1.3 2015/04/02 18:26:50 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -51,4 +51,4 @@ src_install() {
 	default
 
 	l10n_for_each_disabled_locale_do remove_disabled_locale
-}
\ No newline at end of file
+}
diff --git a/media-sound/qpitch/Manifest b/media-sound/qpitch/Manifest
index 952758bbbd98..ac03037c9079 100644
--- a/media-sound/qpitch/Manifest
+++ b/media-sound/qpitch/Manifest
@@ -1 +1 @@
-DIST qpitch-1.0.1.tar.gz 116676 SHA256 20153417bf8e25dfd6e73c46ac5e05b7aaf5d4060b85a09778e0dcc61d4496a0
+DIST qpitch-1.0.1.tar.gz 116676 SHA256 20153417bf8e25dfd6e73c46ac5e05b7aaf5d4060b85a09778e0dcc61d4496a0 SHA512 d732d0b2a7c07741586d3724a6a2c73bb02b4390bbd4baa5e7fe4abe3531ad12e7be208a470ca6f0da38334e4cb556cebe5c0df3839547c3f55c5b37b9944e94 WHIRLPOOL 4e5a6d46d389e49837d73dd4d642ae5f84ad81d95bdc5a361b091607b09f5fd37aa411882148b3791d47d922ad553cb27cb57ecbfed741f9f2774af627b0453e
diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
index a4be2f7ebde9..84d667565f36 100644
--- a/media-sound/qpitch/metadata.xml
+++ b/media-sound/qpitch/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<herd>sound</herd>
+	<herd>qt</herd>
+	<herd>sound</herd>
 </pkgmetadata>
-
diff --git a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..cd242a8189bd
--- /dev/null
+++ b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qpitch/qpitch-1.0.1-r1.ebuild,v 1.1 2015/04/02 15:40:31 kensington Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A program to tune musical instruments using Qt4"
+HOMEPAGE="http://wspinell.altervista.org/qpitch/"
+SRC_URI="http://download.gna.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=media-libs/portaudio-19_pre20071207
+	>=sci-libs/fftw-3.1.0
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README changelog )
diff --git a/media-sound/spotify/spotify-0.9.17.1.ebuild b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
similarity index 83%
rename from media-sound/spotify/spotify-0.9.17.1.ebuild
rename to media-sound/spotify/spotify-0.9.17.1-r1.ebuild
index 8057f5765835..5fa252fca943 100644
--- a/media-sound/spotify/spotify-0.9.17.1.ebuild
+++ b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.17.1.ebuild,v 1.1 2015/03/27 18:31:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.17.1-r1.ebuild,v 1.1 2015/04/03 01:42:41 prometheanfire Exp $
 
 EAPI=5
 inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@@ -34,9 +34,9 @@ RDEPEND="${DEPEND}
 		x11-libs/libXScrnSaver
 		x11-libs/libXrandr
 		x11-libs/libXrender
-		dev-qt/qtcore:4[qt3support,glib]
+		dev-qt/qtcore:4[glib]
 		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[qt3support,glib]
+		dev-qt/qtgui:4[glib]
 		dev-qt/qtwebkit:4
 		x11-misc/xdg-utils
 		media-libs/alsa-lib
@@ -70,14 +70,6 @@ QA_PREBUILT="/opt/spotify/spotify-client/spotify
 			/opt/spotify/spotify-client/Data/libcef.so"
 
 src_prepare() {
-#	# different NSPR / NSS library names for some reason
-#	sed -i \
-#		-e 's/\(lib\(plc4\|nspr4\).so\).9\(.\)/\1.0d\3\3/g' \
-#		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-#	sed -i \
-#		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
-#		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
-#		opt/spotify/spotify-client/Data/libcef.so || die "sed failed"
 	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
 	if use gnome ; then
 	sed -i \
@@ -107,10 +99,6 @@ src_install() {
 	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
 
 	dodir /usr/bin
-#		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libnspr4.so.9 ${SPOTIFY_HOME}/libplc4.so.9"
-#		LD_LIBRARY_PATH="${SPOTIFY_HOME}/Data/"
-#		export LD_PRELOAD
-#		export LD_LIBRARY_PATH
 	cat <<-EOF >"${D}"/usr/bin/spotify
 		#! /bin/sh
 		exec ${SPOTIFY_HOME}/spotify "\$@"
@@ -144,9 +132,6 @@ src_install() {
 		eqawarn "please open a bug."
 	fi
 
-#	#hack to fix the nspr linking in spotify
-#	dosym /usr/lib/libnspr4.so "${SPOTIFY_HOME}/libnspr4.so.9"
-#	dosym /usr/lib/libplc4.so "${SPOTIFY_HOME}/libplc4.so.9"
 	#TODO fix for x86
 	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
 }
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
index 3fbc98aba592..6d88e5b84dce 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild,v 1.4 2014/03/05 18:29:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild,v 1.5 2015/04/02 18:51:31 mr_bones_ Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-alevt.patch
 
-	# do not compile test-progs, incompartible with videodev2.h	
+	# do not compile test-progs, incompartible with videodev2.h
 	sed -e '/-C test/d' \
 		-i Makefile || die
 
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index 977ddc3b8edb..f43a16e1b7b9 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.1 2015/03/16 14:12:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.2 2015/04/02 16:24:04 jer Exp $
 
 EAPI="5"
 
@@ -37,7 +37,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0/${FFMPEG_SUBSLOT}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr amrenc bluray +bzip2 cdio celt
diff --git a/media-video/handbrake/handbrake-0.9.9-r1.ebuild b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
index e87a0acd8930..ac12e56d7eaf 100644
--- a/media-video/handbrake/handbrake-0.9.9-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9-r1.ebuild,v 1.4 2014/09/01 16:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9-r1.ebuild,v 1.5 2015/04/02 18:52:16 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -85,7 +85,7 @@ src_prepare() {
 		"${S}"/make/include/main.defs \
 		|| die "Contrib removal failed."
 
-	# Instead of adding a #define to libmkv, we expand it in place. 
+	# Instead of adding a #define to libmkv, we expand it in place.
 	epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
 
 	# Fix compilation against the released 1.9.1 version of mp4v2.
diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
index a1ec00449aba..f9f20b96d9c9 100644
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v 1.5 2015/03/17 18:55:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v 1.6 2015/04/02 18:28:27 mr_bones_ Exp $
 
 EAPI=5
 
@@ -339,4 +339,4 @@ multilib_src_test() {
 	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
 	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
 	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
\ No newline at end of file
+}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 52bde8529bb7..c0a64c7ef2ce 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.80 2015/03/17 18:55:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.81 2015/04/02 18:28:27 mr_bones_ Exp $
 
 EAPI=5
 
@@ -338,4 +338,4 @@ multilib_src_test() {
 	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
 	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
 	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
\ No newline at end of file
+}
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index 62dd4b60d432..2e9e6b63070c 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.17.ebuild,v 1.7 2014/12/04 08:35:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.17.ebuild,v 1.8 2015/04/02 18:29:12 mr_bones_ Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -22,4 +22,4 @@ src_prepare() {
 	rm "${S}/aclocal.m4" "${S}/Makefile.in"
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	eautoreconf
-}
\ No newline at end of file
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 44f5e93f2339..f2cdd148ad96 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Apr 2015 15:36:51 +0000
+Fri, 03 Apr 2015 06:36:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 44f5e93f2339..f2cdd148ad96 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Apr 2015 15:36:51 +0000
+Fri, 03 Apr 2015 06:36:51 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.4 b/metadata/md5-cache/app-admin/eselect-1.4.4
index 3b571eb13c42..edc92ca6b77e 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.4
+++ b/metadata/md5-cache/app-admin/eselect-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/eselect/eselect-1.4.4.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=07600f76b07c497d24142258b8d0ff27
+_md5_=ab069dd95c0a197b0ecac2aef90548c4
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.12 b/metadata/md5-cache/app-admin/sudo-1.8.12
index 5326867a75e4..34eb73e2e67e 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.12
+++ b/metadata/md5-cache/app-admin/sudo-1.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=5
 HOMEPAGE=http://www.sudo.ws/
 IUSE=ldap nls pam offensive selinux skey +sendmail
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.12.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.12.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=ae481a9db63e07b8e74ff75995c22142
+_md5_=30ef1268df374c473b8970608f24fd60
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.3 b/metadata/md5-cache/app-admin/supervisor-3.1.3
index ebd5a034360b..a3f551922930 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=72480bd06dd77f6b57e0f16c99a218ce
+_md5_=0dfcbe74bdfcf8963a1fb28e4e80fbb7
diff --git a/metadata/md5-cache/app-arch/lzip-1.16 b/metadata/md5-cache/app-arch/lzip-1.16
index e93cccdf5569..9f4c495c7e8e 100644
--- a/metadata/md5-cache/app-arch/lzip-1.16
+++ b/metadata/md5-cache/app-arch/lzip-1.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=lossless data compressor based on the LZMA algorithm
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.16.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=9bd6b5b8da8961f3aeece9e942f0a22f
+_md5_=fa3a4f17ac98d97c9b0e0712c036e5c0
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.4 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.4
index f8953f5e0c1b..c822bd5f4805 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.4
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.4
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=5
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/eselect/eselect-1.4.4.tar.xz
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=5c5cd862c49512f61d531c4ea1aa0808
+_md5_=74e5d90b53f5c16380b4c298db58d9da
diff --git a/metadata/md5-cache/app-emulation/xen-4.2.5-r8 b/metadata/md5-cache/app-emulation/xen-4.2.5-r8
new file mode 100644
index 000000000000..e48ebdfe1f8b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.2.5-r8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask pae xsm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.2.5
+REQUIRED_USE=flask? ( xsm )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.5/xen-4.2.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.5-upstream-patches-6.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=4098bb4f26fb46d049b45f6d1f290b96
diff --git a/metadata/md5-cache/app-emulation/xen-4.4.2-r1 b/metadata/md5-cache/app-emulation/xen-4.4.2-r1
new file mode 100644
index 000000000000..c6af1e0f9bcf
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.4.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask xsm
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.4.2
+REQUIRED_USE=flask? ( xsm ) arm? ( debug )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.2/xen-4.4.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=525d52486f65d69d42c532ea7f286d28
diff --git a/metadata/md5-cache/app-emulation/xen-4.5.0-r5 b/metadata/md5-cache/app-emulation/xen-4.5.0-r5
new file mode 100644
index 000000000000..8d5e4f80382f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.5.0-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask xsm
+KEYWORDS=~arm ~arm64 ~amd64
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.5.0
+REQUIRED_USE=flask? ( xsm ) arm? ( debug )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=2541eb5f70f085a850e6386056feca4a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.5-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.2.5-r4
new file mode 100644
index 000000000000..1036052d1225
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.5-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt:0 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] sys-libs/zlib sys-power/iasl system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe dev-ml/findlib hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.5/xen-4.2.5.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.6.3.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.6.3.2.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.5-upstream-patches-6.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-0.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=dcfeab28661ee75337847b06e11f2cab
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.4.1-r7 b/metadata/md5-cache/app-emulation/xen-tools-4.4.1-r7
index 6c1091b289da..6e6ac64c1394 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.4.1-r7
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.4.1-r7
@@ -4,7 +4,7 @@ DESCRIPTION=Xend daemon and tools
 EAPI=5
 HOMEPAGE=http://xen.org/
 IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=amd64 ~arm -x86
+KEYWORDS=~amd64 ~arm -x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
 REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.3.1.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.3.1.tar.gz http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-4.4.1-upstream-patches-8.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=846b41fe96524a4b2deec5f0d200058f
+_md5_=2483dbf1f191f1614511e8c9e30860c0
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.4.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.4.2-r1
new file mode 100644
index 000000000000..e45f213cacdc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.4.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) arm? ( >=sys-apps/dtc-1.4.0 ) !arm? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.2/xen-4.4.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.3.1.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.3.1.tar.gz http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=82921be2f7d01c238dc5d7beef647651
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r3 b/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r3
new file mode 100644
index 000000000000..648459cb294c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.5.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~arm ~arm64 ~amd64 -x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/seabios-1.7.5.tar.gz http://dev.gentoo.org/~dlan/distfiles/ovmf-20131208.tar.bz2 http://dev.gentoo.org/~dlan/distfiles/xen-4.5.0-upstream-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-security-patches-0.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-3.tar.xz http://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-0.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=ac7399fe7ae87bf7688e2203f359273e
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
index 5615d8da9774..254148b94e6a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.60
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60 virtual/udev
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ebd9dd00343cf0c2c56d282c748ca409
+_md5_=129ca8d4e22e0d1f33f5119ba803416c
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
index 4e6002b4b225..412328dae620 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.65
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65 virtual/udev
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e08f8363702f9a2f82bf819bea481d35
+_md5_=ca907e7b9924bc3140bc4ade36d4058e
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
index f4855a505e23..b3f95a66f79c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-0.6.70
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.70 virtual/udev
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c425f3d990637ab889cb39a9bbd88364
+_md5_=b1a175d5afa719a9198ab6967f06b001
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-9999 b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
index 66a8969bcf39..c8e1ef5c1f81 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
@@ -8,4 +8,4 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/udev
 SLOT=0
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fac041043bc5f7ab83896809c3cebd97
+_md5_=4585976e17e826b1dca3f3ff683b75e3
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
index 9172274babc5..229dea2fdb92 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.60
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3f61d40b340bbf6db4d17ee29ac34b05
+_md5_=f012e42178db6aac929253889e61a173
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
index 43dee4aaabd8..efa3b2143090 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.65
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2ccba83b4138c3f03bec6dfcf8f0f1ff
+_md5_=c4c45d0d524b645e037af427b9f14823
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
index 8e1178730967..e4970508ca67 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-0.6.70
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.70
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cd6bc5c4cc8cd16b7df3a3c86f9cdd78
+_md5_=73b96b75cd483eae7880939b374b57b1
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999 b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
index 3d273cabcb76..66d88e3236ef 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
@@ -8,4 +8,4 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0e8ce893b444c22783d19dd489a355f1
+_md5_=a7b5ca84eee6b90d68edfd3a8572731a
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
index a042ddf4dad0..23c6e870a987 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-0.6.70
@@ -11,4 +11,4 @@ REQUIRED_USE=postscript? ( pdf )
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e7e1dfc91343434310f6c03f18e7f095
+_md5_=61dad99c844b04f6f516a25e6e69cee5
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-9999 b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
index 63f4c1fb8bff..c8bddced727b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
@@ -9,4 +9,4 @@ RDEPEND=~app-leechcraft/lc-core-9999 pdf? ( app-text/poppler[qt4] ) djvu? ( app-
 REQUIRED_USE=postscript? ( pdf )
 SLOT=0
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	leechcraft	a759a75a40c745b9d6043c12e026b94e	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a4f6783f12e402c291d7824dc1382985
+_md5_=866bc135b1f86d73130e96c1253c9ecf
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2
index 00036d74ea06..7ff27d076eef 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-4.3.5.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-4.3.5.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-4.3.5.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-4.3.5.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-4.3.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-4.3.5.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-4.3.5.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-4.3.5.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-4.3.5.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-4.3.5.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-4.3.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-4.3.5.2.xd3 ) ) ) )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8f6fafb60854be14373e12f0874fb9fc
+_md5_=27d291d8f445d4e884b06972cb75efdd
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2-r1
index 3c6c038597bc..b97351195c00 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-4.3.5.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-4.3.5.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-4.3.5.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-4.3.5.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-4.3.5.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-4.3.5.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-4.3.5.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-4.3.5.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-4.3.5.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-4.3.5.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-4.3.5.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-4.3.5.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-4.3.5.2-r1.xd3 ) ) ) )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78454a1fb8220ba59fa5b017d5967f95
+_md5_=0b7d628b22799bfa3a37472ea1e70734
diff --git a/metadata/md5-cache/app-text/aspell-0.60.6.1-r1 b/metadata/md5-cache/app-text/aspell-0.60.6.1-r1
index ab668f7554d6..7c72ffb8f11c 100644
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1-r1
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A spell checker replacement for ispell
 EAPI=5
 HOMEPAGE=http://aspell.net/
 IUSE=nls linguas_af linguas_be linguas_bg linguas_br linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_fi linguas_fo linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_is linguas_it linguas_la linguas_lt linguas_nl linguas_no linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_uk linguas_vi
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=app-dicts/aspell-en linguas_af? ( app-dicts/aspell-af ) linguas_be? ( app-dicts/aspell-be ) linguas_bg? ( app-dicts/aspell-bg ) linguas_br? ( app-dicts/aspell-br ) linguas_ca? ( app-dicts/aspell-ca ) linguas_cs? ( app-dicts/aspell-cs ) linguas_cy? ( app-dicts/aspell-cy ) linguas_da? ( app-dicts/aspell-da ) linguas_de? ( || ( app-dicts/aspell-de app-dicts/aspell-de-alt ) ) linguas_el? ( app-dicts/aspell-el ) linguas_en? ( app-dicts/aspell-en ) linguas_eo? ( app-dicts/aspell-eo ) linguas_es? ( app-dicts/aspell-es ) linguas_et? ( app-dicts/aspell-et ) linguas_fi? ( app-dicts/aspell-fi ) linguas_fo? ( app-dicts/aspell-fo ) linguas_fr? ( app-dicts/aspell-fr ) linguas_ga? ( app-dicts/aspell-ga ) linguas_gl? ( app-dicts/aspell-gl ) linguas_he? ( app-dicts/aspell-he ) linguas_hr? ( app-dicts/aspell-hr ) linguas_is? ( app-dicts/aspell-is ) linguas_it? ( app-dicts/aspell-it ) linguas_la? ( app-dicts/aspell-la ) linguas_lt? ( app-dicts/aspell-lt ) linguas_nl? ( app-dicts/aspell-nl ) linguas_no? ( app-dicts/aspell-no ) linguas_pl? ( app-dicts/aspell-pl ) linguas_pt? ( app-dicts/aspell-pt ) linguas_pt_BR? ( app-dicts/aspell-pt-br ) linguas_ro? ( app-dicts/aspell-ro ) linguas_ru? ( app-dicts/aspell-ru ) linguas_sk? ( app-dicts/aspell-sk ) linguas_sl? ( app-dicts/aspell-sl ) linguas_sr? ( app-dicts/aspell-sr ) linguas_sv? ( app-dicts/aspell-sv ) linguas_uk? ( app-dicts/aspell-uk ) linguas_vi? ( app-dicts/aspell-vi )
 RDEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=617057215ba91c43fef367d8f044822b
+_md5_=9ce80e06c869c8aeb6e30988aecf8a70
diff --git a/metadata/md5-cache/app-text/llpp-20_p20140818 b/metadata/md5-cache/app-text/llpp-20_p20140818
index 8cc409166cf0..6a2eb0af939f 100644
--- a/metadata/md5-cache/app-text/llpp-20_p20140818
+++ b/metadata/md5-cache/app-text/llpp-20_p20140818
@@ -11,4 +11,4 @@ RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> llpp-20_p20140818.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=96e655d0c3dc59f79f85b24871a3968c
+_md5_=d1c47130e0f2ad471941944be6b237c6
diff --git a/metadata/md5-cache/app-text/llpp-21 b/metadata/md5-cache/app-text/llpp-21
index 9be279068a72..e82899c860fb 100644
--- a/metadata/md5-cache/app-text/llpp-21
+++ b/metadata/md5-cache/app-text/llpp-21
@@ -11,4 +11,4 @@ RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://repo.or.cz/w/llpp.git/snapshot/973e613ec9062e5c41323fc58fa3435fc6c45551.tar.gz -> llpp-21.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=dc3ad2ff014a61bd6307cdddb55e6be8
+_md5_=4f926cec72fb9e68e226980a73665fd8
diff --git a/metadata/md5-cache/app-text/logmerge-0.4_beta b/metadata/md5-cache/app-text/logmerge-0.4_beta
index c243a5774ef8..664ddf3c312f 100644
--- a/metadata/md5-cache/app-text/logmerge-0.4_beta
+++ b/metadata/md5-cache/app-text/logmerge-0.4_beta
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://logmerge.googlecode.com/files/logmerge-0.4-beta.zip
-_md5_=a7fdcdd1de3e41a1a5552ac735c8560e
+_md5_=556a63f99c7574c1d2e1257862cbf611
diff --git a/metadata/md5-cache/app-text/po4a-0.45-r2 b/metadata/md5-cache/app-text/po4a-0.45-r2
index f1d02bc0c8e7..d77021d2c1c9 100644
--- a/metadata/md5-cache/app-text/po4a-0.45-r2
+++ b/metadata/md5-cache/app-text/po4a-0.45-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/lib
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.45.orig.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9a66e1d9a0001e07bd8cd7a7fa5a4aed
+_md5_=7036a396f1c7bd9b9b15fe0a513abfd9
diff --git a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r14 b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r14
index a2626a376f8f..b275073d2676 100644
--- a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r14
+++ b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r14
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to SGML software in a DocBook/OpenJade env
 EAPI=5
 HOMEPAGE=http://sgmltools-lite.sourceforge.net/
 IUSE=jadetex python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/sgmltools-lite/sgmltools-lite-3.0.3.tar.gz mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	sgml-catalog	115ce04390f5bb32de8fef875ea71b4b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=4237b250b2c292b3d72482c621af7a4d
+_md5_=05ce77bfb50d3d66de8e026bc4f1e71b
diff --git a/metadata/md5-cache/app-text/tesseract-3.03_rc1-r1 b/metadata/md5-cache/app-text/tesseract-3.03_rc1-r1
index 285cb0cd7bee..bfb937cdeb45 100644
--- a/metadata/md5-cache/app-text/tesseract-3.03_rc1-r1
+++ b/metadata/md5-cache/app-text/tesseract-3.03_rc1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An OCR Engine that was developed at HP and now at Google
 EAPI=5
 HOMEPAGE=http://code.google.com/p/tesseract-ocr/
 IUSE=doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomka/files/tesseract-3.03-rc1.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz doc? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz ) linguas_ar? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.ara.tar.gz ) linguas_bg? ( http://tesseract-ocr.googlecode.com/files/bul.traineddata.gz ) linguas_ca? ( http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz ) linguas_chr? ( http://tesseract-ocr.googlecode.com/files/chr.traineddata.gz ) linguas_cs? ( http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz ) linguas_de? ( http://tesseract-ocr.googlecode.com/files/deu.traineddata.gz http://tesseract-ocr.googlecode.com/files/deu-frak.traineddata.gz ) linguas_da? ( http://tesseract-ocr.googlecode.com/files/dan.traineddata.gz http://tesseract-ocr.googlecode.com/files/dan-frak.traineddata.gz ) linguas_el? ( http://tesseract-ocr.googlecode.com/files/ell.traineddata.gz ) linguas_es? ( http://tesseract-ocr.googlecode.com/files/spa.traineddata.gz ) linguas_fi? ( http://tesseract-ocr.googlecode.com/files/fin.traineddata.gz ) linguas_fr? ( http://tesseract-ocr.googlecode.com/files/fra.traineddata.gz ) linguas_he? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.heb.tar.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.heb-com.tar.gz ) linguas_hi? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.hin.tar.gz ) linguas_hu? ( http://tesseract-ocr.googlecode.com/files/hun.traineddata.gz ) linguas_id? ( http://tesseract-ocr.googlecode.com/files/ind.traineddata.gz ) linguas_it? ( http://tesseract-ocr.googlecode.com/files/ita.traineddata.gz ) linguas_jp? ( http://tesseract-ocr.googlecode.com/files/jpn.traineddata.gz ) linguas_ko? ( http://tesseract-ocr.googlecode.com/files/kor.traineddata.gz ) linguas_lt? ( http://tesseract-ocr.googlecode.com/files/lit.traineddata.gz ) linguas_lv? ( http://tesseract-ocr.googlecode.com/files/lav.traineddata.gz ) linguas_nl? ( http://tesseract-ocr.googlecode.com/files/nld.traineddata.gz ) linguas_no? ( http://tesseract-ocr.googlecode.com/files/nor.traineddata.gz ) linguas_pl? ( http://tesseract-ocr.googlecode.com/files/pol.traineddata.gz ) linguas_pt? ( http://tesseract-ocr.googlecode.com/files/por.traineddata.gz ) linguas_ro? ( http://tesseract-ocr.googlecode.com/files/ron.traineddata.gz ) linguas_ru? ( http://tesseract-ocr.googlecode.com/files/rus.traineddata.gz ) linguas_sk? ( http://tesseract-ocr.googlecode.com/files/slk.traineddata.gz http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.slk-frak.tar.gz ) linguas_sl? ( http://tesseract-ocr.googlecode.com/files/slv.traineddata.gz ) linguas_sr? ( http://tesseract-ocr.googlecode.com/files/srp.traineddata.gz ) linguas_sv? ( http://tesseract-ocr.googlecode.com/files/swe.traineddata.gz http://tesseract-ocr.googlecode.com/files/swe-frak.traineddata.gz ) linguas_th? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.tha.tar.gz ) linguas_tl? ( http://tesseract-ocr.googlecode.com/files/tgl.traineddata.gz ) linguas_tr? ( http://tesseract-ocr.googlecode.com/files/tur.traineddata.gz ) linguas_uk? ( http://tesseract-ocr.googlecode.com/files/ukr.traineddata.gz ) linguas_vi? ( http://tesseract-ocr.googlecode.com/files/vie.traineddata.gz ) linguas_zh_CN? ( http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz ) linguas_zh_TW? ( http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz ) osd? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.osd.tar.gz )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=39409817af952ce26d1cf8de2885ab98
+_md5_=9189da4847db8b2ca1cacd82008f3955
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1 b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
index 3258a12454f0..7ee738290e0a 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
@@ -3,11 +3,11 @@ DEPEND==dev-cpp/gtest-1.7.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 DESCRIPTION=Google's C++ mocking framework
 EAPI=4
 HOMEPAGE=http://code.google.com/p/googlemock/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND==dev-cpp/gtest-1.7.0*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.7.0.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=340bdf9b1b4ee643879fdbd3d98b5d3c
+_md5_=662a65faa79e9f8af18f08f567eab9b1
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4
index eccf93ebec7b..97e42e90b523 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/glibmm-2.27.93:2 >=x11-libs/gtk+-2.24:2 >=dev-cpp/atkmm-2.22.2
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=669d9068fa6abc6701468693c5c1e600
+_md5_=a274d1f89251c36422bf84191056975c
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.1.20121003-r1 b/metadata/md5-cache/dev-cpp/tbb-4.1.20121003-r1
index 647488a961e6..d489b7b91a4e 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.1.20121003-r1
+++ b/metadata/md5-cache/dev-cpp/tbb-4.1.20121003-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20121003oss_src.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ba87ff263ff2ef0ad1588f2d749da10a
+_md5_=f7f69325fb34da14f54b105b4f0651f6
diff --git a/metadata/md5-cache/dev-db/libdbi-0.9.0 b/metadata/md5-cache/dev-db/libdbi-0.9.0
index f7050764a0fd..8afad3ff2c31 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.9.0
+++ b/metadata/md5-cache/dev-db/libdbi-0.9.0
@@ -10,4 +10,4 @@ PDEPEND=>=dev-db/libdbi-drivers-0.9.0
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.9.0.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=083d8e4f22506768720a8b38eaa13476
+_md5_=1332c00f3e31e95e8c01c4bab276573b
diff --git a/metadata/md5-cache/dev-games/ois-1.3 b/metadata/md5-cache/dev-games/ois-1.3
index 77c1ab7eaea2..5d58f28277e2 100644
--- a/metadata/md5-cache/dev-games/ois-1.3
+++ b/metadata/md5-cache/dev-games/ois-1.3
@@ -4,9 +4,9 @@ DESCRIPTION=Object-oriented Input System - A cross-platform C++ input handling l
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/wgois/
 IUSE=static-libs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=mirror://sourceforge/wgois/ois_v1-3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=420b510d595553e220b890671eafabb2
+_md5_=5ca15a88b0557afc2fcad3cbb0b7d40c
diff --git a/metadata/md5-cache/dev-haskell/logict-0.6.0.1 b/metadata/md5-cache/dev-haskell/logict-0.6.0.1
index a0a48117bdbb..07d549a3e2ad 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.6.0.1
+++ b/metadata/md5-cache/dev-haskell/logict-0.6.0.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-l
 SLOT=0/0.6.0.1
 SRC_URI=mirror://hackage/packages/archive/logict/0.6.0.1/logict-0.6.0.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b8315e2c4a19b129007c5a5008e3e20f
+_md5_=0e96f654f8df7e1ac39481dbb8cb1630
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.2 b/metadata/md5-cache/dev-haskell/split-0.2.2
index f4397cc3fd6c..9512aa03ee18 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.2
+++ b/metadata/md5-cache/dev-haskell/split-0.2.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Combinator library for splitting lists
 EAPI=5
@@ -7,7 +7,8 @@ IUSE=doc hscolour profile test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
+RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/split/0.2.2/split-0.2.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e2c066de84daff4bf600defa56a17a7e
+_md5_=143643826827a1d45886b29531ae8a19
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8 b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
index 6772511cf8b1..624d4d130bfa 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
+++ b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/utf8-string/0.3.8/utf8-string-0.3.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6cef2e0a6a2c071b7c9f1111ccb20a5c
+_md5_=19eb5ee166f049a1593ae2d09d976788
diff --git a/metadata/md5-cache/dev-haskell/vector-0.10.12.3 b/metadata/md5-cache/dev-haskell/vector-0.10.12.3
new file mode 100644
index 000000000000..18bea55daf34
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-0.10.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 >=dev-haskell/transformers-0.2.0.0 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Efficient Arrays
+EAPI=5
+HOMEPAGE=https://github.com/haskell/vector
+IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.12.3
+SRC_URI=mirror://hackage/packages/archive/vector/0.10.12.3/vector-0.10.12.3.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3f00c61457a80ee69fce3e055a32b726
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.6.0.4 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.6.0.4
new file mode 100644
index 000000000000..038934b3ef23
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( properties? ( >=dev-haskell/quickcheck-2 ) ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Efficient algorithms for vector arrays
+EAPI=5
+HOMEPAGE=http://code.haskell.org/~dolio/
+IUSE=bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/mwc-random:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.6.0.4
+SRC_URI=mirror://hackage/packages/archive/vector-algorithms/0.6.0.4/vector-algorithms-0.6.0.4.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1b95f48b99fcfece9b2f36c733bd2a0c
diff --git a/metadata/md5-cache/dev-haskell/vector-instances-3.3.0.1 b/metadata/md5-cache/dev-haskell/vector-instances-3.3.0.1
new file mode 100644
index 000000000000..8f0339487456
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-instances-3.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Orphan Instances for 'Data.Vector'
+EAPI=5
+HOMEPAGE=http://github.com/ekmett/vector-instances
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/3.3.0.1
+SRC_URI=mirror://hackage/packages/archive/vector-instances/3.3.0.1/vector-instances-3.3.0.1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=090999c67ffeec390b695b8d643c81b6
diff --git a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.2 b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.2
new file mode 100644
index 000000000000..411813c08f18
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Deriver for Data.Vector.Unboxed using Template Haskell
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/vector-th-unbox
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.1.2
+SRC_URI=mirror://hackage/packages/archive/vector-th-unbox/0.2.1.2/vector-th-unbox-0.2.1.2.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=13b1216dd6f7518da8acd2890f7eae9b
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
index b25b198b7bfd..e740e77323fc 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/3000.2.1
 SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.1/xhtml-3000.2.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=539f326e082d0881c157979d8b830994
+_md5_=e5f227a6c281f5775960c57a25b608d3
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.1 b/metadata/md5-cache/dev-java/ant-jmf-1.9.1
index b1d168de4bdf..46b3ef0a568e 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
 _eclasses_=ant-tasks	73e5253d74dc38e1091285f7db16996c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e79d92515f119f8705dc5141a284d3fb
+_md5_=a36968c63758c800ef5a91fc3e06cf38
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.1 b/metadata/md5-cache/dev-java/ant-swing-1.9.1
index 4a3e91390cc6..9bbd23227fa2 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
 _eclasses_=ant-tasks	73e5253d74dc38e1091285f7db16996c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1106ba9564a14934b38292d50830f93e
+_md5_=ea674e41d92f9e0d873e53d2c8164f14
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index 56cb326463f2..7af450bc50cb 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89ea4a81ce5889b5c55b7b4ad3607d9e
+_md5_=77d758d057be375fb414e84436763e34
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
index 399bf6c49d2b..aad3c59b4502 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=317c7fce2ad438506e5ec6f161d36ac4
+_md5_=348446703c6c08fee26a7a1b28afe529
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index 5ba0bfd9808b..bf55ccc9d5ef 100644
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 >=dev-java/nekohtml-1.9.10:0 >=dev-j
 SLOT=0
 SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=14a0f45088e933032deaa972c096e8ba
+_md5_=18b95415a40a48f9a89613dd58835ef1
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index 3c7c31ec31ae..bf089dd2dac1 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-2.1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-2.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool
 SLOT=2
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=628185874746e092dd431e2ef7cd2768
+_md5_=03d2da68a48540307be7e8a7e48104af
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
index d8f9ad0a5de5..55bcb61365a9 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-logging:0 >=dev-java/java-config-2.1.
 SLOT=2
 SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89669c6dd7e8010877c47d1d9249d981
+_md5_=18f79d8d63e94ab845b976bf3ec13c20
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index ac38f7afb03b..ac6d116849b7 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.6
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.6
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9805e0c0578d3493897536fb312e97f9
+_md5_=562f062f1231c0729cf3566168e1a0cd
diff --git a/metadata/md5-cache/dev-java/easymock-3.2-r1 b/metadata/md5-cache/dev-java/easymock-3.2-r1
index 46fca4d230f7..30913b8c5c7f 100644
--- a/metadata/md5-cache/dev-java/easymock-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:2
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock/3.2/easymock-3.2.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bb04d5cddfdc1542828fc69ff74defb7
+_md5_=781ecc49eabbf547cee7d8dbe5f5275a
diff --git a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1 b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
index b9bdd3220120..ac7980378ae9 100644
--- a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.1.9-r1
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=38d7dfc52dd9a10e4efdf589b527615e
+_md5_=9e1d231e93e599475827607f5673215c
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index 7e5af1ec9ce4..db2ba37f446b 100644
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fbf4a4556ff51e5851bbad98dbdbc4f5
+_md5_=c74f6cd11c7039e12ddf74b05b031b05
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index 6a36f8b33404..6645f5a21a02 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b35db51d26b66d30e705d550fefb160c
+_md5_=dd32a4c0a7bc7a63f041299a679a1d92
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index 6c8479767d60..c7dbef288f19 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-a
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=176be255911428c46455ad385a827334
+_md5_=88d528586b3456fbfcb0c50826b1e75d
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index 52b906a9ce90..91b139d2098d 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f2db6e8438530195dac5a7106c6a7cc4
+_md5_=8f1d4b0088f09acade381e29de020d2d
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index df8515ef42f7..7e41f7248bf1 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c8d28fe6f1a7e13dc9e770119903debc
+_md5_=79cf3a662f379f527876e0e7644b811f
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index 35d99ea1408b..501412a1935c 100644
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e015531c81edf7b958b4856be149863c
+_md5_=7a7191aabe065eda5de51c9283390fad
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
index 486cb3995c46..5d682824abd5 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-codec:0 dev-java/commons-logging:0 de
 SLOT=4.3
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.3.1-src.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-build.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=229c2054d050a144f880fb4bb11e60ea
+_md5_=c43413cf3973a55c991d3633cacc9992
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.2 b/metadata/md5-cache/dev-java/invokebinder-1.2
index 849ef8b63778..69d5d28e5e9b 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.2
+++ b/metadata/md5-cache/dev-java/invokebinder-1.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://github.com/headius/invokebinder/archive/invokebinder-1.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=58c84ac481f8b3a9d298fe6864bb2223
+_md5_=79b527cc220151e8f520b6a254004327
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
index c6cc2559a74d..a813b9d971fb 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/bndlib:0 dev-java/commons-httpclient:3 dev-ja
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.6.2/jackrabbit-2.6.2-src.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e81208da2147e5ae4c2c5acc3e4aefc
+_md5_=d4ebb653288bfeb0326f8fbdaa67f013
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index cda988bc5884..3f4a0651a51b 100644
--- a/metadata/md5-cache/dev-java/janino-2.7.0
+++ b/metadata/md5-cache/dev-java/janino-2.7.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=d
 SLOT=0
 SRC_URI=http://janino.net/download/janino-2.7.0.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=49be3caae398d8039b21b750664a7243
+_md5_=668f9dc710d238f1510a28bca55f010a
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1 b/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
index 8298c0c0ea0c..6022e943dca9 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/jboss-logmanager:0 <dev-java/slf4j-api-1.7.7:
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.3.GA.tar.gz -> jboss-logging-3.1.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c2b0d105162c38a092934702a30d7ab7
+_md5_=aea80a5bcc3760e55bb8c8bdb7fd3834
diff --git a/metadata/md5-cache/dev-java/jmock-2.5.1 b/metadata/md5-cache/dev-java/jmock-2.5.1
index 28ca7c803c0d..f05875abb4bf 100644
--- a/metadata/md5-cache/dev-java/jmock-2.5.1
+++ b/metadata/md5-cache/dev-java/jmock-2.5.1
@@ -10,4 +10,4 @@ RDEPEND=virtual/jre:1.6 dev-java/hamcrest-core:0 dev-java/hamcrest-library:0 >=d
 SLOT=2
 SRC_URI=http://jmock.codehaus.org/dist/jmock-2.5.1-jars.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=91482c050b78ba3e593538684f0247ad
+_md5_=20dc65cf06a2666f8223afd1a27a111a
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.4 b/metadata/md5-cache/dev-java/jnr-enxio-0.4
index c55034ebbc8e..da10ed77d809 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.4
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.4
@@ -10,4 +10,4 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-ja
 SLOT=0
 SRC_URI=http://github.com/jnr/jnr-enxio/archive/0.4.tar.gz -> jnr-enxio-0.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=400cc6d13969ffce97529aa92abc7e0c
+_md5_=f239da6dddc6556aa892ba5c281d32ba
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10 b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
index 88d246b7563a..788824f25f42 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
@@ -10,4 +10,4 @@ RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1
 SLOT=1
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/1.0.10.tar.gz -> jnr-ffi-1.0.10.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=98237680700a43737a535448edfc54b0
+_md5_=42c56bdc0a6eca23f2af072d4929fb7c
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
index 8d51243aafe5..1aa80404167a 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=An abstracted interface to invoking native functions from java
 EAPI=5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2
-SRC_URI=https://github.com/jnr/jnr-ffi/tarball/2.0.2 -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9ee66ebc495494ccf7b79cabdc1fe0f3
+SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e514a44329e75d182c05fa8261d43136
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
index 23d896c4f57a..9db80b2524e0 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
+DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=dev-java/jnr-ffi:2 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Network services database access for java
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 sou
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=71947a1719816583740f5ff8094f05c3
+_md5_=d2de79e7c1b8a787c52493dc51bdd34e
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.3 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
index ed713175dae3..fa7b5ffc5788 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
@@ -10,4 +10,4 @@ RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-ffi:0.7 >=vir
 SLOT=0
 SRC_URI=http://github.com/jnr/jnr-unixsocket/archive/0.3.tar.gz -> jnr-unixsocket-0.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=32ba59bc71d30cb3e62c6bd9c96368de
+_md5_=58bf116e5e42b29ad233e752fe5e7235
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r1 b/metadata/md5-cache/dev-java/libg-2.1.0-r1
index c21ab6c9fadf..c4365182e5aa 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e3575b2ef3618fa78304bca6bbc51c7e
+_md5_=2a0e049f7ee410c3cacc8fa57d1fd408
diff --git a/metadata/md5-cache/dev-java/logback-1.0.13 b/metadata/md5-cache/dev-java/logback-1.0.13
index ac11a1a97d23..987c0670b64e 100644
--- a/metadata/md5-cache/dev-java/logback-1.0.13
+++ b/metadata/md5-cache/dev-java/logback-1.0.13
@@ -10,4 +10,4 @@ RDEPEND=dev-java/janino:0 dev-java/jansi:0 java-virtuals/javamail:0 java-virtual
 SLOT=0
 SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=038ed567980eeeba3c66725f9f119faa
+_md5_=5370d7830188d1434e2356b98d5a3784
diff --git a/metadata/md5-cache/dev-java/opencsv-2.3 b/metadata/md5-cache/dev-java/opencsv-2.3
index 00d67dde3368..eb012b56669b 100644
--- a/metadata/md5-cache/dev-java/opencsv-2.3
+++ b/metadata/md5-cache/dev-java/opencsv-2.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencsv/opencsv-2.3-src-with-libs.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=45ab9a1ec4620286f17f8445de39baad
+_md5_=957c72a5aab2534decd25cdae33acc7e
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.8 b/metadata/md5-cache/dev-java/pdfbox-1.8.8
index 55ccade87698..8de88ab41bef 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.8
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.8
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/bcprov-1.50 dev-java/bcmail:1.45 >=dev-java
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.8/pdfbox-1.8.8-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4f99ca5222baf8e2c64fef6d92f2a383
+_md5_=8271b2d07b953e753109bd6446f66c60
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.5 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
index d426699750ad..0b0507d78de6 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.1.9-r1 s
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5057c5d9afb260cad40acfe37f7e8d0d
+_md5_=527f2d2e2239c0eddc2a5c3c3a006118
diff --git a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3 b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
index 47c736a432db..3b16f8f86d08 100644
--- a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+++ b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/ja
 SLOT=1.0
 SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0ded3404b2c6c2150808ab09ab321cc5
+_md5_=cabb557de8a71fd7d356a518d7694b13
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 912f9bbec66f..341eb6f393ee 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/ja
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c406df9ef7d637fdda7e17598bd7e615
+_md5_=38b2d43f4c87d2133c6463efb73e9b9e
diff --git a/metadata/md5-cache/dev-java/spring-aop-3.2.4 b/metadata/md5-cache/dev-java/spring-aop-3.2.4
index 83a5db4d1ca5..5f83a352d31d 100644
--- a/metadata/md5-cache/dev-java/spring-aop-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-aop-3.2.4
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=282fb25c79b85008c12d39ec2e97ff6a
+_md5_=30d008cc270ba8f3c34a0d861a486721
diff --git a/metadata/md5-cache/dev-java/spring-expression-3.2.4 b/metadata/md5-cache/dev-java/spring-expression-3.2.4
index 5426a4431119..82f271e52957 100644
--- a/metadata/md5-cache/dev-java/spring-expression-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-expression-3.2.4
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.1.9-
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1e39409228e3af666c7fe556a812acf5
+_md5_=810c882b31647f3fbcfffb0097bc4394
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r2 b/metadata/md5-cache/dev-java/stax-ex-1.0-r2
index 689951815379..c8de9360505d 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r2
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 java-virtuals/jaf java-virtuals/stax-api >=dev-java/ja
 SLOT=0
 SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=43a1d7fcff17908cb531761d4db92bca
+_md5_=4b839ca8c5b8555ff76c9501ba8044b5
diff --git a/metadata/md5-cache/dev-java/tablelayout-20090826 b/metadata/md5-cache/dev-java/tablelayout-20090826
index d47f817a49f1..2f6437f1709d 100644
--- a/metadata/md5-cache/dev-java/tablelayout-20090826
+++ b/metadata/md5-cache/dev-java/tablelayout-20090826
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://java.net/projects/tablelayout/downloads/download/Everything-2009-08-26.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a4171c3c553da59c40e1e074805a6ffe
+_md5_=30b2a82bf7f8ca621ea0c8b75436df39
diff --git a/metadata/md5-cache/dev-java/testng-6.8-r2 b/metadata/md5-cache/dev-java/testng-6.8-r2
index 74190402e5fa..d00fbbd45215 100644
--- a/metadata/md5-cache/dev-java/testng-6.8-r2
+++ b/metadata/md5-cache/dev-java/testng-6.8-r2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/ant-core:0 dev-java/bsh:0 dev-java/guice:2 de
 SLOT=0
 SRC_URI=http://testng.org/testng-6.8.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3258d8426c2904557db59a431826631b
+_md5_=704d4f45226831bd1c6e9cd31e661fc0
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index e1c42b1b58cf..4000a3bef6af 100644
--- a/metadata/md5-cache/dev-java/trident-1.3
+++ b/metadata/md5-cache/dev-java/trident-1.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3122422020feb25200055a2193c86930
+_md5_=7355b745697fdf8489db13729d1b64ab
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index d3e98cfa135a..b75df8ed5abe 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.1.9-r1 sou
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-pkg-simple	b21814347affda1506f12c1721a8fa55	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=40a65ae61c1f74fa7f78b63fc470e882
+_md5_=6d971c497785511b38f238b4ba7bfa40
diff --git a/metadata/md5-cache/dev-lang/ekopath-5.0.1_pre20131115 b/metadata/md5-cache/dev-lang/ekopath-5.0.1_pre20131115
index 8523edc6cdd4..34b4456593c8 100644
--- a/metadata/md5-cache/dev-lang/ekopath-5.0.1_pre20131115
+++ b/metadata/md5-cache/dev-lang/ekopath-5.0.1_pre20131115
@@ -9,4 +9,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2013-11-15-installer.run -> ekopath-5.0.1_pre20131115.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89599be179dd4cfc642cfde408355696
+_md5_=996db44f401eaa62a701d2bea24e4136
diff --git a/metadata/md5-cache/dev-lang/ekopath-5.0.5_pre20150226 b/metadata/md5-cache/dev-lang/ekopath-5.0.5_pre20150226
index abe30e575579..7c50d0292aef 100644
--- a/metadata/md5-cache/dev-lang/ekopath-5.0.5_pre20150226
+++ b/metadata/md5-cache/dev-lang/ekopath-5.0.5_pre20150226
@@ -9,4 +9,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2015-02-26-installer.run -> ekopath-5.0.5_pre20150226.run
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f920d7d3597c96f03fb9543c690fe752
+_md5_=063586363b424bd352f6bf36dbea7846
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.2 b/metadata/md5-cache/dev-lang/luajit-2.0.2
index 3e5c249326be..59ff08893704 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.2
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.2
@@ -3,9 +3,9 @@ DESCRIPTION=Just-In-Time Compiler for the Lua programming language
 EAPI=5
 HOMEPAGE=http://luajit.org/
 IUSE=lua52compat
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6508bee2d0c019a36740239075df3cc1
+_md5_=2c4d35ea5ad4e042c2fb242b9d8cb963
diff --git a/metadata/md5-cache/dev-lang/php-5.4.39 b/metadata/md5-cache/dev-lang/php-5.4.39
index 2b4d722e7c54..a9856ad5ed23 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.39
+++ b/metadata/md5-cache/dev-lang/php-5.4.39
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=5
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.39.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=20b62e6f4e69ac88f9df4c816ced30ce
+_md5_=f66c85b5b36bd6d0f472aeede2607755
diff --git a/metadata/md5-cache/dev-lang/php-5.5.23 b/metadata/md5-cache/dev-lang/php-5.5.23
index db99330c3d00..741321881c9e 100644
--- a/metadata/md5-cache/dev-lang/php-5.5.23
+++ b/metadata/md5-cache/dev-lang/php-5.5.23
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=5
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.5
 SRC_URI=http://www.php.net/distributions/php-5.5.23.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=371b390dc0458dd443ff19a2dab4fbc2
+_md5_=2b3d595b8a7b9252a6ab05dcd5f463b3
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17 b/metadata/md5-cache/dev-lang/tcl-8.5.17
index 4e2166653903..0875e5f1af38 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tool Command Language
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1f017885317fc31666b518bcff2aa438
+_md5_=e936ca2597bd2e58edc8deac91c46a62
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17 b/metadata/md5-cache/dev-lang/tk-8.5.17
index dbfe0c46e7b7..9b542a4be962 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.17
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tk Widget Set
 EAPI=5
 HOMEPAGE=http://www.tcl.tk/
 IUSE=debug threads truetype aqua xscreensaver test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0=
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8c040323498851534966396376c9dac7
+_md5_=efc556cc6bc9034d77c31041b196f4f5
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.1.1 b/metadata/md5-cache/dev-libs/libflatarray-0.1.1
index 4b1dbe75f8ac..37698fd69e33 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.1.1
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48
 SLOT=0
 SRC_URI=http://www.libgeodecomp.org/archive/libflatarray-0.1.1.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	cuda	2ba75c44d72d2b0b1fe31e2e2dc42d0e	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0294c85acd19b7a305db3f5c062a4355
+_md5_=6a9896757caed40dc31eed2a8acf1652
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.6 b/metadata/md5-cache/dev-libs/libltdl-2.4.6
index 217f4214b277..fde829d17ac2 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.6
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libtool/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=cd07e2dd50a531c377be9dab80f4307f
+_md5_=7767186383a9f92869294ba2c9955717
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r3 b/metadata/md5-cache/dev-libs/openct-0.6.20-r3
index 485f1f48c751..ce815a58e9a2 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r3
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r3
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) udev? ( virtual/udev ) sys-apps/openrc
 SLOT=0
-SRC_URI=sourceforge://opensc/openct/openct-0.6.20.tar.gz
+SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6cfe08aad78b71a081717f7db6379f53
+_md5_=314dd0968c6b870d0785037be8842771
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index d10137109b3f..76f2d8102be5 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) udev? ( virtual/udev ) sys-apps/openrc
 SLOT=0
-SRC_URI=sourceforge://opensc/openct/openct-0.6.20.tar.gz
+SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=22ec1a92b16a7a4a8b149b60e0a9e7eb
+_md5_=a96d94bf2454b23d86487f7215f6c4fd
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2a b/metadata/md5-cache/dev-libs/openssl-1.0.2a
index d8b7bc351dea..53bda583c6a2 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2a
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2a
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2a.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=0b88d8b4c0331642ed21dfc438e9af64
+_md5_=9aa6dad5826a21ca0b5705c0aa39fb48
diff --git a/metadata/md5-cache/dev-libs/qof-0.8.8 b/metadata/md5-cache/dev-libs/qof-0.8.8
index 5f440c4c9a8d..86b53183d187 100644
--- a/metadata/md5-cache/dev-libs/qof-0.8.8
+++ b/metadata/md5-cache/dev-libs/qof-0.8.8
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libxml2 dev-libs/glib:2 sqlite? ( >=dev-db/sqlite-2.8.0:0 )
 SLOT=2
 SRC_URI=mirror://debian//pool/main/q/qof/qof_0.8.8.orig.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7a455c3716b59a51eda1d0f83bf1e0c0
+_md5_=8a86393bade1099886eea963708c4d8f
diff --git a/metadata/md5-cache/dev-libs/quazip-0.6.2-r1 b/metadata/md5-cache/dev-libs/quazip-0.6.2-r1
index 0a4a953dbe9d..82594cc37c2b 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.6.2-r1
+++ b/metadata/md5-cache/dev-libs/quazip-0.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=5
 HOMEPAGE=http://quazip.sourceforge.net/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/zlib[minizip] dev-qt/qtcore:4
 SLOT=0
 SRC_URI=mirror://sourceforge/quazip/quazip-0.6.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=bdcdb3ad989e4bd60dd90e95c7d6eb98
+_md5_=fa6dadd660bb4fbaef0ef751a74100aa
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.0.3 b/metadata/md5-cache/dev-libs/ucommon-6.0.3
index 009d33809969..ad8a85b2b538 100644
--- a/metadata/md5-cache/dev-libs/ucommon-6.0.3
+++ b/metadata/md5-cache/dev-libs/ucommon-6.0.3
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-6.0.3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=5c2e7ecf7961bf8977186c713732c971
+_md5_=13fc460aec695a73370dc341d486f83d
diff --git a/metadata/md5-cache/dev-libs/ucommon-6.1.8 b/metadata/md5-cache/dev-libs/ucommon-6.1.8
index 2c5720c51c78..6fb973586a8f 100644
--- a/metadata/md5-cache/dev-libs/ucommon-6.1.8
+++ b/metadata/md5-cache/dev-libs/ucommon-6.1.8
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-6.1.8.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=7eae8d233394e12c74022323c0851046
+_md5_=26bbb7fe6078791f8932fefe44fac9cb
diff --git a/metadata/md5-cache/dev-libs/xml-security-c-1.6.1 b/metadata/md5-cache/dev-libs/xml-security-c-1.7.3
similarity index 84%
rename from metadata/md5-cache/dev-libs/xml-security-c-1.6.1
rename to metadata/md5-cache/dev-libs/xml-security-c-1.7.3
index cad2b46cf350..a6f434579cb0 100644
--- a/metadata/md5-cache/dev-libs/xml-security-c-1.6.1
+++ b/metadata/md5-cache/dev-libs/xml-security-c-1.7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/xerces-c-3.1 dev-libs/openssl nss? ( dev-libs/nss ) xalan? ( dev-libs/xalan-c ) virtual/pkgconfig
 DESCRIPTION=Apache C++ XML security libraries
-EAPI=4
+EAPI=5
 HOMEPAGE=http://santuario.apache.org/
 IUSE=debug examples nss static-libs xalan
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/xerces-c-3.1 dev-libs/openssl nss? ( dev-libs/nss ) xalan? ( dev-libs/xalan-c )
 SLOT=0
-SRC_URI=mirror://apache/santuario/c-library/xml-security-c-1.6.1.tar.gz
+SRC_URI=mirror://apache/santuario/c-library/xml-security-c-1.7.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=0095e233ef4364f7d9047284adc498c6
+_md5_=59ad6e03d13047234a7180a4f5293630
diff --git a/metadata/md5-cache/dev-lua/lgi-0.6.2-r1 b/metadata/md5-cache/dev-lua/lgi-0.6.2-r1
index ec6c5270ff45..acb6bd207b27 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.6.2-r1
+++ b/metadata/md5-cache/dev-lua/lgi-0.6.2-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/l
 DESCRIPTION=Lua bindings using gobject-introspection
 EAPI=4
 HOMEPAGE=http://github.com/pavouk/lgi
-IUSE=examples
+IUSE=examples test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
 SLOT=0
 SRC_URI=http://github.com/downloads/pavouk/lgi/lgi-0.6.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a98bffa1aba7d5d9a4a3fa913229be06
+_md5_=5ce946fdf4c8bc5cec4a02b743b7a8ea
diff --git a/metadata/md5-cache/dev-lua/lgi-0.7.2 b/metadata/md5-cache/dev-lua/lgi-0.7.2
index e17855b8e808..7fe36d0db6c0 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.7.2
+++ b/metadata/md5-cache/dev-lua/lgi-0.7.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/l
 DESCRIPTION=Lua bindings using gobject-introspection
 EAPI=4
 HOMEPAGE=http://github.com/pavouk/lgi
-IUSE=examples
+IUSE=examples test
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.7.2.tar.gz -> lgi-0.7.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ff1ff4b2905d344fd0b2400f2308531f
+_md5_=377253f4f614cab9c8db231326c2fd19
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0
new file mode 100644
index 000000000000..b01a76f450d5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Session data support module for SOAP::Lite
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/IO-SessionData/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=8ccf41591f5e52765724f6e91503269c
diff --git a/metadata/md5-cache/dev-perl/Proc-Daemon-0.190.0 b/metadata/md5-cache/dev-perl/Proc-Daemon-0.190.0
new file mode 100644
index 000000000000..3959a358bf16
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Proc-Daemon-0.190.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Proc-ProcessTable ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Run Perl program as a daemon process
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Proc-Daemon/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.19.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=55e95e17fe633f5c0dfd841a442fdb28
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-0.715.0-r1 b/metadata/md5-cache/dev-perl/SOAP-Lite-0.715.0-r1
deleted file mode 100644
index aa5233b2abd3..000000000000
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-0.715.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Inspector dev-perl/XML-Parser dev-perl/libwww-perl virtual/perl-libnet dev-perl/MIME-Lite virtual/perl-MIME-Base64 ssl? ( dev-perl/Crypt-SSLeay ) jabber? ( dev-perl/Net-Jabber ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-IO-Compress >=dev-perl/MIME-tools-5.413 virtual/perl-version dev-lang/perl:=[-build(-)]
-DESCRIPTION=Simple and lightweight interface to the SOAP protocol (sic) both on client and server side
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/SOAP-Lite/
-IUSE=jabber ssl
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-perl/Class-Inspector dev-perl/XML-Parser dev-perl/libwww-perl virtual/perl-libnet dev-perl/MIME-Lite virtual/perl-MIME-Base64 ssl? ( dev-perl/Crypt-SSLeay ) jabber? ( dev-perl/Net-Jabber ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-IO-Compress >=dev-perl/MIME-tools-5.413 virtual/perl-version dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MK/MKUTTER/SOAP-Lite-0.715.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5c912e13ec425fcb5ab059fea25df70d
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.140.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.140.0
new file mode 100644
index 000000000000..eee24cbe123f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.140.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI dev-perl/XML-Parser dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) jabber? ( dev-perl/Net-Jabber ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-Warn dev-perl/XML-Parser-Lite ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Simple and lightweight interface to the SOAP protocol (sic) both on client and server side
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/SOAP-Lite/
+IUSE=jabber ssl test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI dev-perl/XML-Parser dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) jabber? ( dev-perl/Net-Jabber ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.14.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=8f7139f42baff7aa7c7b12dfde431e8b
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.720.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.720.0
new file mode 100644
index 000000000000..20c43a842725
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.720.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Lightweight regexp-based XML parser
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/XML-Parser-Lite/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.72.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=f4d55fe51271bea92852454665bcb044
diff --git a/metadata/md5-cache/dev-python/cliff-1.10.1 b/metadata/md5-cache/dev-python/cliff-1.10.1
new file mode 100644
index 000000000000..895422c82795
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cliff-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Command Line Interface Formulation Framework
+EAPI=5
+HOMEPAGE=https://github.com/dreamhost/cliff
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cmd2-0.6.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cliff/cliff-1.10.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=3ade37afc09938dfe2232483c5a0e107
diff --git a/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1 b/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1
new file mode 100644
index 000000000000..318053c950d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ghp-import-0.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Copy your docs directly to the gh-pages branch
+EAPI=5
+HOMEPAGE=http://github.com/davisp/ghp-import
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=tumbolia
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/g/ghp-import/ghp-import-0.4.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=e3912287b240f759ffe4525d0b7a2962
diff --git a/metadata/md5-cache/dev-python/kivy-garden-0.1.1 b/metadata/md5-cache/dev-python/kivy-garden-0.1.1
index 7ed719b1a718..6fb49948f445 100644
--- a/metadata/md5-cache/dev-python/kivy-garden-0.1.1
+++ b/metadata/md5-cache/dev-python/kivy-garden-0.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/kivy-garden/kivy-garden-0.1.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=6a100664b040a06ff5956f813b806bcd
+_md5_=c6d4729af7f45bd5a6aa9df2116f471b
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.2-r1 b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
index 37ad575156d1..58cc20563b9c 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=0158dd5dd7a32553b17fbae4a2e1dce0
+_md5_=90ec2db73aa0ff2bdb8d023e8188d7e3
diff --git a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1 b/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1
index acba70c2ad5c..2c23c7d1fe55 100644
--- a/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1
+++ b/metadata/md5-cache/dev-python/pivy-0.5_alpha20110303-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/pivy-0.5_alpha20110303.tar.xz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=482ce08facf5ce97ec1fb36025b706f0
+_md5_=b9bbb4720a24474b933c4c93a1c81ab8
diff --git a/metadata/md5-cache/dev-python/pycountry-1.8 b/metadata/md5-cache/dev-python/pycountry-1.8
index 3c81fd20b70f..eee0f6aaa98c 100644
--- a/metadata/md5-cache/dev-python/pycountry-1.8
+++ b/metadata/md5-cache/dev-python/pycountry-1.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-1.8.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=ba575ef51353b0e54620cd4eed01603f
+_md5_=2d5dd4795f89c97996759519fd70d344
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3 b/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3
new file mode 100644
index 000000000000..eede1d662454
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-3.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Client library for Barbican API.
+EAPI=5
+HOMEPAGE=https://github.com/openstack/barbican
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cliff-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cliff-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-3.0.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=aaa19ee2892d640ac972ca57e54c1ad8
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0 b/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0
deleted file mode 100644
index 83cdc618025d..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Client Library for OpenStack Identity
-EAPI=5
-HOMEPAGE=http://www.openstack.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.3.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=b3f34b0602f9b76c3cb79e1988d84a25
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0-r1 b/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0-r1
new file mode 100644
index 000000000000..c662d4e45078
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-1.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/hacking-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/keyring-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/keyring-3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslotest-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.36[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/testtools-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.5.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempest-lib-0.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Client Library for OpenStack Identity
+EAPI=5
+HOMEPAGE=http://www.openstack.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~amd64-linux ~x86 ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/Babel-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-1.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-1.3.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=6808fce17b3798618881c39e75c49d87
diff --git a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2 b/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2
deleted file mode 100644
index 7678ce7c157c..000000000000
--- a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Adds backup-schedule extension support to python-novaclient
-EAPI=5
-HOMEPAGE=https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rax_backup_schedule_python_novaclient_ext/rax_backup_schedule_python_novaclient_ext-0.1.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=68ccf477a806e3086d6aa51ef4a78598
diff --git a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2-r1 b/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2-r1
deleted file mode 100644
index ac2fe0ec8ea2..000000000000
--- a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-0.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Adds backup-schedule extension support to python-novaclient
-EAPI=5
-HOMEPAGE=https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/r/rax_backup_schedule_python_novaclient_ext/rax_backup_schedule_python_novaclient_ext-0.1.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=d3ecf09334c1963dee087e4397dd9dbd
diff --git a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999
deleted file mode 100644
index 920c73e8ebf2..000000000000
--- a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
-DESCRIPTION=Disk Config extension for python-novaclient
-EAPI=5
-HOMEPAGE=https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext
-IUSE=python_targets_python2_7
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=2b99fff077bc06a68fcb1ddec0bf1fcc
diff --git a/metadata/md5-cache/dev-python/scrapy-0.24.2 b/metadata/md5-cache/dev-python/scrapy-0.24.2
index dec19850a53b..4a598a631f50 100644
--- a/metadata/md5-cache/dev-python/scrapy-0.24.2
+++ b/metadata/md5-cache/dev-python/scrapy-0.24.2
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( ssl boto ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/scrapy/scrapy/archive/0.24.2.tar.gz -> scrapy-0.24.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=f236ddc5cbcd423b0a917deb544f37a8
+_md5_=90476d92c691919320c2ba0daca1d73e
diff --git a/metadata/md5-cache/dev-python/scrapy-0.25.1 b/metadata/md5-cache/dev-python/scrapy-0.25.1
index ee11feee5f6d..8516d0c56db0 100644
--- a/metadata/md5-cache/dev-python/scrapy-0.25.1
+++ b/metadata/md5-cache/dev-python/scrapy-0.25.1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( ssl boto ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/scrapy/scrapy/archive/0.25.1.tar.gz -> scrapy-0.25.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=1d313cfe21dae15aa50ca02313ba1103
+_md5_=fcf85985862614cc19a7ddff4ba6645f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10 b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
index 72a4454eed53..ae32bb19b95e 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.7.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=6b75fa4209f946c6773cd486abce1f88
+_md5_=bfad7c56088b7b212820fcd5d5c6a786
diff --git a/metadata/md5-cache/dev-python/testtools-1.7.1 b/metadata/md5-cache/dev-python/testtools-1.7.1
index 3c8112f153b9..23104ba22410 100644
--- a/metadata/md5-cache/dev-python/testtools-1.7.1
+++ b/metadata/md5-cache/dev-python/testtools-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the Python standard library unit testing framework
 EAPI=5
 HOMEPAGE=https://github.com/testing-cabal/testtools
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~arm ~hppa
 LICENSE=MIT
 RDEPEND=dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/unittest2-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-1.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=fb92d4d3a96e04456bf46ef18d14e6e5
+_md5_=2c08408be001074c5628ca70fdfa6b73
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0 b/metadata/md5-cache/dev-python/traceback2-1.4.0
index 2eb43a268a88..e97705b0e2b3 100644
--- a/metadata/md5-cache/dev-python/traceback2-1.4.0
+++ b/metadata/md5-cache/dev-python/traceback2-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backports of the traceback module
 EAPI=5
 HOMEPAGE=https://github.com/testing-cabal/traceback2
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~arm ~hppa
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traceback2/traceback2-1.4.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=d3e505a938d2a9e06902b4b741781303
+_md5_=bfae0a5e2adc405c28aa4286c418b50a
diff --git a/metadata/md5-cache/dev-python/ujson-1.33 b/metadata/md5-cache/dev-python/ujson-1.33
index b55de339d351..a893772aa5e5 100644
--- a/metadata/md5-cache/dev-python/ujson-1.33
+++ b/metadata/md5-cache/dev-python/ujson-1.33
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.33.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=87f5c000a8fd9437ba290e5e70917cd8
+_md5_=94df8692d3b968d417ec874a9f9fa57c
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.17 b/metadata/md5-cache/dev-python/unidecode-0.04.17
index b4517672eda3..3ac601bce5a1 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.17
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.17
@@ -4,11 +4,11 @@ DESCRIPTION=Module providing ASCII transliterations of Unicode text
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Unidecode
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 ~arm hppa ppc sparc x86
+KEYWORDS=~alpha amd64 arm hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.17.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=86bef21b66e2adcbb819313b00e0d57e
+_md5_=b2c21e2f107eb4afaaa43efa81825e79
diff --git a/metadata/md5-cache/dev-python/unittest2-1.0.1 b/metadata/md5-cache/dev-python/unittest2-1.0.1
index b2daecc8e97e..fbb53fc9f045 100644
--- a/metadata/md5-cache/dev-python/unittest2-1.0.1
+++ b/metadata/md5-cache/dev-python/unittest2-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=The new features in unittest for Python 2.7 backported to Python 2.4
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/unittest2
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~arm ~hppa
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=3721d1d74cf8983448c8472b3d7e0bd1
+_md5_=ec0773857ff1873badacaed26b57c801
diff --git a/metadata/md5-cache/dev-python/yubiotp-0.2.1 b/metadata/md5-cache/dev-python/yubiotp-0.2.1
index d3109dcb4b64..b730dcbb3ab2 100644
--- a/metadata/md5-cache/dev-python/yubiotp-0.2.1
+++ b/metadata/md5-cache/dev-python/yubiotp-0.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/Y/YubiOTP/YubiOTP-0.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=175865ad90a5050068b8694d94a76a7a
+_md5_=29153263f996fce3e3076c90a8e57e72
diff --git a/metadata/md5-cache/dev-ruby/hashr-0.0.22 b/metadata/md5-cache/dev-ruby/hashr-0.0.22
index fc264ff8b848..bbbfd2d52fd3 100644
--- a/metadata/md5-cache/dev-ruby/hashr-0.0.22
+++ b/metadata/md5-cache/dev-ruby/hashr-0.0.22
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-0.0.22.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c53bf78fe9f441496fa744c7a38910b5
+_md5_=bd9a9a21d4b001849b00e937768cfaee
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
index d1b87ab47334..330ca639a1da 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A comprehensive and flexible logging library written in Ruby for use
 EAPI=5
 HOMEPAGE=http://log4r.sourceforge.net/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5b0d2cd1630c683a40f51dae39e1c457
+_md5_=eb0c0585433158a5fbe2cbdd8c7883ac
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
index 67719576bcc9..a8fd3a355faf 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.1.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bb45450c7b64a6bbd80b406793abb098
+_md5_=2406f0eb832b817c4d3d6ff738350f64
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index a593b9f26319..d5056cb56c2d 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=906808687ad5cdfd43ec8be9eb0e619e
+_md5_=81513d4c6291a9a2980c81257fd4050c
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
index 0d0afdabcf96..0dd77c91881a 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_t
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cfcce50aa43901a235e30d2e3508498b
+_md5_=ada8a6b5f913702793916cbe809e36b6
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
index 73c9399ca5ce..e6dd7dc3b60a 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_t
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.9.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e6fca61548973bbbd4472084e6a92c70
+_md5_=575a39b89aed1e49b5494ae22033fed3
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.0_rc2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.0_rc2
index 05310b9af541..5637e7121408 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.0_rc2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.0_rc2
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_t
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.0-rc2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7870683a4c58a945dc8b190be741349
+_md5_=b5fa68d9ce8c843f61f43c2eec28f182
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
index 52c2b316228b..874cf38b27e7 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.0.tar.gz -> sprockets-rails-2.2.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=57ac7a0ed24ba6afcb02cbb4ed0501a1
+_md5_=425555404a9dbd7969056ea16563a916
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
index fb5709017541..b636bd3bbac4 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.2.tar.gz -> sprockets-rails-2.2.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=210ab3dcea054425e6d95e6dc10d2519
+_md5_=c74dbcb88739d767187d8d0d1fbc2054
diff --git a/metadata/md5-cache/dev-tcltk/bwidget-1.9.7 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
index b5c8c850e739..3569514df662 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=5
 HOMEPAGE=http://tcllib.sourceforge.net/
 IUSE=doc test
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
 LICENSE=tcltk
 RDEPEND=dev-lang/tk
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/bwidget-1.9.7.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fec5f48d1ddcf9b01a058623a35844cb
+_md5_=744d815ed2871554d4b0713b6072f469
diff --git a/metadata/md5-cache/dev-util/cmocka-0.4.1 b/metadata/md5-cache/dev-util/cmocka-0.4.1
index b6a24d2ae0d9..b696e401cc16 100644
--- a/metadata/md5-cache/dev-util/cmocka-0.4.1
+++ b/metadata/md5-cache/dev-util/cmocka-0.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=A unit testing framework for C
 EAPI=5
 HOMEPAGE=http://cmocka.org/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/42/cmocka-0.4.1.tar.xz
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=f0fd97d717aa44359385c9049c5c9a0c
+_md5_=1a4be9fe30cf8680d2685577a0221930
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.67 b/metadata/md5-cache/dev-util/cppcheck-1.67
index 4ff16dad6eb7..3395352abfac 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.67
+++ b/metadata/md5-cache/dev-util/cppcheck-1.67
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.67.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=3a2da6ac6b52ba4f9f196c6aa2759875
+_md5_=cb89a325515b9dcf3b3591c26bef405f
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.68 b/metadata/md5-cache/dev-util/cppcheck-1.68
index d7a831323818..25d169976f8f 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.68
+++ b/metadata/md5-cache/dev-util/cppcheck-1.68
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.68.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=30ab9e9c51a625049eef3b7f999ce2d6
+_md5_=a0b13584e010f98b511beab4b1acd840
diff --git a/metadata/md5-cache/dev-util/intltool-0.50.2-r1 b/metadata/md5-cache/dev-util/intltool-0.50.2-r1
index d8a10def6f83..dcd4b52eaac1 100644
--- a/metadata/md5-cache/dev-util/intltool-0.50.2-r1
+++ b/metadata/md5-cache/dev-util/intltool-0.50.2-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=dc3dfb04c9d0df123419d49932ebcf0d
+_md5_=b4af2466aee063cf3a3c91613dcc98b5
diff --git a/metadata/md5-cache/dev-util/ninja-1.4.0 b/metadata/md5-cache/dev-util/ninja-1.4.0
index 2536c2347b24..4d68713b9f96 100644
--- a/metadata/md5-cache/dev-util/ninja-1.4.0
+++ b/metadata/md5-cache/dev-util/ninja-1.4.0
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/
 SLOT=0
 SRC_URI=https://github.com/martine/ninja/archive/v1.4.0.tar.gz -> ninja-1.4.0.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=6f38e36a09cb9a45154d3b6859cff8cb
+_md5_=99bea9ed6bcadff10b9896e86aeec60b
diff --git a/metadata/md5-cache/dev-util/ninja-1.5.1 b/metadata/md5-cache/dev-util/ninja-1.5.1
index b6df1fbb4c8e..c4b34ecbf2b1 100644
--- a/metadata/md5-cache/dev-util/ninja-1.5.1
+++ b/metadata/md5-cache/dev-util/ninja-1.5.1
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/
 SLOT=0
 SRC_URI=https://github.com/martine/ninja/archive/v1.5.1.tar.gz -> ninja-1.5.1.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=386193d30f6001391a2136223ad74bfc
+_md5_=913f36a1c932f56485fdc051103729c2
diff --git a/metadata/md5-cache/dev-util/ninja-1.5.3 b/metadata/md5-cache/dev-util/ninja-1.5.3
index b8295c70b96f..15756ab073d5 100644
--- a/metadata/md5-cache/dev-util/ninja-1.5.3
+++ b/metadata/md5-cache/dev-util/ninja-1.5.3
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/
 SLOT=0
 SRC_URI=https://github.com/martine/ninja/archive/v1.5.3.tar.gz -> ninja-1.5.3.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=6f648e0e33e3dab280a99f3fcb1aa033
+_md5_=8eb223b3d3848a0b1ccd614a41094b18
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
new file mode 100644
index 000000000000..c25034215d6d
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
+DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
+EAPI=5
+HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary
+IUSE=tools vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.4.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=49fca7a92455a1d5216d7db7c0a1df36
diff --git a/metadata/md5-cache/games-fps/quake4-bin-1.3.2 b/metadata/md5-cache/games-fps/quake4-bin-1.3.2
deleted file mode 100644
index 60a604d2476e..000000000000
--- a/metadata/md5-cache/games-fps/quake4-bin-1.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DESCRIPTION=Sequel to Quake 2, an id Software 3D first-person shooter
-HOMEPAGE=http://www.quake4game.com/
-IUSE=alsa cdinstall dedicated opengl
-KEYWORDS=-* amd64 x86
-LICENSE=QUAKE4
-RDEPEND=sys-libs/glibc dedicated? ( app-misc/screen ) amd64? ( app-emulation/emul-linux-x86-baselibs ) opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl ) amd64? ( app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) alsa? ( >=media-libs/alsa-lib-1.0.6 ) ) cdinstall? ( games-fps/quake4-data ) !dedicated? ( !opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl ) amd64? ( app-emulation/emul-linux-x86-sdl app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) alsa? ( >=media-libs/alsa-lib-1.0.6 ) ) ) games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://idsoftware/quake4/linux/quake4-linux-1.3-2.x86.run
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cbaf2d4ef9b031cf491ef357fa0aa580
diff --git a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1 b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
index b4387e2f6e5a..1b0cc4a7120a 100644
--- a/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
+++ b/metadata/md5-cache/games-fps/quake4-bin-1.4.2-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Sequel to Quake 2, an id Software 3D first-person shooter
 EAPI=5
 HOMEPAGE=http://www.quake4game.com/
 IUSE=cdinstall dedicated linguas_cs linguas_fr linguas_it linguas_pl linguas_ru
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=QUAKE4
 RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) || ( sys-libs/zlib[abi_x86_32(-)] app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) ) ) cdinstall? ( games-fps/quake4-data ) games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/linux/quake4-linux-1.4.2.x86.run
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ba8fcfd579da1e5bf74a8a9672353c08
+_md5_=adce3efd40b0b2fc41c6fb1737bb828c
diff --git a/metadata/md5-cache/games-util/joystick-1.4.4 b/metadata/md5-cache/games-util/joystick-1.4.4
deleted file mode 100644
index 14517cad792b..000000000000
--- a/metadata/md5-cache/games-util/joystick-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
-DESCRIPTION=joystick testing utilities
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
-IUSE=sdl
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.4.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=cc777e9762b9da96bdef98393ad355fc
diff --git a/metadata/md5-cache/games-util/joystick-1.4.8 b/metadata/md5-cache/games-util/joystick-1.4.8
index e2a06c89e163..b00e022fbd96 100644
--- a/metadata/md5-cache/games-util/joystick-1.4.8
+++ b/metadata/md5-cache/games-util/joystick-1.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=joystick testing utilities
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
 IUSE=sdl
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.4.8.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=9ceb330f30e3b6300c15cfbbe7cb8355
+_md5_=6af04c4c239155bb697e3fead7e7a41c
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
index fb87af3ef8dd..1a2467b8f020 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.15/+download/zeitgeist-0.9.15.tar.xz http://dev.gentoo.org/~eva/distfiles/zeitgeist/zeitgeist-0.9.15.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=13b75df6c4b04fe5d10c955b4b38ae95
+_md5_=b88120974e0de5fcc6bf853741051126
diff --git a/metadata/md5-cache/kde-base/kde-l10n-4.14.3 b/metadata/md5-cache/kde-base/kde-l10n-4.14.3
index 36088d3b4ca4..a4f1a2677432 100644
--- a/metadata/md5-cache/kde-base/kde-l10n-4.14.3
+++ b/metadata/md5-cache/kde-base/kde-l10n-4.14.3
@@ -3,11 +3,11 @@ DEPEND=sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=KDE internationalization package
 EAPI=5
 HOMEPAGE=http://l10n.kde.org
-IUSE=linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_lv linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
+IUSE=minimal linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_lv linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW +handbook aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<kde-base/konq-plugins-4.6 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
 SLOT=4/4.14
 SRC_URI=linguas_ar? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ar-4.14.3.tar.xz ) linguas_bg? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-bg-4.14.3.tar.xz ) linguas_bs? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-bs-4.14.3.tar.xz ) linguas_ca? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ca-4.14.3.tar.xz ) linguas_ca@valencia? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ca@valencia-4.14.3.tar.xz ) linguas_cs? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-cs-4.14.3.tar.xz ) linguas_da? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-da-4.14.3.tar.xz ) linguas_de? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-de-4.14.3.tar.xz ) linguas_el? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-el-4.14.3.tar.xz ) linguas_en_GB? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-en_GB-4.14.3.tar.xz ) linguas_es? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-es-4.14.3.tar.xz ) linguas_et? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-et-4.14.3.tar.xz ) linguas_eu? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-eu-4.14.3.tar.xz ) linguas_fa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fa-4.14.3.tar.xz ) linguas_fi? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fi-4.14.3.tar.xz ) linguas_fr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-fr-4.14.3.tar.xz ) linguas_ga? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ga-4.14.3.tar.xz ) linguas_gl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-gl-4.14.3.tar.xz ) linguas_he? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-he-4.14.3.tar.xz ) linguas_hi? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hi-4.14.3.tar.xz ) linguas_hr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hr-4.14.3.tar.xz ) linguas_hu? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-hu-4.14.3.tar.xz ) linguas_ia? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ia-4.14.3.tar.xz ) linguas_id? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-id-4.14.3.tar.xz ) linguas_is? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-is-4.14.3.tar.xz ) linguas_it? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-it-4.14.3.tar.xz ) linguas_ja? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ja-4.14.3.tar.xz ) linguas_kk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-kk-4.14.3.tar.xz ) linguas_km? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-km-4.14.3.tar.xz ) linguas_ko? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ko-4.14.3.tar.xz ) linguas_lt? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-lt-4.14.3.tar.xz ) linguas_lv? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-lv-4.14.3.tar.xz ) linguas_mr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-mr-4.14.3.tar.xz ) linguas_nb? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nb-4.14.3.tar.xz ) linguas_nds? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nds-4.14.3.tar.xz ) linguas_nl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nl-4.14.3.tar.xz ) linguas_nn? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-nn-4.14.3.tar.xz ) linguas_pa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pa-4.14.3.tar.xz ) linguas_pl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pl-4.14.3.tar.xz ) linguas_pt? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pt-4.14.3.tar.xz ) linguas_pt_BR? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-pt_BR-4.14.3.tar.xz ) linguas_ro? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ro-4.14.3.tar.xz ) linguas_ru? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ru-4.14.3.tar.xz ) linguas_sk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sk-4.14.3.tar.xz ) linguas_sl? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sl-4.14.3.tar.xz ) linguas_sr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sr-4.14.3.tar.xz ) linguas_sv? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-sv-4.14.3.tar.xz ) linguas_tr? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-tr-4.14.3.tar.xz ) linguas_ug? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-ug-4.14.3.tar.xz ) linguas_uk? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-uk-4.14.3.tar.xz ) linguas_wa? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-wa-4.14.3.tar.xz ) linguas_zh_CN? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-zh_CN-4.14.3.tar.xz ) linguas_zh_TW? ( mirror://kde/stable/4.14.3/src/kde-l10n/kde-l10n-zh_TW-4.14.3.tar.xz )
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b69718c0290bf8e193ee608c29844a90
+_md5_=0f90bbdaa49c6dce007740a70b7391e7
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.11.14 b/metadata/md5-cache/kde-base/kinfocenter-4.11.14
index d4948c3aa5c9..2727c28e02b1 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.11.14
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.11.14
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) open
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/4.14.3/src/kde-workspace-4.11.14.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7fc47cec5ea43b5dab2c43f320f85ee4
+_md5_=84838981f61392bf7c38da447dd7eeb9
diff --git a/metadata/md5-cache/kde-base/kinfocenter-4.11.17 b/metadata/md5-cache/kde-base/kinfocenter-4.11.17
index 4c8ad8184e96..add8ab4b0907 100644
--- a/metadata/md5-cache/kde-base/kinfocenter-4.11.17
+++ b/metadata/md5-cache/kde-base/kinfocenter-4.11.17
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/pciutils x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) open
 SLOT=4/4.11
 SRC_URI=mirror://kde/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=942dfbb62724045e4fea06c1c8c8e3bc
+_md5_=333cfcb2b628de27501ac2769dfa6807
diff --git a/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1 b/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
index ac6ec4c15986..6444f56af690 100644
--- a/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
+++ b/metadata/md5-cache/kde-misc/plasma-emergelog-0.0.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kd
 SLOT=4
 SRC_URI=http://dev.gentooexperimental.org/~hwoarang/projects/plasma-emergelog/plasma-emergelog-0.0.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=91feea999ed0a39f8cfee88d0e7cfe97
+_md5_=e8f05a82c2f62b3c768bc37b29d7f3fa
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.8.0 b/metadata/md5-cache/mate-base/mate-menus-1.8.0
index b1b373d3f93f..20afed4ecf2e 100644
--- a/metadata/md5-cache/mate-base/mate-menus-1.8.0
+++ b/metadata/md5-cache/mate-base/mate-menus-1.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-menus-1.8.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b82f8d6662eba82d38b5f8d2fe1c59bf
+_md5_=8c514c0317c387b27acf737ad90bd1d7
diff --git a/metadata/md5-cache/media-gfx/assimp-3.0.1270 b/metadata/md5-cache/media-gfx/assimp-3.0.1270
index a6ed1935171c..eeeb091992c5 100644
--- a/metadata/md5-cache/media-gfx/assimp-3.0.1270
+++ b/metadata/md5-cache/media-gfx/assimp-3.0.1270
@@ -10,4 +10,4 @@ RDEPEND=boost? ( dev-libs/boost ) samples? ( x11-libs/libX11 virtual/opengl medi
 SLOT=0
 SRC_URI=mirror://sourceforge/assimp/assimp--3.0.1270-source-only.zip
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37692a0cd4d7ff09e7db66c58caf9ff3
+_md5_=c4c663f7c3a3dadf601f732e7a395f9a
diff --git a/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1 b/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
index cea62c5c96f9..84b7db169e21 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
+++ b/metadata/md5-cache/media-gfx/freecad-0.13.1830-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/free-cad/freecad-0.13.1830.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=5837a9ccb182adade6d3f05dd9ec09cc
+_md5_=0fde93f01fd2ea91b25b50bbb370e813
diff --git a/metadata/md5-cache/media-gfx/freecad-0.14.3702 b/metadata/md5-cache/media-gfx/freecad-0.14.3702
index 69274d74226a..005fc1795a9d 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.14.3702
+++ b/metadata/md5-cache/media-gfx/freecad-0.14.3702
@@ -10,4 +10,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/free-cad/freecad-0.14.3702.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=7702bbfaae429902e7dc46a3c974d837
+_md5_=a1f4c12cf5fdcdcba24be3438ff23fea
diff --git a/metadata/md5-cache/media-gfx/freecad-0.14.3702-r1 b/metadata/md5-cache/media-gfx/freecad-0.14.3702-r1
index e31bd2756230..f1444181d8f9 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.14.3702-r1
+++ b/metadata/md5-cache/media-gfx/freecad-0.14.3702-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/free-cad/freecad-0.14.3702.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=086840462232a66f87a923aaa269d7d8
+_md5_=6f94bf7d2ed97c64fe797472887d266a
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index 79cf4ff1d78c..5b6fab9a22ac 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-cpp/eigen:3 dev-games/ode dev-libs/boost dev-libs/libf2c dev-libs/li
 RESTRICT=bindist mirror
 SLOT=0
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=811dd02d9d2b57ee0c6daec413c04841
+_md5_=896a6e1b115da8f7d8410b3783b09084
diff --git a/metadata/md5-cache/media-gfx/freepv-0.3.0-r3 b/metadata/md5-cache/media-gfx/freepv-0.3.0-r3
deleted file mode 100644
index ee465d3cc7a9..000000000000
--- a/metadata/md5-cache/media-gfx/freepv-0.3.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 media-libs/libpng media-libs/freeglut sys-libs/zlib virtual/jpeg x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)
-EAPI=2
-HOMEPAGE=http://freepv.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 media-libs/libpng media-libs/freeglut sys-libs/zlib virtual/jpeg x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=mirror://sourceforge/freepv/freepv-0.3.0.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=c196e904aaef73450e513e8efe3c8827
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.2.7 b/metadata/md5-cache/media-gfx/gthumb-3.2.7
index 98147ebdd307..7d3a0e7b4368 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.2.7
+++ b/metadata/md5-cache/media-gfx/gthumb-3.2.7
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sy
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.2/gthumb-3.2.7.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=44fe4b6a4e40ac854848b6b10e85ecf0
+_md5_=a25a611e4e90deac48161f34566b296c
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.2.8 b/metadata/md5-cache/media-gfx/gthumb-3.2.8
index 3e35e8993b54..4193ffb8f5b4 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.2.8
+++ b/metadata/md5-cache/media-gfx/gthumb-3.2.8
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.34.0:2 >=x11-libs/gtk+-3.4.0:3 media-libs/libpng:0= sy
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.2/gthumb-3.2.8.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6bac7ea99ddfff49079c5d6ec987f5c3
+_md5_=b9dcddfc13d0175a5e01ae3d4c094f4b
diff --git a/metadata/md5-cache/media-libs/celt-0.11.1-r1 b/metadata/md5-cache/media-libs/celt-0.11.1-r1
index a14c5ea5823a..db945eedb255 100644
--- a/metadata/md5-cache/media-libs/celt-0.11.1-r1
+++ b/metadata/md5-cache/media-libs/celt-0.11.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=CELT is a very low delay audio codec designed for high-quality commu
 EAPI=5
 HOMEPAGE=http://www.celt-codec.org/
 IUSE=ogg static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.11.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=ce80fe64e86408b652cfacd7c9510216
+_md5_=038c44488df3344cac0f344f2f52ad13
diff --git a/metadata/md5-cache/media-libs/freeimage-3.15.4 b/metadata/md5-cache/media-libs/freeimage-3.15.4
index 9ee54b0cb819..1f46b05ca295 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.15.4
+++ b/metadata/md5-cache/media-libs/freeimage-3.15.4
@@ -4,10 +4,10 @@ DESCRIPTION=Image library supporting many formats
 EAPI=4
 HOMEPAGE=http://freeimage.sourceforge.net/
 IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 FIPL-1.0 )
 RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg:0 ) mng? ( media-libs/libmng ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libraw ) tiff? ( media-libs/ilmbase media-libs/tiff )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeimage/FreeImage3154.zip mirror://sourceforge/freeimage/FreeImage3154.pdf http://dev.gentoo.org/~gienah/2big4tree/media-libs/freeimage/freeimage-3.15.4-libjpeg-turbo.patch.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=3402cd97705731a3a5b40f4830b1b0ad
+_md5_=ad581893a8f795851ea933d82d27e754
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r2 b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
index e6accd84c694..5e9f2eb95121 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r2
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.
 SLOT=0
 SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e2d32f1511fdab6928f7cc0fa8b32de3
+_md5_=2a4802cf7f5dad73bb0a736d5e0235e5
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index ef13bdfd7b4e..0d2fe5a10986 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vala	a41415fe361172827ed11b6a32ee38fb
-_md5_=f7bc2efaf0f6beea6b7159886371dcf3
+_md5_=227b6f03092502d04e9a01f5d4c47460
diff --git a/metadata/md5-cache/media-libs/libmkv-0.6.5.1 b/metadata/md5-cache/media-libs/libmkv-0.6.5.1
index 8c92d208d22e..8dca8f459197 100644
--- a/metadata/md5-cache/media-libs/libmkv-0.6.5.1
+++ b/metadata/md5-cache/media-libs/libmkv-0.6.5.1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/saintdev/libmkv/archive/0.6.5.1.tar.gz -> libmkv-0.6.5.1.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=81ce58301c12418026dea7800c2c9a8f
+_md5_=43b5a56fdaf595cf7447e9979d4bac68
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200 b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
index d9557cdec9c7..40e16fde9ac0 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=5
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa x86
+KEYWORDS=~alpha amd64 arm ~hppa x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=06deb446007019009c4b76c952bb6370
+_md5_=218017954180dde3aa5cd29177654f38
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
new file mode 100644
index 000000000000..57f8140c0d56
--- /dev/null
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Unofficial taglib plugins maintained by the Amarok team
+EAPI=5
+HOMEPAGE=http://developer.kde.org/~wheeler/taglib.html
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/taglib-1.6
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~kensington/distfiles/taglib-extras-1.0.1.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=17768eb149743740228a3d6beaa71816
diff --git a/metadata/md5-cache/media-libs/x265-1.5 b/metadata/md5-cache/media-libs/x265-1.5
index 30742e1df08b..f7333d25a3d6 100644
--- a/metadata/md5-cache/media-libs/x265-1.5
+++ b/metadata/md5-cache/media-libs/x265-1.5
@@ -4,9 +4,9 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=~amd64 ~arm hppa ~x86
 LICENSE=GPL-2
 SLOT=0/43
 SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.5.tar.bz2 -> x265-1.5.tar.bz2
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=917e65b7b417f7c41535ea1066d07103
+_md5_=663943e1c2eee6245c5d6d629e825b36
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1 b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
index 4690f61e2f2a..c60fab2cdeed 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
@@ -4,10 +4,10 @@ DESCRIPTION=VBI Decoding Library for Zapping
 EAPI=5
 HOMEPAGE=http://zapping.sourceforge.net
 IUSE=doc dvb nls static-libs v4l X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=media-libs/libpng-1.5.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=7ab116f1496c2e5891e2d70ee4a2099d
+_md5_=1a7600db3e9df2db03cdd117ec492fd1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
index ad539e39f1f2..a61aa78d06ab 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/gstreamer-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.2.4.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=c109a77e74233f089fe29ee8e708601a
+_md5_=2d8e25ae195e466bce693205eeb32ccc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
index 56fba22fe2fb..22e79a595282 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/gstreamer-1.2.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.2.4.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=962b21e281cd0c838d3a8e8991663a89
+_md5_=4b50449ab7a2d9315a05ae220112c968
diff --git a/metadata/md5-cache/media-sound/cantata-1.5.1 b/metadata/md5-cache/media-sound/cantata-1.5.1
index 4ac0a9dc3341..270f24849755 100644
--- a/metadata/md5-cache/media-sound/cantata-1.5.1
+++ b/metadata/md5-cache/media-sound/cantata-1.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/qjson sys-libs/zlib x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) kde? ( >=kde-base/kwalletd-4.4:4[aqua=] ) lame? ( media-sound/lame ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) replaygain? ( media-sound/mpg123 virtual/ffmpeg ) taglib? ( media-libs/taglib[asf,mp4] media-libs/taglib-extras !kde? ( udisks? ( sys-fs/udisks:2 ) ) ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+DEPEND=sys-libs/zlib x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) kde? ( >=kde-base/kwalletd-4.4:4[aqua=] ) lame? ( media-sound/lame ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) !qt5? ( dev-libs/qjson dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) replaygain? ( media-sound/mpg123 virtual/ffmpeg ) taglib? ( media-libs/taglib[asf,mp4] media-libs/taglib-extras !kde? ( udisks? ( sys-fs/udisks:2 ) ) ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 DESCRIPTION=Featureful and configurable Qt client for the music player daemon (MPD)
 EAPI=5
 HOMEPAGE=https://code.google.com/p/cantata/
 IUSE=cddb cdda dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib udisks aqua kde linguas_cs linguas_de linguas_en_GB linguas_es linguas_hu linguas_ko linguas_pl linguas_ru linguas_zh_CN
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/qjson sys-libs/zlib x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) kde? ( >=kde-base/kwalletd-4.4:4[aqua=] ) lame? ( media-sound/lame ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) replaygain? ( media-sound/mpg123 virtual/ffmpeg ) taglib? ( media-libs/taglib[asf,mp4] media-libs/taglib-extras !kde? ( udisks? ( sys-fs/udisks:2 ) ) ) dynamic? ( dev-lang/perl[ithreads] dev-perl/URI ) kde? ( || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=sys-libs/zlib x11-libs/libX11 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) kde? ( >=kde-base/kwalletd-4.4:4[aqua=] ) lame? ( media-sound/lame ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) !qt5? ( dev-libs/qjson dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) replaygain? ( media-sound/mpg123 virtual/ffmpeg ) taglib? ( media-libs/taglib[asf,mp4] media-libs/taglib-extras !kde? ( udisks? ( sys-fs/udisks:2 ) ) ) dynamic? ( dev-lang/perl[ithreads] dev-perl/URI ) kde? ( || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=cddb? ( cdda taglib ) cdda? ( udisks || ( cddb musicbrainz ) ) lame? ( cdda taglib ) mtp? ( taglib udisks ) musicbrainz? ( cdda taglib ) online-services? ( taglib ) qt5? ( !kde ) replaygain? ( taglib )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8 -> cantata-1.5.1.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	aa25bcf03b20901fed4c6e77ab741282	kde4-functions	99e770658f27aaf2c8a5850af7598b18	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d2b936ee9f7cb2fbd0e1db35c0b37e24
+_md5_=2ad78658956c4f9d5aa66839c0fa548b
diff --git a/metadata/md5-cache/media-sound/gbsplay-0.0.91-r1 b/metadata/md5-cache/media-sound/gbsplay-0.0.91-r1
index baf4b5c180ae..e9bea75449f4 100644
--- a/metadata/md5-cache/media-sound/gbsplay-0.0.91-r1
+++ b/metadata/md5-cache/media-sound/gbsplay-0.0.91-r1
@@ -10,4 +10,4 @@ RDEPEND=alsa? ( media-libs/alsa-lib:0 ) nas? ( media-libs/nas:0 )
 SLOT=0
 SRC_URI=mirror://berlios/gbsplay/gbsplay-0.0.91.tar.gz
 _eclasses_=l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=49cd93236ef41e822439b98303b3ab3e
+_md5_=3a1951c5ba5f47f89004ecc4e49c4980
diff --git a/metadata/md5-cache/media-sound/qpitch-1.0.1-r1 b/metadata/md5-cache/media-sound/qpitch-1.0.1-r1
new file mode 100644
index 000000000000..a638f33cf54d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qpitch-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=media-libs/portaudio-19_pre20071207 >=sci-libs/fftw-3.1.0 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A program to tune musical instruments using Qt4
+EAPI=5
+HOMEPAGE=http://wspinell.altervista.org/qpitch/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=media-libs/portaudio-19_pre20071207 >=sci-libs/fftw-3.1.0
+SLOT=0
+SRC_URI=http://download.gna.org/qpitch/releases/qpitch-1.0.1.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=d2f4efa3f5bdc2d59dc2cb1bd66fbfeb
diff --git a/metadata/md5-cache/media-sound/spotify-0.9.17.1 b/metadata/md5-cache/media-sound/spotify-0.9.17.1-r1
similarity index 57%
rename from metadata/md5-cache/media-sound/spotify-0.9.17.1
rename to metadata/md5-cache/media-sound/spotify-0.9.17.1-r1
index e2fe30e0657d..1d451715fd17 100644
--- a/metadata/md5-cache/media-sound/spotify-0.9.17.1
+++ b/metadata/md5-cache/media-sound/spotify-0.9.17.1-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
 IUSE=gnome pax_kernel pulseaudio
 KEYWORDS=~amd64
 LICENSE=Spotify
-RDEPEND=x11-libs/libxcb x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXinerama x11-libs/libXdmcp x11-libs/libXScrnSaver x11-libs/libXrandr x11-libs/libXrender dev-qt/qtcore:4[qt3support,glib] dev-qt/qtdbus:4 dev-qt/qtgui:4[qt3support,glib] dev-qt/qtwebkit:4 x11-misc/xdg-utils media-libs/alsa-lib media-libs/fontconfig media-libs/freetype dev-libs/openssl:0 dev-libs/glib:2 || ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 ) media-libs/libpng:0 dev-db/sqlite:3 sys-libs/zlib app-arch/bzip2 sys-apps/dbus[X] x11-libs/pango[X] sys-apps/util-linux dev-libs/expat >=dev-libs/nspr-4.9 gnome-base/gconf:2 x11-libs/gtk+:2 dev-libs/nss dev-libs/glib:2 net-print/cups virtual/udev pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) gnome? ( gnome-extra/gnome-integration-spotify )
+RDEPEND=x11-libs/libxcb x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXinerama x11-libs/libXdmcp x11-libs/libXScrnSaver x11-libs/libXrandr x11-libs/libXrender dev-qt/qtcore:4[glib] dev-qt/qtdbus:4 dev-qt/qtgui:4[glib] dev-qt/qtwebkit:4 x11-misc/xdg-utils media-libs/alsa-lib media-libs/fontconfig media-libs/freetype dev-libs/openssl:0 dev-libs/glib:2 || ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 ) media-libs/libpng:0 dev-db/sqlite:3 sys-libs/zlib app-arch/bzip2 sys-apps/dbus[X] x11-libs/pango[X] sys-apps/util-linux dev-libs/expat >=dev-libs/nspr-4.9 gnome-base/gconf:2 x11-libs/gtk+:2 dev-libs/nss dev-libs/glib:2 net-print/cups virtual/udev pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) gnome? ( gnome-extra/gnome-integration-spotify )
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=472936a8474a20173a2dd68c89af3682
+_md5_=92434afd6b09e119fc4fffba14d72d10
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20100223-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20100223-r1
index e93d165f9319..9db5bc2f8ea3 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20100223-r1
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20100223-r1
@@ -10,4 +10,4 @@ RDEPEND=alevt? ( !media-video/alevt media-libs/libpng media-libs/zvbi[v4l] sys-l
 SLOT=0
 SRC_URI=mirror://gentoo/linuxtv-dvb-apps-1.1.1.20100223.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=22a0e956cbfe9df158b9eb986c14be53
+_md5_=1a8e39177ff88e2698448553fc3d39d7
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.2.14 b/metadata/md5-cache/media-video/ffmpeg-2.2.14
index 86a67cafe5d8..e800e588d74b 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.2.14
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.14
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=5
 HOMEPAGE=http://ffmpeg.org/
 IUSE=aac aacplus alsa amr amrenc bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi armv5te armv6 armv6t2 neon armvfp mips32r2 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4 ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart !media-libs/libpostproc abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
@@ -12,4 +12,4 @@ RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0/52.55.55
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.2.14.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=54fc6939ba75ae3ead28b32591d90714
+_md5_=d83fd4017bb45ffe6968b718b02469ad
diff --git a/metadata/md5-cache/media-video/handbrake-0.9.9-r1 b/metadata/md5-cache/media-video/handbrake-0.9.9-r1
index 87ba08d329a7..89e0a162af3f 100644
--- a/metadata/md5-cache/media-video/handbrake-0.9.9-r1
+++ b/metadata/md5-cache/media-video/handbrake-0.9.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=!ffmpeg? ( gstreamer )
 SLOT=0
 SRC_URI=http://handbrake.fr/rotation.php?file=HandBrake-0.9.9.tar.bz2 -> handbrake-0.9.9.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=2d27eb9f72bac70db8911f388d91cc7f
+_md5_=278820f1e7d255552f7709ab47d97e48
diff --git a/metadata/md5-cache/media-video/libav-11.9999 b/metadata/md5-cache/media-video/libav-11.9999
index 5ec7a32f30c6..7d4002d7d784 100644
--- a/metadata/md5-cache/media-video/libav-11.9999
+++ b/metadata/md5-cache/media-video/libav-11.9999
@@ -11,4 +11,4 @@ RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/11
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=3ee26369f8d5550eaa6044cbd5c0065b
+_md5_=697712d9fabcaba924ebf0b91983201c
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index 81821b0e823e..286f3383e5f6 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/12
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=2b46ee08608fc76a1c1465bc9a80b48c
+_md5_=ec66b148bfb1d15905e09c8bbd6f9f2a
diff --git a/metadata/md5-cache/media-video/lsdvd-0.17 b/metadata/md5-cache/media-video/lsdvd-0.17
index 5c1d88b6a046..b39034ea5749 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.17
+++ b/metadata/md5-cache/media-video/lsdvd-0.17
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libdvdread
 SLOT=0
 SRC_URI=mirror://sourceforge/lsdvd/lsdvd-0.17.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=4d1ed3b77b3f1c61829daa2feb38d019
+_md5_=95c52b8d473f4420bcc3dcc4c0d61e80
diff --git a/metadata/md5-cache/net-analyzer/arping-2.15 b/metadata/md5-cache/net-analyzer/arping-2.15
index 1456b5860081..7677baa9b58d 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.15
+++ b/metadata/md5-cache/net-analyzer/arping-2.15
@@ -3,9 +3,9 @@ DEPEND=net-libs/libpcap net-libs/libnet:1.1
 DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
 EAPI=5
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.15.tar.gz
-_md5_=6092ef354b029a12667f96415e27906f
+_md5_=0028c995b2dfa198f20cf1bfeaa8b289
diff --git a/metadata/md5-cache/net-analyzer/fe3d-0.11.2 b/metadata/md5-cache/net-analyzer/fe3d-0.11.2
index bc80ca407048..0b5e5f93dd79 100644
--- a/metadata/md5-cache/net-analyzer/fe3d-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fe3d-0.11.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/xerces-c-2.7 net-analyzer/nmap x11-libs/wxGTK:2.8[opengl]
 SLOT=0
 SRC_URI=mirror://sourceforge/fe3d/fe3d_0.11.2-src.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=65c81077c67d8868ad593f9abc0a05c3
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_md5_=f8fe47230ce4722d6aa87920c197da21
diff --git a/metadata/md5-cache/net-analyzer/mate-netspeed-1.8.0 b/metadata/md5-cache/net-analyzer/mate-netspeed-1.8.0
index c62dfeda244a..8925d2cb77d3 100644
--- a/metadata/md5-cache/net-analyzer/mate-netspeed-1.8.0
+++ b/metadata/md5-cache/net-analyzer/mate-netspeed-1.8.0
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 >=gnome-base/libgtop-2.14.2:2 >=mate-base/mate-panel-1.8
 SLOT=0
 SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-netspeed-1.8.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	c77a2c791ae15742c3c796344e279142	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f2947ea8cc694e123524935476e39a23
+_md5_=9c1db5f4332d11d36aaa2b0dac8a128c
diff --git a/metadata/md5-cache/net-dns/validns-0.7 b/metadata/md5-cache/net-dns/validns-0.7
index 434ca3983a77..b18b0fd28b43 100644
--- a/metadata/md5-cache/net-dns/validns-0.7
+++ b/metadata/md5-cache/net-dns/validns-0.7
@@ -3,9 +3,10 @@ DEPEND=dev-libs/judy test? ( dev-perl/Test-Command-Simple )
 DESCRIPTION=A high performance DNS/DNSSEC zone validator
 EAPI=4
 HOMEPAGE=http://www.validns.net/
+IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/judy
 SLOT=0
 SRC_URI=http://www.validns.net/download/validns-0.7.tar.gz
-_md5_=612d07555016d79c549991fc2d21a29b
+_md5_=5df0caed0120d03e0661868be347ee63
diff --git a/metadata/md5-cache/net-dns/validns-0.8 b/metadata/md5-cache/net-dns/validns-0.8
index d0af78a81511..87fe2cde0645 100644
--- a/metadata/md5-cache/net-dns/validns-0.8
+++ b/metadata/md5-cache/net-dns/validns-0.8
@@ -3,9 +3,10 @@ DEPEND=dev-libs/judy test? ( dev-perl/Test-Command-Simple )
 DESCRIPTION=A high performance DNS/DNSSEC zone validator
 EAPI=4
 HOMEPAGE=http://www.validns.net/
+IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/judy
 SLOT=0
 SRC_URI=http://www.validns.net/download/validns-0.8.tar.gz
-_md5_=ae62d230ffb606f994dc9a8b8d5d4374
+_md5_=932a00a48a9732ad5b5b480848a0d9c6
diff --git a/metadata/md5-cache/net-libs/iojs-1.5.1 b/metadata/md5-cache/net-libs/iojs-1.5.1
index 40d49ae14f0b..cf6762be5152 100644
--- a/metadata/md5-cache/net-libs/iojs-1.5.1
+++ b/metadata/md5-cache/net-libs/iojs-1.5.1
@@ -10,4 +10,4 @@ RDEPEND=!!net-libs/nodejs >=dev-libs/openssl-1.0.1j[-bindist] <dev-libs/openssl-
 SLOT=0
 SRC_URI=http://iojs.org/dist/v1.5.1/iojs-v1.5.1.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=2e97ff92db9a7194dbabdffce4f911b2
+_md5_=5931236a38a7eef950f92812482e4d6d
diff --git a/metadata/md5-cache/net-libs/iojs-1.6.3-r1 b/metadata/md5-cache/net-libs/iojs-1.6.3-r1
index 0bd30c084646..e90f0afebaa6 100644
--- a/metadata/md5-cache/net-libs/iojs-1.6.3-r1
+++ b/metadata/md5-cache/net-libs/iojs-1.6.3-r1
@@ -10,4 +10,4 @@ RDEPEND=icu? ( dev-libs/icu ) !bundled-libs? ( >=net-libs/http-parser-2.3 >=dev-
 SLOT=0
 SRC_URI=http://iojs.org/dist/v1.6.3/iojs-v1.6.3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=cd8903405caaaa009cf3256f8089a078
+_md5_=f11bef86dd3a050078a78f585ce64177
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.4 b/metadata/md5-cache/net-libs/libssh-0.6.4
index bae094c3926f..aceb6a0ea14b 100644
--- a/metadata/md5-cache/net-libs/libssh-0.6.4
+++ b/metadata/md5-cache/net-libs/libssh-0.6.4
@@ -4,10 +4,10 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=5
 HOMEPAGE=http://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/107/libssh-0.6.4.tar.gz -> libssh-0.6.4.tar.gz http://git.libssh.org/projects/libssh.git/patch/?id=3880a8ed80a4b1e2c052bd62f328bba2f869d5ae -> libssh-0.6.4-libgcrypt_build_fix.patch
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=25263979a67ceb9aabbc103bcd3438f1
+_md5_=cdd4cd5283a51f83c25f4ce6c2460ef3
diff --git a/metadata/md5-cache/net-misc/nxplayer-4.5.0.1 b/metadata/md5-cache/net-misc/nxplayer-4.5.0.1
new file mode 100644
index 000000000000..4015d1484a6c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nxplayer-4.5.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Client for NoMachine remote servers
+EAPI=5
+HOMEPAGE=http://www.nomachine.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=nomachine
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:0
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://download.nomachine.com/download/4.5/Linux/nomachine-enterprise-client_4.5.0_1_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/4.5/Linux/nomachine-enterprise-client_4.5.0_1_i686.tar.gz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ce0a0e5281257dc816569ac2d0eb104b
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
index 0a9e8182f986..91985bc475a9 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
 IUSE=dbus doc gstreamer gtk3 +introspection policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav )
 REQUIRED_USE=python_targets_python2_7 ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.25.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vala	a41415fe361172827ed11b6a32ee38fb
-_md5_=35182fab7615fe938221152aa9d78254
+_md5_=36007cf9b09f8c450a23097b45598ddc
diff --git a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1 b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
index bbfae56c3baf..d84ba5e384c8 100644
--- a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
+++ b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
@@ -9,4 +9,4 @@ RDEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://github/atj/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=cb83bcd16df50c20c4e4d709cb3f4c7f
+_md5_=eccd12ef5720ddb8ed06879a2e33fc47
diff --git a/metadata/md5-cache/net-misc/vrrpd-1.9 b/metadata/md5-cache/net-misc/vrrpd-1.9
index 186bc7b5673a..fe406bf5e375 100644
--- a/metadata/md5-cache/net-misc/vrrpd-1.9
+++ b/metadata/md5-cache/net-misc/vrrpd-1.9
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/fredbcode/Vrrpd/archive/v1.9.tar.gz -> vrrpd-1.9.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=92fbd4abb6638b90d0b14466ad0f292a
+_md5_=9372b3ff0a3e03b4ba7fa50750c38ac9
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.71 b/metadata/md5-cache/net-p2p/fms-0.3.71
deleted file mode 100644
index 24645cae58bb..000000000000
--- a/metadata/md5-cache/net-p2p/fms-0.3.71
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libiconv frost? ( net-libs/polarssl ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15 app-arch/unzip sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A spam-resistant message board application for Freenet
-EAPI=2
-HOMEPAGE=http://freenetproject.org/tools.html
-IUSE=frost
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/libiconv frost? ( net-libs/polarssl ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15
-SLOT=0
-SRC_URI=mirror://gentoo/fms-src-0.3.71.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f500493aa0a50cf63cfdb7ce3120dafe
diff --git a/metadata/md5-cache/sci-biology/picard-1.103 b/metadata/md5-cache/sci-biology/picard-1.103
index ac2ce38e690c..a7b1bca8460a 100644
--- a/metadata/md5-cache/sci-biology/picard-1.103
+++ b/metadata/md5-cache/sci-biology/picard-1.103
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/snappy:1.0 dev-java/cofoja:0 dev-java/commons
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/sci-biology/picard/picard-1.103.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e58322f480fde563b08fc1b30693ce34
+_md5_=d287f534cbc50dfeccdfd519f8cc0353
diff --git a/metadata/md5-cache/sci-electronics/balsa-4.0-r1 b/metadata/md5-cache/sci-electronics/balsa-4.0-r1
index 195e7e97afef..4aeed04619e2 100644
--- a/metadata/md5-cache/sci-electronics/balsa-4.0-r1
+++ b/metadata/md5-cache/sci-electronics/balsa-4.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl dev-libs/gmp:0 sci-electronics/gplcver sci-electronics/ive
 SLOT=0
 SRC_URI=http://apt.cs.manchester.ac.uk/ftp/pub/apt/balsa/4.0/balsa-4.0.tar.gz http://apt.cs.manchester.ac.uk/ftp/pub/apt/balsa/4.0/balsa-sim-verilog-4.0.tar.gz http://apt.cs.manchester.ac.uk/ftp/pub/apt/balsa/4.0/balsa-tech-minimal-4.0.tar.gz http://apt.cs.manchester.ac.uk/ftp/pub/apt/balsa/4.0/balsa-tech-example-4.0.tar.gz http://apt.cs.manchester.ac.uk/ftp/pub/apt/balsa/4.0/balsa-tech-xilinx-4.0.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=3a11d979500fb19a2df2ec1aedd8bfec
+_md5_=e54f15b5210b51cd7568ca8d6a9d58a5
diff --git a/metadata/md5-cache/sci-libs/ViSP-2.10.0 b/metadata/md5-cache/sci-libs/ViSP-2.10.0
index ece516244c14..03280d943da4 100644
--- a/metadata/md5-cache/sci-libs/ViSP-2.10.0
+++ b/metadata/md5-cache/sci-libs/ViSP-2.10.0
@@ -3,7 +3,7 @@ DEPEND=dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/g
 DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
 EAPI=5
 HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
-IUSE=demos dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack ogre ois opencv png test tutorials usb v4l X xml zbar zlib
+IUSE=demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack ogre ois opencv png test tutorials usb v4l X xml +zbar zlib
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
@@ -11,4 +11,4 @@ REQUIRED_USE=ffmpeg? ( opencv ) ois? ( ogre )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/ViSP-2.10.0.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=f50ee04247d8df986dbdad5d8f4dba42
+_md5_=a5775b7f5594b65decf752782fc13463
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1 b/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
index 8bd1b9b2cabc..83d85174dc89 100644
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
+++ b/metadata/md5-cache/sci-libs/libgeodecomp-0.3.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48
 SLOT=0
 SRC_URI=http://www.libgeodecomp.org/archive/libgeodecomp-0.3.1.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=0ce21282d9cc73553cb10d73fb154ace
+_md5_=5e60f1a1ca21109351892670d4ffcce8
diff --git a/metadata/md5-cache/sci-libs/pyshp-1.2.0 b/metadata/md5-cache/sci-libs/pyshp-1.2.0
index fd961d39a13c..6a0eba6e521d 100644
--- a/metadata/md5-cache/sci-libs/pyshp-1.2.0
+++ b/metadata/md5-cache/sci-libs/pyshp-1.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-1.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=9a137f6cda54e2186cd42a4ae5ccf762
+_md5_=451577dbb59d2bb729c371d21d300b01
diff --git a/metadata/md5-cache/sci-libs/pyshp-9999 b/metadata/md5-cache/sci-libs/pyshp-9999
index e316966feac1..6b3fbe836b12 100644
--- a/metadata/md5-cache/sci-libs/pyshp-9999
+++ b/metadata/md5-cache/sci-libs/pyshp-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=e0831f2f3292797fbb2ae6867c6fe98c
+_md5_=aa536feed983dbe31bd6a205b628ddc8
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.4.5 b/metadata/md5-cache/sci-mathematics/flint-2.4.5
index 6ec17baceb5d..3fd9c41a37d9 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.4.5
+++ b/metadata/md5-cache/sci-mathematics/flint-2.4.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) ntl? ( dev-libs/ntl ) doc? ( app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra )
+DEPEND=dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) ntl? ( <dev-libs/ntl-8 ) doc? ( app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra )
 DESCRIPTION=Fast Library for Number Theory
 EAPI=5
 HOMEPAGE=http://www.flintlib.org/
 IUSE=doc gc ntl static-libs test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) ntl? ( dev-libs/ntl )
+RDEPEND=dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) ntl? ( <dev-libs/ntl-8 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.flintlib.org/flint-2.4.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=d87722c4779c9b06a01842772bd306d6
+_md5_=b16bf6f5b691b8b531315e103b460be5
diff --git a/metadata/md5-cache/sci-misc/ViSP-images-2.10.0 b/metadata/md5-cache/sci-misc/ViSP-images-2.10.0
index f33df037826a..f20ad4b788a4 100644
--- a/metadata/md5-cache/sci-misc/ViSP-images-2.10.0
+++ b/metadata/md5-cache/sci-misc/ViSP-images-2.10.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
 DESCRIPTION=ViSP images data set
 EAPI=5
 HOMEPAGE=http://www.irisa.fr/lagadic/visp/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.irisa.fr/lagadic/visp/download/sequence/ViSP-images-2.10.0.zip
-_md5_=4ec5ed8391e4ee6761b2870b3425f89a
+_md5_=c772ed189697c3551619098c5f1446ba
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.9.6_p02 b/metadata/md5-cache/sci-physics/geant-data-4.9.6_p02
index 1447ebf71dbe..0c200fdf091b 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.9.6_p02
+++ b/metadata/md5-cache/sci-physics/geant-data-4.9.6_p02
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 RDEPEND=~sci-physics/geant-4.9.6_p02:4
 SLOT=4
-SRC_URI=/G4NDL4.2.TS.tar.gz http://geant4.cern.ch/support/source/G4NDL.4.2.tar.gz http://geant4.cern.ch/support/source/G4EMLOW.6.32.tar.gz http://geant4.cern.ch/support/source/G4RadioactiveDecay.3.6.tar.gz http://geant4.cern.ch/support/source/G4SAIDDATA.1.1.tar.gz http://geant4.cern.ch/support/source/G4NEUTRONXS.1.2.tar.gz http://geant4.cern.ch/support/source/G4PII.1.3.tar.gz http://geant4.cern.ch/support/source/G4PhotonEvaporation.2.3.tar.gz http://geant4.cern.ch/support/source/G4ABLA.3.0.tar.gz http://geant4.cern.ch/support/source/RealSurface.1.0.tar.gz
-_md5_=1d46d8f3c3c46bfb534a258b1454d8f8
+SRC_URI=http://geant4.cern.ch/support/source/G4NDL4.2.TS.tar.gz http://geant4.cern.ch/support/source/G4NDL.4.2.tar.gz http://geant4.cern.ch/support/source/G4EMLOW.6.32.tar.gz http://geant4.cern.ch/support/source/G4RadioactiveDecay.3.6.tar.gz http://geant4.cern.ch/support/source/G4SAIDDATA.1.1.tar.gz http://geant4.cern.ch/support/source/G4NEUTRONXS.1.2.tar.gz http://geant4.cern.ch/support/source/G4PII.1.3.tar.gz http://geant4.cern.ch/support/source/G4PhotonEvaporation.2.3.tar.gz http://geant4.cern.ch/support/source/G4ABLA.3.0.tar.gz http://geant4.cern.ch/support/source/RealSurface.1.0.tar.gz
+_md5_=a245acfdda6fb7e78ff2d1fff7cf450f
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.3 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.3
index ff710ebd346d..3ff3e1f1407d 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.3
+++ b/metadata/md5-cache/sci-visualization/gnuplot-4.6.3
@@ -10,4 +10,4 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) emacs? ( virtual/emacs ) !emacs
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.3.tar.gz mirror://gentoo/gnuplot.info-4.6.2.tar.xz
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=700a8a35d76235cc866403ca4282a569
+_md5_=54bac62885a3468da9161cb7c57b7873
diff --git a/metadata/md5-cache/sci-visualization/visit-2.7.3 b/metadata/md5-cache/sci-visualization/visit-2.7.3
index 8954f400550a..15d5250e3dec 100644
--- a/metadata/md5-cache/sci-visualization/visit-2.7.3
+++ b/metadata/md5-cache/sci-visualization/visit-2.7.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://portal.nersc.gov/svn/visit/trunk/releases/2.7.3/visit2.7.3.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=4d3b958669075ba6b8d8c7799fb22174
+_md5_=71625b430f6c15b1e6d74f219bd5c64c
diff --git a/metadata/md5-cache/sci-visualization/visit-2.8.2 b/metadata/md5-cache/sci-visualization/visit-2.8.2
index fdaa580d42ed..2daf736b48e7 100644
--- a/metadata/md5-cache/sci-visualization/visit-2.8.2
+++ b/metadata/md5-cache/sci-visualization/visit-2.8.2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://portal.nersc.gov/svn/visit/trunk/releases/2.8.2/visit2.8.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=56e4df8577d3ebb38436e13b04294c1f
+_md5_=16ded034e3d4e50d66d8fe99fa2620c7
diff --git a/metadata/md5-cache/sys-apps/ed-1.10 b/metadata/md5-cache/sys-apps/ed-1.10
index 6f784a09fc4a..e29a0c5022f1 100644
--- a/metadata/md5-cache/sys-apps/ed-1.10
+++ b/metadata/md5-cache/sys-apps/ed-1.10
@@ -3,9 +3,9 @@ DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/ed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/ed/ed-1.10.tar.lz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=80414ec495595110d1056537162591cc
+_md5_=0d9c1b68e5ee35f445de626806c8cb6a
diff --git a/metadata/md5-cache/sys-apps/ed-1.11 b/metadata/md5-cache/sys-apps/ed-1.11
index aed9c65eb298..142251ce6895 100644
--- a/metadata/md5-cache/sys-apps/ed-1.11
+++ b/metadata/md5-cache/sys-apps/ed-1.11
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-apps/texinfo
+DEFINED_PHASES=configure
+DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/ed/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://gnu/ed/ed-1.11.tar.lz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=37487ebdf3666005fecf1118f1b9ddb6
+SRC_URI=http://fossies.org/linux/privat/ed-1.11.tar.gz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=1c0228ba20f6ba0c8dbf609733fd0ebe
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.4.0-r1 b/metadata/md5-cache/sys-apps/logwatch-7.4.0-r1
index 1aefb7810bfa..1c4ff0974baf 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.4.0-r1
+++ b/metadata/md5-cache/sys-apps/logwatch-7.4.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Analyzes and Reports on system logs
 EAPI=5
 HOMEPAGE=http://www.logwatch.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/DateManip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo
 SLOT=0
 SRC_URI=mirror://sourceforge/logwatch/logwatch-7.4.0/logwatch-7.4.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=fe219f4762da89f1d1e256c76a5e23b5
+_md5_=f391f733111151d6843945c9bd578683
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1 b/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
index 8636362a058e..ed4c144483e2 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
+++ b/metadata/md5-cache/sys-apps/logwatch-7.4.0_p170-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Analyzes and Reports on system logs
 EAPI=5
 HOMEPAGE=http://www.logwatch.org/
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/DateManip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~polynomial-c/logwatch-7.4.0_p170.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=c7d0e9d513a7aa9a3ac71e012f92f470
+_md5_=89346d0778dbb269b8e6f3db73b651fe
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.4.1 b/metadata/md5-cache/sys-apps/logwatch-7.4.1
new file mode 100644
index 000000000000..9d1d9d58ba63
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/logwatch-7.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Analyzes and Reports on system logs
+EAPI=5
+HOMEPAGE=http://www.logwatch.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/DateManip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo
+SLOT=0
+SRC_URI=mirror://sourceforge/logwatch/logwatch-7.4.1/logwatch-7.4.1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=063c086953ffb6ac158c510c4ecde773
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
index 2dfab97ba22a..ae08dc37e295 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=9d8616b4cea69386a532c8caae0e8253
+_md5_=aca750f940fb60b6d604062029e4e974
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 7134bf5a28ca..62e4532530b4 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -9,4 +9,4 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=c990e710670d01cd42fae83cdc0bd132
+_md5_=aaa127a44cdffd748ce55fd2163edfeb
diff --git a/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1 b/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
index c6f9a77ef16c..8dfd8c49b451 100644
--- a/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
+++ b/metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/pam dev-libs/libp11 dev-libs/openssl
 SLOT=0
-SRC_URI=sourceforge://opensc/pam_p11/pam_p11-0.1.5.tar.gz
+SRC_URI=mirror://sourceforge/opensc/pam_p11/pam_p11-0.1.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=a360d246d080db5565d0517879d97a21
+_md5_=8d2487cf19830ffa8c09ebe45ed61da2
diff --git a/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.8 b/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.8
index e377fa6f5898..9625f3c460d8 100644
--- a/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.8
+++ b/metadata/md5-cache/sys-auth/pam_pkcs11-0.6.8
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/pam curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) nss? ( dev-libs/nss curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,curl_ssl_nss] ) ) ) !nss? ( dev-libs/openssl curl? ( || ( net-misc/curl[-ssl] net-misc/curl[ssl,-curl_ssl_nss] ) ) ) pcsc-lite? ( sys-apps/pcsc-lite )
 SLOT=0
-SRC_URI=sourceforge://opensc/pam_pkcs11/pam_pkcs11-0.6.8.tar.gz
+SRC_URI=mirror://sourceforge/opensc/pam_pkcs11/pam_pkcs11-0.6.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=1cfde5ede069c2971261fc79ad2192a2
+_md5_=d491349debb12950ceb7c335e5aac9d5
diff --git a/metadata/md5-cache/sys-block/tw_cli-10.2.2.1 b/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
index af0b59b9b185..71ebba927892 100644
--- a/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
+++ b/metadata/md5-cache/sys-block/tw_cli-10.2.2.1
@@ -8,4 +8,4 @@ LICENSE=LSI-tw_cli
 RESTRICT=strip primaryuri
 SLOT=0
 SRC_URI=kernel_linux? ( http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files//CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip ) kernel_FreeBSD? ( http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files//CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip )
-_md5_=e3f92321d7ac95e4260d9ec63ff80ce8
+_md5_=72768070e008903be8035d83960d623b
diff --git a/metadata/md5-cache/sys-cluster/cinder-2014.2.2 b/metadata/md5-cache/sys-cluster/cinder-2014.2.2
index a873024aeefa..e7c273ae3fb1 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2014.2.2
+++ b/metadata/md5-cache/sys-cluster/cinder-2014.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/cinder/juno/2014.2.2/+download/cinder-2014.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=08493e78a24526aef779fdb29ce31c7f
+_md5_=de9915d6641278c8b2e42c56416a3fba
diff --git a/metadata/md5-cache/sys-cluster/cinder-2014.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2014.2.9999
index 0c02f8b60683..4378f1521ed5 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2014.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2014.2.9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_t
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8a63afb68defffb4ec7e7e8d9d4e2bba
+_md5_=d4cedb7f6982e2311e0615b09159bbda
diff --git a/metadata/md5-cache/sys-cluster/corosync-2.3.3 b/metadata/md5-cache/sys-cluster/corosync-2.3.3
index 614fb4a3962b..95829d9a9d35 100644
--- a/metadata/md5-cache/sys-cluster/corosync-2.3.3
+++ b/metadata/md5-cache/sys-cluster/corosync-2.3.3
@@ -10,4 +10,4 @@ RDEPEND=!sys-cluster/heartbeat infiniband? ( sys-infiniband/libibverbs sys-infin
 SLOT=0
 SRC_URI=https://github.com/corosync/corosync/tarball/v2.3.3 -> corosync-2.3.3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=f0c317f956730b4d0ff88d4e3253e870
+_md5_=34514a3e46b680ef549aa1fc2c171321
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27
index 7e4be1e6ef98..a82976d0ce13 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2 dev-libs/libnl >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=233b11b2359ad61206352137abd07e80
+_md5_=c0134bac8f0fdf952423da8b87348d98
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index f87b980ea16a..a8be697c70aa 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2 dev-libs/libnl >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eeadfb7e63da13366e299a0748482d33
+_md5_=5b91f0b4cb8f4233477bbcbb556002e2
diff --git a/metadata/md5-cache/sys-cluster/libqb-0.17.1 b/metadata/md5-cache/sys-cluster/libqb-0.17.1
index 9b3860ef649d..af45793cdc15 100644
--- a/metadata/md5-cache/sys-cluster/libqb-0.17.1
+++ b/metadata/md5-cache/sys-cluster/libqb-0.17.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
 EAPI=4
 HOMEPAGE=https://github.com/asalkeld/libqb
 IUSE=debug doc examples static-libs test
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/q/u/quarterback/libqb-0.17.1.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=ef033891bdfc0fbad5862018ec8b6cca
+_md5_=79530e2ef2bf18897da20a05d9337817
diff --git a/metadata/md5-cache/sys-cluster/neutron-2014.2.2-r1 b/metadata/md5-cache/sys-cluster/neutron-2014.2.2-r1
index 79647e83ce37..acea11270dd9 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2014.2.2-r1
+++ b/metadata/md5-cache/sys-cluster/neutron-2014.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/neutron/juno/2014.2.2/+download/neutron-2014.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=096fa9d843740ed73210347ee2fa2371
+_md5_=64b9134c1a42950b97d16984ab79d0fb
diff --git a/metadata/md5-cache/sys-cluster/neutron-2014.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2014.2.9999
index a5738565ea06..20d25fe87cf8 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2014.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2014.2.9999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/paste[python_targets_python2_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d995615125d02409d3665b25078bbc4f
+_md5_=9e2ba690a789029974e8b0171d340f74
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
index 61a8da2dee58..953ab552846e 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Pacemaker CRM
 EAPI=5
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl cman heartbeat smtp snmp static-libs python_targets_python2_7
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.12.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=248cf48dd86c9d1a8ad40a3e5e24ceb3
+_md5_=69b87e293a3028a4d7a819405f8ddb34
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6 b/metadata/md5-cache/sys-devel/libtool-2.4.6
index cee81612d032..7ba536a0e68b 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=942cf48476d41e940c859b969e5ee77b
+_md5_=9170bbae7caf8365e0fe080d228304d2
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3
index 74e000c3c652..0c38b5d37834 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating compressed filesystem type squashfs
 EAPI=5
 HOMEPAGE=http://squashfs.sourceforge.net
 IUSE=+xz lzma lz4 lzo xattr
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=bae06b97554a547cdb0b717513889150
+_md5_=117d89d2451d9cc2f2f8b9b20aa19133
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.63 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.63
deleted file mode 100644
index 2266f59616d4..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.63
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.63
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-70.base.tar.xz mirror://gentoo/genpatches-3.10-70.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-70.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e307b4b77afedd5343f4996d6a03ff8a
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.64 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.64
deleted file mode 100644
index b76373ce81bb..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.64
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.64
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-71.base.tar.xz mirror://gentoo/genpatches-3.10-71.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-71.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=42725f64edde7fcd4ec4f2b32a3651e1
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65
deleted file mode 100644
index 439fc7094f2b..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.65
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.65
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-73.base.tar.xz mirror://gentoo/genpatches-3.10-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-73.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4e58dfb846b792c448f0e805b1439c44
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.69 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.69
deleted file mode 100644
index 156500959440..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.69
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.69
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-77.base.tar.xz mirror://gentoo/genpatches-3.10-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-77.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.68-2015-02-10.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2c6c02ae8a16401e8e852830cd948ba5
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.60 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.73
similarity index 77%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.60
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.73
index 4ecae7e6d966..dbc7ce366a54 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.60
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.73
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.60
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-67.base.tar.xz mirror://gentoo/genpatches-3.10-67.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-67.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2
+SLOT=3.10.73
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-81.base.tar.xz mirror://gentoo/genpatches-3.10-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-81.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.69-2015-02-14.patch.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9ef7b1e119f990fae03c38ad9610bb7d
+_md5_=47b746c50d0cbce276cfe48c005e07f5
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.32 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.32
deleted file mode 100644
index ffd47f024f21..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.32
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.32
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-34.base.tar.xz mirror://gentoo/genpatches-3.12-34.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-34.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.26-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9ae5511a63ee0a309907bd1e12834b0c
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.35 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.35
deleted file mode 100644
index 41bc6bd5daea..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.35
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.12.35
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-36.base.tar.xz mirror://gentoo/genpatches-3.12-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-36.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.26-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e41fded83ecc3c550097a1a9b22bffa0
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.37 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.39
similarity index 82%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.37
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.39
index 1716fb554280..4fe801bf0ca9 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.37
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.39
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.12.37
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-37.base.tar.xz mirror://gentoo/genpatches-3.12-37.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-37.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.37-2015-02-02.patch.bz2
+SLOT=3.12.39
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-39.base.tar.xz mirror://gentoo/genpatches-3.12-39.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-39.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.37-2015-02-02.patch.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c8a964548e73048e4256828e635a11fa
+_md5_=92732ff2390b2575c2f88a26bf47eb2f
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.13.11 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.13.11
deleted file mode 100644
index ea6385562f18..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.13.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.13.11
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz mirror://gentoo/genpatches-3.13-14.base.tar.xz mirror://gentoo/genpatches-3.13-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.13-14.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.13.11-2014-04-24.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=048fe63ae5e14bb779ebf3437a7afaf4
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.27 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.27
deleted file mode 100644
index a8dd8cf273d2..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.27
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.27
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-32.base.tar.xz mirror://gentoo/genpatches-3.14-32.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-32.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=47d833c6640ca73f874dcbf679e09ea7
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.28 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.28
deleted file mode 100644
index 55eac8e98b23..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.28
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.28
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-33.base.tar.xz mirror://gentoo/genpatches-3.14-33.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-33.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9d088118628ea0a71fb0a201a740c6d2
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29
deleted file mode 100644
index fa054e4d939c..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.29
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.29
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-34.base.tar.xz mirror://gentoo/genpatches-3.14-34.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-34.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ca2f0f71349ff42beeeb4e92b6a02cd5
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.33 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.33
deleted file mode 100644
index 09f15b0e4b69..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.33
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.33
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-38.base.tar.xz mirror://gentoo/genpatches-3.14-38.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-38.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.32-2015-02-10.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d5114c73d22f9b528a9eebab36a2acd4
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.24 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.37
similarity index 77%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.24
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.37
index 57e14862d5fa..ff8ebccdbc33 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.24
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.37
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.24
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-29.base.tar.xz mirror://gentoo/genpatches-3.14-29.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-29.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2
+SLOT=3.14.37
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-42.base.tar.xz mirror://gentoo/genpatches-3.14-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-42.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.33-2015-02-14.patch.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b9ac6740269adb57e27e48fa8b59aa22
+_md5_=47e986a15acb1ddad9af86f525e65b25
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.10 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.10
deleted file mode 100644
index 379776c940fb..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.15.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.15.10
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz mirror://gentoo/genpatches-3.15-12.base.tar.xz mirror://gentoo/genpatches-3.15-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.15-12.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.15.8-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1ffcf7774bc7747a3ed6df0d0316437f
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.16.7 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.16.7
deleted file mode 100644
index 8a6bb596ba24..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.16.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=experimental symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.16.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz mirror://gentoo/genpatches-3.16-9.base.tar.xz mirror://gentoo/genpatches-3.16-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.16-9.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-head-3.16.0-rc7-2014-07-31.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dc6d551e55054d34fc47c5d0537f3deb
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.7 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.10
similarity index 76%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.7
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.10
index c629d4bb82d8..4231bbf63329 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.7
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.10
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-9.base.tar.xz mirror://gentoo/genpatches-3.18-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-9.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.6-2015-02-10.patch.bz2
+SLOT=3.18.10
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-12.base.tar.xz mirror://gentoo/genpatches-3.18-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-12.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.7-2015-02-14.patch.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17e2473227cfce3c6b895bd47bb17211
+_md5_=8a962ec0e4e745b5dc8cd1deb90cd8cc
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.0 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.3
similarity index 82%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.0
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.3
index 43425cdd7818..331a6c3bc6e5 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.0
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.3
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.19.0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/genpatches-3.19-1.base.tar.xz mirror://gentoo/genpatches-3.19-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-1.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-head-3.19.0-2015-02-10.patch.bz2
+SLOT=3.19.3
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/genpatches-3.19-4.base.tar.xz mirror://gentoo/genpatches-3.19-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-4.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-head-3.19.0-2015-02-10.patch.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7a629adeb8eddef50697a37b97a50df1
+_md5_=ba61bfa1042b5371a0964a28a05295cb
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.104 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.104
deleted file mode 100644
index 6a4a8bdebfbc..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.104
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.4.104
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-87.base.tar.xz mirror://gentoo/genpatches-3.4-87.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.101-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cb427acd17535dd050cd78843fb51bdf
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.105 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.105
deleted file mode 100644
index 8f832bc19441..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.105
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=5
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.4.105
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-88.base.tar.xz mirror://gentoo/genpatches-3.4-88.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.101-2014-08-07.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	b544eac9542c54048d7dd55302455f51	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fe7dacb57c0453b826ade1e2976cbf6b
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.10-r2 b/metadata/md5-cache/sys-process/numactl-2.0.10-r2
new file mode 100644
index 000000000000..c344f9809a25
--- /dev/null
+++ b/metadata/md5-cache/sys-process/numactl-2.0.10-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Utilities and libraries for NUMA systems
+EAPI=5
+HOMEPAGE=http://oss.sgi.com/projects/libnuma/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.10.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=e8931102597e1a5e01ce30079811dc87
diff --git a/metadata/md5-cache/virtual/man-0-r1 b/metadata/md5-cache/virtual/man-0-r1
index e73dfea2f001..bebbb47b3116 100644
--- a/metadata/md5-cache/virtual/man-0-r1
+++ b/metadata/md5-cache/virtual/man-0-r1
@@ -4,4 +4,4 @@ EAPI=3
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/man-db sys-apps/man )
 SLOT=0
-_md5_=323b812e844226b090d82ab1810f1d5c
+_md5_=0ff6ab926fdf502d2dbbe21924051cd6
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
index e94b71c767ad..84a8d6d81660 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-2.140.640 ) !<perl-core/CPAN-Meta-2.140.640 !>perl-core/CPAN-Meta-2.140.640-r999 >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Parse-CPAN-Meta-1.441.400
 SLOT=0
-_md5_=dd5772eb9a73b3f7444fb2a34faaba2f
+_md5_=95f70d2242e692c8b282901fe2981278
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
index 1a676f471038..ababba9f8afc 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-Requirements-2.125.0 ) !<perl-core/CPAN-Meta-Requirements-2.125.0 !>perl-core/CPAN-Meta-Requirements-2.125.0-r999
 SLOT=0
-_md5_=c093005c83cc224917793bc6793337fe
+_md5_=979fdc898d0736fa16ea5ff5c269a33a
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
index 55a48d2e688e..ba06d1d16c02 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-YAML
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-YAML-0.12.0 ) !<perl-core/CPAN-Meta-YAML-0.12.0 !>perl-core/CPAN-Meta-YAML-0.12.0-r999
 SLOT=0
-_md5_=9b8c066498bf2b7918f998418efa6754
+_md5_=fc173d4f5f6622d8d6c3184328032587
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
index b512cfc515a1..36be776efc94 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Command-1.180.0 ) !<perl-core/ExtUtils-Command-1.180.0 !>perl-core/ExtUtils-Command-1.180.0-r999
 SLOT=0
-_md5_=5a6e92d051cf615b6bb6853e3810ae1c
+_md5_=55dad1145147c69027c86c2fe3ed8931
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
index f1fc2ec2edc9..227b0aa6f451 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Install-1.670.0 ) !<perl-core/ExtUtils-Install-1.670.0 !>perl-core/ExtUtils-Install-1.670.0-r999
 SLOT=0
-_md5_=33aff812114950d55300dd03c544dc6d
+_md5_=f425d402e9d8a593660063e13cb88d58
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
index b0d9e60178e1..fae3079c759d 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-ParseXS-3.240.0 ) !<perl-core/ExtUtils-ParseXS-3.240.0 !>perl-core/ExtUtils-ParseXS-3.240.0-r999
 SLOT=0
-_md5_=07187017aaad5d5ffc7c51549366ae32
+_md5_=1a36099dd11765c0ef689e09fafb9360
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
index 6b7e6049138b..e34eb422819b 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=5
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IO-Compress-2.64.0 ) !<perl-core/IO-Compress-2.64.0 !>perl-core/IO-Compress-2.64.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IO-Compress-2.64.0 ) !<perl-core/IO-Compress-2.64.0 !>perl-core/IO-Compress-2.64.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.64.0 >=virtual/perl-Compress-Raw-Bzip2-2.64.0
 SLOT=0
-_md5_=48610367a68634f50e4c2c20205ba0f5
+_md5_=78cacad7fe72101a72de54163f3f376d
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30 b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
index bbbe310f6012..fd91d42eb92e 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/JSON-PP-2.272.30 ) !<perl-core/JSON-PP-2.272.30 !>perl-core/JSON-PP-2.272.30-r999
 SLOT=0
-_md5_=e4c834326ff643a0e762e58625f1a8ac
+_md5_=3445b77dd82af97196b8b290c399f7b0
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
index 32903e4fd91e..2eb9fb9eb77d 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Parse-CPAN-Meta-1.441.400 ) !<perl-core/Parse-CPAN-Meta-1.441.400 !>perl-core/Parse-CPAN-Meta-1.441.400-r999
 SLOT=0
-_md5_=99083c336c283d1a5968e951ae0f6fe9
+_md5_=bcb5b63fb53ce035d43c00bc39d8f032
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.220.0-r3 b/metadata/md5-cache/virtual/perl-libnet-1.220.0-r3
index b729c53df200..6b6ed64655ab 100644
--- a/metadata/md5-cache/virtual/perl-libnet-1.220.0-r3
+++ b/metadata/md5-cache/virtual/perl-libnet-1.220.0-r3
@@ -4,4 +4,4 @@ EAPI=5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/libnet-1.220.0 ) !<perl-core/libnet-1.220.0 !>perl-core/libnet-1.220.0-r999
 SLOT=0
-_md5_=53ba0c38f826ae74fa1b35d99b8ec864
+_md5_=6c585b9019b2b09df131c8d3f792fd0d
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.270.0 b/metadata/md5-cache/virtual/perl-libnet-1.270.0
index b2181a03acf3..6464e05baab8 100644
--- a/metadata/md5-cache/virtual/perl-libnet-1.270.0
+++ b/metadata/md5-cache/virtual/perl-libnet-1.270.0
@@ -4,4 +4,4 @@ EAPI=5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/libnet-1.270.0
 SLOT=0
-_md5_=86e34c25cf0254ee765821a6eff1d6f8
+_md5_=eb2dbdbc3cd1d24eb3ac9a2f3c8679c7
diff --git a/metadata/md5-cache/virtual/python-singledispatch-0 b/metadata/md5-cache/virtual/python-singledispatch-0
index a315a5207353..92bceec75e74 100644
--- a/metadata/md5-cache/virtual/python-singledispatch-0
+++ b/metadata/md5-cache/virtual/python-singledispatch-0
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86
 RDEPEND=python_targets_python2_7? ( dev-python/singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=9972a22e6c7a41327b35939fb06c763a
+_md5_=e68f17c913b10b83a6f192822348de85
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.60_p1 b/metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.68_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.60_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.68_p1
index 5b82d16ace95..57fbf95f29d7 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.60_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-42.0.2311.68_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_42.0.2311.60-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_42.0.2311.60-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_42.0.2311.68-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_42.0.2311.68-1_i386.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=420d1cd4980976ee298f71fef8aced53
+_md5_=73e89f3eb46e23c8fdce0d1aa505f159
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.27.0 b/metadata/md5-cache/www-misc/zoneminder-1.27.0
index 4e4e9c9f5b59..25fdd4fb99c9 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.27.0
+++ b/metadata/md5-cache/www-misc/zoneminder-1.27.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( openssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/v1.27.0.tar.gz -> zoneminder-1.27.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=943aefba11c5e9a40132bf9804b18c7d
+_md5_=fe259759f334684b8fb2c7fcd13f3272
diff --git a/metadata/md5-cache/www-servers/apache-2.4.12 b/metadata/md5-cache/www-servers/apache-2.4.12
index 7404dc9cbcfa..885216c56784 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.12
+++ b/metadata/md5-cache/www-servers/apache-2.4.12
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/apr-1.5.1 dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.12.tar.bz2 http://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.10-r1-20140731.tar.bz2
 _eclasses_=apache-2	318a19d276b6c7480025527d2fe49b3c	autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=74feaa7b6eabb2858a6ed10c1e151bb0
+_md5_=54a3297bf1479deebded9a295d318b16
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.3 b/metadata/md5-cache/x11-libs/libfm-1.2.3
index 3e892a04ee59..b03bb5f2a676 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.3
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
 IUSE=+automount debug doc examples exif gtk udisks vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/4.3.0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.3.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	vala	a41415fe361172827ed11b6a32ee38fb
-_md5_=fc497b8e77f825a5314ddd7b79c22854
+_md5_=5ad5d382e4d701ee30f895a0adf1c1d7
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3 b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
index ca96fa05f2d1..a81a8574f1ef 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
+++ b/metadata/md5-cache/x11-misc/pcmanfm-1.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=Fast lightweight tabbed filemanager
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ppc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info >=x11-libs/libfm-1.2.3:=[gtk(+)] virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-1.2.3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=991fe56841ebd3473a7053d34ba92b2b
+_md5_=1a5d33657aad66229f568dd26cbbcde4
diff --git a/metadata/md5-cache/x11-misc/sux-1.0-r4 b/metadata/md5-cache/x11-misc/sux-1.0-r4
index 3cd8afb24c52..25d20c07b239 100644
--- a/metadata/md5-cache/x11-misc/sux-1.0-r4
+++ b/metadata/md5-cache/x11-misc/sux-1.0-r4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION="su" wrapper which transfers X credentials
 EAPI=5
 HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml
-KEYWORDS=~alpha amd64 ~arm ppc sparc x86
+KEYWORDS=~alpha amd64 arm ppc sparc x86
 LICENSE=MIT
 RDEPEND=x11-apps/xauth
 SLOT=0
 SRC_URI=http://fgouget.free.fr/sux/sux
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=4876cd6498f92465d34605a43ed0fd6b
+_md5_=29cc03dbb862d133274466133d803759
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
index 35b4e4456f79..5ef03b779caa 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
+++ b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
@@ -9,4 +9,4 @@ RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gkrellm-plugin	4599c73f33aed9a9988a7031f60d2ed8	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=8b0efda819e2ed7bd5f25a620455585f
+_md5_=aab8c3aa84e7ed98e630f9964a52fb36
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.11.1 b/metadata/md5-cache/x11-wm/xmonad-0.11.1
new file mode 100644
index 000000000000..4095d3e98378
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xmonad-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] >=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A tiling window manager
+EAPI=5
+HOMEPAGE=http://xmonad.org
+IUSE=+default-term no-autorepeat-keys doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=default-term? ( x11-terms/xterm ) x11-apps/xmessage
+RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] >=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.1
+SRC_URI=mirror://hackage/packages/archive/xmonad/0.11.1/xmonad-0.11.1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c75171f08fae457de570ecefd41f602a
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.4 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.4
new file mode 100644
index 000000000000..151f278203ee
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.11.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Third party extensions for xmonad
+EAPI=5
+HOMEPAGE=http://xmonad.org/
+IUSE=+xft doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/random:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+SLOT=0/0.11.4
+SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.11.4/xmonad-contrib-0.11.4.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	98224cebe581f23d62c7fbb75c07fd90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	79b635d29abf0572d6a1b0dc8e63c0e4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0954c30da8283d58d5b674e1ccf9af57
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c1eb2457b7ab..2ac5594ceaff 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Apr 2015 15:36:54 +0000
+Fri, 03 Apr 2015 06:36:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ffb176069c7f..391e6d2b8a4c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr  2 15:36:51 UTC 2015
+Fri Apr  3 06:36:51 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 16a33956f1f9..6270fd6a8f26 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Apr 2015 16:00:01 +0000
+Fri, 03 Apr 2015 07:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cd5b92054d4d..2e33bae5f687 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1427988901 Thu 02 Apr 2015 03:35:01 PM UTC
+1428042901 Fri 03 Apr 2015 06:35:01 AM UTC
diff --git a/net-analyzer/arping/arping-2.15.ebuild b/net-analyzer/arping/arping-2.15.ebuild
index 0d2ec1a8e019..2d03cffac615 100644
--- a/net-analyzer/arping/arping-2.15.ebuild
+++ b/net-analyzer/arping/arping-2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.15.ebuild,v 1.7 2015/04/01 08:19:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.15.ebuild,v 1.9 2015/04/02 20:13:15 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="
 	net-libs/libpcap
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	rm -f Makefile
 
-	# since we install as arping2, use arping2 in documentation 
+	# since we install as arping2, use arping2 in documentation
 	sed -i \
 		-e "s|\(${PN}\)|\12|g" \
 		-e "s|\(${PN}\)\(\W\)|\12\2|g" \
diff --git a/net-analyzer/fe3d/fe3d-0.11.2.ebuild b/net-analyzer/fe3d/fe3d-0.11.2.ebuild
index 8ae8102e4bd2..9c0c275a317c 100644
--- a/net-analyzer/fe3d/fe3d-0.11.2.ebuild
+++ b/net-analyzer/fe3d/fe3d-0.11.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/fe3d-0.11.2.ebuild,v 1.7 2013/02/01 15:05:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fe3d/fe3d-0.11.2.ebuild,v 1.8 2015/04/03 05:42:40 jer Exp $
 
 EAPI=5
-inherit autotools eutils
+WX_GTK_VER="2.8"
+inherit autotools eutils wxwidgets
 
 if [[ "${PV}" =~ (_p)([0-9]+) ]] ; then
 	inherit subversion
@@ -20,7 +21,6 @@ HOMEPAGE="http://projects.icapsid.net/fe3d/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 x86"
-IUSE=""
 
 DOCS=( AUTHORS doc/{ChangeLog,README}.txt )
 
@@ -34,8 +34,12 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${PN}_${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch \
+	need-wxwidgets unicode
+
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-coreutils.patch
+
 	eautoreconf
 }
 
diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
index 5399da4b8e97..63d475194162 100644
--- a/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
+++ b/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch
@@ -1,5 +1,5 @@
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -46,16 +46,15 @@
  		])
  fi
@@ -22,8 +22,8 @@
  
  AC_OUTPUT
  
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,8 +1,10 @@
 -fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\""
 +fe3d_CPPFLAGS	= -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@
diff --git a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
index bcc0db6893e1..547d86fb5cab 100644
--- a/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
+++ b/net-analyzer/fe3d/files/fe3d-0.11.2-coreutils.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/330047
 
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -5,5 +5,5 @@
  
  fe3ddir		= @datadir@/@PACKAGE@
diff --git a/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
index 94867b6e91d9..40bb0e73ad66 100644
--- a/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
+++ b/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild,v 1.4 2014/07/02 09:48:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild,v 1.5 2015/04/02 18:29:55 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -34,4 +34,4 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
-DOCS="AUTHORS ChangeLog README"
\ No newline at end of file
+DOCS="AUTHORS ChangeLog README"
diff --git a/net-dns/validns/validns-0.7.ebuild b/net-dns/validns/validns-0.7.ebuild
index c7a40e6b44d0..3fcb8f4854f0 100644
--- a/net-dns/validns/validns-0.7.ebuild
+++ b/net-dns/validns/validns-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/validns/validns-0.7.ebuild,v 1.1 2013/08/12 11:37:10 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/validns/validns-0.7.ebuild,v 1.2 2015/04/02 18:20:31 mr_bones_ Exp $
 
 EAPI=4
 
@@ -11,6 +11,7 @@ SRC_URI="http://www.validns.net/download/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 RDEPEND="dev-libs/judy"
 DEPEND="
diff --git a/net-dns/validns/validns-0.8.ebuild b/net-dns/validns/validns-0.8.ebuild
index 2ef9cf4a2203..8aeb60a5b7bd 100644
--- a/net-dns/validns/validns-0.8.ebuild
+++ b/net-dns/validns/validns-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/validns/validns-0.8.ebuild,v 1.1 2014/04/03 15:07:53 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/validns/validns-0.8.ebuild,v 1.2 2015/04/02 18:20:31 mr_bones_ Exp $
 
 EAPI=4
 
@@ -11,6 +11,7 @@ SRC_URI="http://www.validns.net/download/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 RDEPEND="dev-libs/judy"
 DEPEND="
diff --git a/net-libs/iojs/iojs-1.5.1.ebuild b/net-libs/iojs/iojs-1.5.1.ebuild
index 977ab0ec420a..49279f2a666a 100644
--- a/net-libs/iojs/iojs-1.5.1.ebuild
+++ b/net-libs/iojs/iojs-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.5.1.ebuild,v 1.1 2015/03/10 03:20:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.5.1.ebuild,v 1.2 2015/04/02 18:30:40 mr_bones_ Exp $
 
 EAPI=5
 
@@ -109,4 +109,4 @@ src_install() {
 	find "${LIBDIR}"/node_modules -type f -name "LICENSE" -delete
 
 	pax-mark -m "${ED}"/usr/bin/iojs
-}
\ No newline at end of file
+}
diff --git a/net-libs/iojs/iojs-1.6.3-r1.ebuild b/net-libs/iojs/iojs-1.6.3-r1.ebuild
index 712ffdbac47b..76e929beb5e0 100644
--- a/net-libs/iojs/iojs-1.6.3-r1.ebuild
+++ b/net-libs/iojs/iojs-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.6.3-r1.ebuild,v 1.1 2015/04/02 07:18:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.6.3-r1.ebuild,v 1.2 2015/04/02 18:30:40 mr_bones_ Exp $
 
 EAPI=5
 
@@ -108,4 +108,4 @@ src_install() {
 	find "${LIBDIR}"/node_modules -type f -name "LICENSE" -delete
 
 	pax-mark -m "${ED}"/usr/bin/iojs
-}
\ No newline at end of file
+}
diff --git a/net-libs/libssh/libssh-0.6.4.ebuild b/net-libs/libssh/libssh-0.6.4.ebuild
index 362e289da5d9..bed67dc80921 100644
--- a/net-libs/libssh/libssh-0.6.4.ebuild
+++ b/net-libs/libssh/libssh-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.7 2015/03/03 09:29:35 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.8 2015/04/02 16:22:14 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://red.libssh.org/attachments/download/107/${MY_P}.tar.gz -> ${P}.
 	http://git.libssh.org/projects/libssh.git/patch/?id=3880a8ed80a4b1e2c052bd62f328bba2f869d5ae -> ${PN}-0.6.4-libgcrypt_build_fix.patch"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index 363cdfd9807f..e723a6e3437d 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,2 +1,4 @@
 DIST nomachine-enterprise-client_4.4.12_11_i686.tar.gz 57206 SHA256 9f76b2740734b1bac56c399bbad19dc8c248a75f66a17c3115d378786f525cd9 SHA512 1e63c6236d183295ff83e95d5219a2003878e93caca569d2ad4339f5033640dd36282239341bce20a91314cd972f80ab1076cee006ad685dc66c0ec98a593595 WHIRLPOOL 7d0de2a8bc1e936e5f72e3a7678ad599ca004a236dfe1cf6624dc6c6c33feb94b57544cab29c12e234cea61df39c38c5e7591e9b6547590b52873b4654155de1
 DIST nomachine-enterprise-client_4.4.12_11_x86_64.tar.gz 26356658 SHA256 30a6cc3f8139d58db9f2cca6baaecbfcbfb845d62dfa76804ff244cdff818bd2 SHA512 ead00f1e5f7df52e780ede876f606cda8fbbb80b0177e377a2b7530248c8a7988af9b3d44242e8f720525feef000dd62201a5f896d8b9504d7febf2bcba0402b WHIRLPOOL 6eadce1dff2fc146feab0cd2732cd025e900ff7eb9be65e11a49e24954c74da80d147f12609c16caaa7f0979604fe159af2704bec9144d50c95be1f1f327473b
+DIST nomachine-enterprise-client_4.5.0_1_i686.tar.gz 25476432 SHA256 72e551af4254af2287205463ff0525b562af0e714221681f260f676e8eb1160a SHA512 45011622f6767284a42951120e9ca5de462e9773d06c0ac0aeec88ac69c2588e2810ccfea73a4f53fa02ee28cd96562b0945323aed70975dc1d72c18d2f1f9ce WHIRLPOOL 867c2d0db473035bcba04143eed6d64164c28afcd89e4e729181216b90f3e1286ff75207dd82c2e16d420c8999e1858cc799f03def31cced3534e364e177af34
+DIST nomachine-enterprise-client_4.5.0_1_x86_64.tar.gz 26344131 SHA256 d5d3ea7d45f223cde63db377b6c7a9c69d1b070e4ed5e6572199554eb6a235a4 SHA512 ec30000b0d0acb9d6bcde083732222a25e4ce500af22afdc2fb43d22cf2bbd6ced352e9e943a12a74c7a09fc5922774bd8ef03d67c0368afeefa2692d6126607 WHIRLPOOL d0eb3b6c32ed4e38a3f15db7e7c1fe3b10541f5e2c62d080538e6ee403eff0fecb4096abb5c96f3174b275b1830f681f336f3a378aafb5bb6543590715a01496
diff --git a/net-misc/nxplayer/nxplayer-4.5.0.1.ebuild b/net-misc/nxplayer/nxplayer-4.5.0.1.ebuild
new file mode 100644
index 000000000000..c1deac2d9c6d
--- /dev/null
+++ b/net-misc/nxplayer/nxplayer-4.5.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxplayer/nxplayer-4.5.0.1.ebuild,v 1.1 2015/04/02 22:51:07 voyageur Exp $
+
+EAPI=5
+inherit eutils versionator
+
+MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
+
+DESCRIPTION="Client for NoMachine remote servers"
+HOMEPAGE="http://www.nomachine.com"
+SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
+	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="dev-libs/glib:2
+	dev-libs/openssl:0"
+
+S=${WORKDIR}/NX/etc/NX/player/packages
+
+QA_PREBUILT="*"
+
+src_install()
+{
+	local NXROOT=/opt/NX
+
+#	dodir /etc/NX/localhost
+#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
+
+	dodir /opt
+	tar xozf nxclient.tar.gz -C "${D}"/opt
+	tar xozf nxplayer.tar.gz -C "${D}"/opt
+
+	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
+}
diff --git a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
index 7efe3f2cc056..37ca8388388c 100644
--- a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild,v 1.6 2015/03/24 17:28:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild,v 1.7 2015/04/02 20:14:40 maekke Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 ~x86"
 IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
 python sasl smartcard static-libs usbredir vala webdav"
 
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index 1da484d4707e..240bd2d5b848 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild,v 1.10 2013/09/13 22:44:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild,v 1.11 2015/04/02 18:53:43 mr_bones_ Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ src_prepare() {
 	# https://github.com/atj/ssh-askpass-fullscreen/pull/1
 	epatch "${FILESDIR}/${P}-libX11.patch"
 
-	# automake-1.13 fix, bug #468764 	
+	# automake-1.13 fix, bug #468764
 	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
 
 	eautoreconf
diff --git a/net-misc/vrrpd/vrrpd-1.9.ebuild b/net-misc/vrrpd/vrrpd-1.9.ebuild
index fd0acfc140c4..b8c508129100 100644
--- a/net-misc/vrrpd/vrrpd-1.9.ebuild
+++ b/net-misc/vrrpd/vrrpd-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vrrpd/vrrpd-1.9.ebuild,v 1.1 2013/12/03 22:49:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vrrpd/vrrpd-1.9.ebuild,v 1.2 2015/04/02 18:54:26 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils
@@ -20,7 +20,7 @@ S="${WORKDIR}/Vrrpd-${PV}"
 src_prepare() {
 	epatch "${FILESDIR}"/vrrpd-1.9-rollup.patch || die
 	emake mrproper
-	#rm -f atropos 
+	#rm -f atropos
 }
 
 src_compile() {
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index c19bdc3599b9..756c9487d90f 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,2 +1 @@
-DIST fms-src-0.3.71.zip 3516518 SHA256 6dfd678eff2521aff0f3c7ec28e8dedd12ea246aa381aa530c378c1829378faa SHA512 58aa4d0353558a5ce7a55eb3f6a115c8937abee0cfb6ab8fe639a7d250a1d5cb506b0b8d9a5e9bc201ad8c9368e33789ba47e885ef12c490adbc601372d71f95 WHIRLPOOL 0263db2b37b59359049401ae4e510f2f2ca2e90c517aec71bbe7e7a3bccd5c4a639120657488eddd7426fd66d2e153ef64453de5ed7709f135aa4dec2d934cc5
 DIST fms-src-0.3.73.zip 3519550 SHA256 f20985efa71c77c843f7cd16e437414ba2810c5a69d7917456e2a2e6e551a6e5 SHA512 457a6808e85dce8ac3cc31ac465eeb6e271294b6aac9436a12adb21f1dacc5ef8726c558dd6734a7418cff1ce92c172062e0eb5b4642e29a83235cccc9198d2c WHIRLPOOL 8fd8a4b59b003df5b3b91f9d9dde134b3832fb572a772e3129889c56c5c9be10040161cff8fcb1b6183ebe156b9b340bef2481d43519044a8cb54ed0887624a4
diff --git a/net-p2p/fms/fms-0.3.71.ebuild b/net-p2p/fms/fms-0.3.71.ebuild
deleted file mode 100644
index 312140ce86b5..000000000000
--- a/net-p2p/fms/fms-0.3.71.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.71.ebuild,v 1.2 2014/01/08 06:30:00 vapier Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils user
-
-DESCRIPTION="A spam-resistant message board application for Freenet"
-HOMEPAGE="http://freenetproject.org/tools.html"
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="frost"
-
-RDEPEND="virtual/libiconv
-	frost? ( net-libs/polarssl )
-	>=dev-libs/poco-1.4.3_p1
-	>=dev-db/sqlite-3.6.15"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-	edos2unix src/http/pages/showfilepage.cpp
-	epatch "${FILESDIR}"/${PN}-use-system-libs2.patch
-}
-
-src_configure() {
-	local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
-		-DUSE_BUNDLED_SQLITE=OFF \
-		-DDO_CHARSET_CONVERSION=ON \
-		$(cmake-utils_use frost FROST_SUPPORT)"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	insinto /var/freenet/fms
-	dobin "${CMAKE_BUILD_DIR}"/fms || die
-	doins *.htm || die "doinstall failed"
-	doins -r fonts images styles translations || die
-	fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
-	fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
-	doinitd "${FILESDIR}/fms" || die "installing init.d file failed"
-	dodoc readme.txt || die "installing doc failed"
-}
-
-pkg_postinst() {
-	if ! has_version 'net-p2p/freenet' ; then
-		ewarn "FMS needs a freenet node to up-/download #ssages."
-		ewarn "Please make sure to have a node you can connect to"
-		ewarn "or install net-p2p/freenet to get FMS working."
-	fi
-	elog "By default, the FMS NNTP server will listen on port 1119,"
-	elog "and the web configuration interface will be running at"
-	elog "http://localhost:8080. For more information, read"
-	elog "${ROOT}usr/share/doc/${PF}/readme.txt.bz2"
-	if use frost; then
-		elog " "
-		elog "You need to enable frost on the config page"
-		elog "and restart fms for frost support."
-	fi
-}
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 567c6f03ef60..9e6b64716b2e 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.247 2015/03/17 01:36:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.249 2015/04/03 05:56:01 maekke Exp $
+
+# Markus Meier <maekke@gentoo.org> (03 Apr 2015)
+# Deps not yet stable or keyworded
+=media-libs/libsdl2-2.0.3-r200 fusionsound
+
+# Alexis Ballier <aballier@gentoo.org> (02 Apr 2015)
+# Needs ilmbase (openexr), which does not build and is masked on arm.
+media-libs/freeimage tiff
 
 # Markus Meier <maekke@gentoo.org> (03 Mar 2015)
 # Unkeyworded deps, bug #540540
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8f152710d5ba..7e0605cdc838 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,14 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.664 2015/03/25 21:05:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.666 2015/04/02 19:04:14 mgorny Exp $
+
+# This file requires >=portage-2.1.1
+# New entries go on top.
+
+# Michał Górny <mgorny@gentoo.org> (02 Apr 2015)
+# DirectFB support was removed from libsdl, mask the relevant flag
+# due to unsolvable deps, bug #545246.
+media-tv/freevo directfb
 
 # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 games-strategy/freeciv system-lua
 
-# This file requires >=portage-2.1.1
-# New entries go on top.
-
 # Brian Evans <grknight@gentoo.org> (17 Mar 2015)
 # Mask the cluster flag for deprecation. Use dev-db/mysql-cluster if
 # you need NDB.
diff --git a/profiles/package.mask b/profiles/package.mask
index 381ab26b00a3..26d5f9616992 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16454 2015/04/01 14:36:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16456 2015/04/03 01:33:33 prometheanfire Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -29,6 +29,18 @@
 ## app-misc/some-package
 
 #--- END OF EXAMPLES ---
+# Matthew Thode <prometheanfire@gentoo.org> (2 Apr 2015)
+# removing firmware package I accidently added
+# people should move to linux-firmware
+# Masked for removal in 30 days
+sys-firmware/iwl7265-ucode
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (2 Apr 2015)
+# Ancient, dead upstream. File collisions (bug 535700)
+# and build failures (bug 277670). Masked for removal in
+# 30 days.
+dev-perl/Eidetic
+app-admin/rackview
 
 # Michael Sterrett <mr_bones_@gentoo.org> (30 Mar 2015)
 # Not used by anything in the tree and no upstream anymore.
@@ -601,10 +613,6 @@ media-fonts/culmus-ancient
 # Masked for removal due to licensing issues, bug 539778
 dev-ruby/gemoji
 
-# Matthew Thode <prometheanfire@gentoo.org> (12 Feb 2015)
-# Dead upstream and no deps
-dev-python/rax-backup-schedule-python-novaclient-ext
-
 # Joerg Bornkessel <hd_brummy@gentoo.org> (12 Feb 2015)
 # dead on upstream since years,
 # removal around 12 Mar 2015
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 97ebd3206091..6b88e7ab85c1 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.2 2015/03/09 17:57:49 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.3 2015/04/02 19:49:45 kensington Exp $
 
 # Not required, but makes life easier with Qt; bug 457934
 app-arch/unzip natspec
@@ -36,6 +36,7 @@ media-libs/mesa egl
 <dev-util/kdevelop-4.8.0 -gdbui
 kde-base/baloo minimal
 kde-base/kactivities minimal
+kde-base/kde-l10n minimal
 kde-base/kde-meta minimal
 kde-base/kdeartwork-meta minimal
 kde-base/kdebase-kioslaves minimal
diff --git a/sci-biology/picard/picard-1.103.ebuild b/sci-biology/picard/picard-1.103.ebuild
index 7415a3888923..c025e1d90edb 100644
--- a/sci-biology/picard/picard-1.103.ebuild
+++ b/sci-biology/picard/picard-1.103.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/picard/picard-1.103.ebuild,v 1.1 2013/11/24 15:21:14 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/picard/picard-1.103.ebuild,v 1.2 2015/04/02 18:31:24 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -67,4 +67,4 @@ src_install() {
 
 src_test() {
 	java-pkg-2_src_test
-}
\ No newline at end of file
+}
diff --git a/sci-electronics/balsa/balsa-4.0-r1.ebuild b/sci-electronics/balsa/balsa-4.0-r1.ebuild
index 3d107062a22b..5ba184ee956f 100644
--- a/sci-electronics/balsa/balsa-4.0-r1.ebuild
+++ b/sci-electronics/balsa/balsa-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-4.0-r1.ebuild,v 1.1 2015/02/21 16:36:48 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-4.0-r1.ebuild,v 1.2 2015/04/02 18:55:09 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -68,8 +68,8 @@ src_compile() {
 	PATH="$PATH:"${S}"/bin"
 	emake -j1
 
-	# the additional packages have to be configured after compiling 
-	# balsa binaries 
+	# the additional packages have to be configured after compiling
+	# balsa binaries
 
 	# configure AMS035 tech
 	if [ $TECH_AMS ]; then
diff --git a/sci-libs/ViSP/ViSP-2.10.0.ebuild b/sci-libs/ViSP/ViSP-2.10.0.ebuild
index ad5898537523..11785d472de2 100644
--- a/sci-libs/ViSP/ViSP-2.10.0.ebuild
+++ b/sci-libs/ViSP/ViSP-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ViSP/ViSP-2.10.0.ebuild,v 1.1 2015/03/11 17:16:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ViSP/ViSP-2.10.0.ebuild,v 1.2 2015/04/02 16:12:09 aballier Exp $
 
 EAPI=5
 
@@ -14,8 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="
-	demos dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack ogre ois opencv png
-	test tutorials usb v4l X xml zbar zlib
+	demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack ogre ois opencv png
+	test tutorials usb v4l X xml +zbar zlib
 "
 
 RDEPEND="
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
index e22adf15e3cb..6493c4c5e480 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild,v 1.1 2014/05/19 10:42:34 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild,v 1.2 2015/04/02 18:32:07 mr_bones_ Exp $
 
 EAPI=5
 
@@ -33,4 +33,4 @@ src_install() {
 
 src_test() {
 	cmake-utils_src_make test
-}
\ No newline at end of file
+}
diff --git a/sci-libs/pyshp/pyshp-1.2.0.ebuild b/sci-libs/pyshp/pyshp-1.2.0.ebuild
index f10b388cff99..6ff7bf874cb8 100644
--- a/sci-libs/pyshp/pyshp-1.2.0.ebuild
+++ b/sci-libs/pyshp/pyshp-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pyshp/pyshp-1.2.0.ebuild,v 1.2 2014/11/28 15:13:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pyshp/pyshp-1.2.0.ebuild,v 1.3 2015/04/02 18:32:50 mr_bones_ Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -25,4 +25,4 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
\ No newline at end of file
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/pyshp/pyshp-9999.ebuild b/sci-libs/pyshp/pyshp-9999.ebuild
index 0215d8c8ea7c..a5def1895219 100644
--- a/sci-libs/pyshp/pyshp-9999.ebuild
+++ b/sci-libs/pyshp/pyshp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pyshp/pyshp-9999.ebuild,v 1.2 2014/11/28 15:13:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pyshp/pyshp-9999.ebuild,v 1.3 2015/04/02 18:32:50 mr_bones_ Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -25,4 +25,4 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
\ No newline at end of file
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
index 928d2a3e01c1..9546fcfe7328 100644
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.5.ebuild,v 1.1 2015/04/02 12:27:59 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.5.ebuild,v 1.2 2015/04/03 06:29:57 patrick Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="doc gc ntl static-libs test"
 RDEPEND="dev-libs/gmp
 	dev-libs/mpfr
 	gc? ( dev-libs/boehm-gc )
-	ntl? ( dev-libs/ntl )"
+	ntl? ( <dev-libs/ntl-8 )"
 DEPEND="${RDEPEND}
 	doc? (
 		app-text/texlive-core
diff --git a/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild b/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild
index 41e2d47fdac4..18f3a03140ad 100644
--- a/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild
+++ b/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild,v 1.1 2015/03/11 17:10:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/ViSP-images/ViSP-images-2.10.0.ebuild,v 1.2 2015/04/02 16:30:57 aballier Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.irisa.fr/lagadic/visp/download/sequence/ViSP-images-${PV}.zi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild b/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild
index 6cdb7d948f65..b2de717b2cfb 100644
--- a/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild
+++ b/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild,v 1.2 2013/06/10 17:22:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-data/geant-data-4.9.6_p02.ebuild,v 1.3 2015/04/02 17:44:35 mr_bones_ Exp $
 
 EAPI=5
 
@@ -19,8 +19,8 @@ GEANT4_DATA="
 	G4ABLA.3.0
 	RealSurface.1.0"
 
-SRC_URI="${SRC_COM}/G4NDL${NDLPV}.TS.tar.gz"
 SRC_COM="http://geant4.cern.ch/support/source"
+SRC_URI="${SRC_COM}/G4NDL${NDLPV}.TS.tar.gz"
 for d in ${GEANT4_DATA}; do
 	SRC_URI="${SRC_URI} ${SRC_COM}/${d}.tar.gz"
 done
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild
index ee8a83d3a700..1eb30050f3e5 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild,v 1.13 2014/01/18 07:52:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.3.ebuild,v 1.14 2015/04/02 18:55:53 mr_bones_ Exp $
 
 EAPI=5
 
@@ -142,7 +142,7 @@ src_configure() {
 			# Live ebuild needs an Emacs to build gnuplot.texi
 			if has_version virtual/emacs; then emacs=emacs
 			elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-			# for emacs != no gnuplot will install lisp files in 
+			# for emacs != no gnuplot will install lisp files in
 			# ${lispdir}/ which will / for emtpy lispdir
 			lispdir="${T}"
 		fi
diff --git a/sci-visualization/visit/visit-2.7.3.ebuild b/sci-visualization/visit/visit-2.7.3.ebuild
index 394d9775c110..1cb5236a65d5 100644
--- a/sci-visualization/visit/visit-2.7.3.ebuild
+++ b/sci-visualization/visit/visit-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.7.3.ebuild,v 1.1 2014/07/25 12:24:12 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.7.3.ebuild,v 1.2 2015/04/02 18:33:35 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -87,4 +87,4 @@ pkg_postinst () {
 	ewarn "Remember to run "
 	ewarn "env-update && source /etc/profile"
 	ewarn "if you want to use visit in already opened session"
-}
\ No newline at end of file
+}
diff --git a/sci-visualization/visit/visit-2.8.2.ebuild b/sci-visualization/visit/visit-2.8.2.ebuild
index e6bd80881400..a0957f1b69b6 100644
--- a/sci-visualization/visit/visit-2.8.2.ebuild
+++ b/sci-visualization/visit/visit-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.8.2.ebuild,v 1.1 2015/01/09 12:02:13 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/visit/visit-2.8.2.ebuild,v 1.2 2015/04/02 18:33:35 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -87,4 +87,4 @@ pkg_postinst () {
 	ewarn "Remember to run "
 	ewarn "env-update && source /etc/profile"
 	ewarn "if you want to use visit in already opened session"
-}
\ No newline at end of file
+}
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 04a589eef69f..e00f3f23903e 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,3 +1,3 @@
 DIST ed-1.10.tar.lz 63717 SHA256 9540092c12309b2f4a294fdb8f5bd25f1ad5906a627518486e7733576a637e9a SHA512 b9c59de852609930d2a872f3d9af9ac12be8e80f3d2af49e3626cd909ba46ed4a4260844c636562cd479c5529a116055705260327f61304d8eaf88db6a60059a WHIRLPOOL 7130abba638202e06e078b9e60c9f83e6216fc0cd73891df08eda4a06044b9783a8f974b70dfb8452bdbc7c090bea3776c45b743e7a05bf9988197b51de729d8
-DIST ed-1.11.tar.lz 63927 SHA256 bd146ede5f225e20946ad94ef6bdf07939313bcc41dde5d2beedcea1a147a134 SHA512 485eac37460b9084f79887d88b7c67ed67a9040ce20dbc118145574bf77ec54ed51ff6a94c4acc0c75f6b2bd36150806722d3bba7907021995d1cd5e3d1eaacd WHIRLPOOL 275166e7788b8e32135774295f1b5dabad69520815b67dfd1145c327c7e79fd1f60b1928cf219377fbb21bc34ff5d9109aab1da788c405604b7089fa4eb64e23
+DIST ed-1.11.tar.gz 88303 SHA256 141dba3311e6295898d1b64e86263e40b8e85e3ab4ee4954859a3d3017511041 SHA512 09d86be3442a2e7eba0d1a008752a988324d3fa3e7870c3fffb00cb96f3433b3af3506105a1a6bc97a66754d994f6613c7a233417a4ddc32129adab055ad46b0 WHIRLPOOL 79fcb5436d0bcf9899a9af2abe3911000af136ff28e296ad9c26bf9717bf31f97a843700093baf598f4b5ed892f4a4cdfd2179381fcc4ecd53a55094877f7344
 DIST ed-1.6.tar.gz 86691 SHA256 211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65 SHA512 efb9c4971a44e2baa46c60c607ab33e7f1c9460eb19dd37f68a7b570489578495f11848dd4791194660be31bc7a229f26f35409b6fc29150a7206de37a013723 WHIRLPOOL 81a5c9bd4b95f50b806ca2e40118ab052af382735fcd6853d6e6a3e0cb2a0bbffad2985cb4b4b694f88676bcb2a988b7361bc27b4ef345b388cc5a223702b61b
diff --git a/sys-apps/ed/ed-1.10.ebuild b/sys-apps/ed/ed-1.10.ebuild
index 940bd939fdda..d00d6d9867e3 100644
--- a/sys-apps/ed/ed-1.10.ebuild
+++ b/sys-apps/ed/ed-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.10.ebuild,v 1.4 2014/02/27 20:14:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.10.ebuild,v 1.5 2015/04/03 04:41:12 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/ed/${P}.tar.lz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="$(unpacker_src_uri_depends)
diff --git a/sys-apps/ed/ed-1.11.ebuild b/sys-apps/ed/ed-1.11.ebuild
index eee32e3226d0..9e6e380719fb 100644
--- a/sys-apps/ed/ed-1.11.ebuild
+++ b/sys-apps/ed/ed-1.11.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.11.ebuild,v 1.1 2015/04/01 07:05:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.11.ebuild,v 1.2 2015/04/02 17:18:41 vapier Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs unpacker
+inherit toolchain-funcs
 
 DESCRIPTION="Your basic line editor"
 HOMEPAGE="http://www.gnu.org/software/ed/"
-SRC_URI="mirror://gnu/ed/${P}.tar.lz"
+#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
+# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
+SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="$(unpacker_src_uri_depends)
-	sys-apps/texinfo"
+DEPEND="sys-apps/texinfo"
 RDEPEND=""
 
 src_configure() {
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 7a5df8db901f..8bbcd3ba2e0f 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,2 +1,3 @@
 DIST logwatch-7.4.0.tar.gz 294398 SHA256 b8fd136a07a6b79962380d68b26328cdccc8b6a20310195e24e39b0bfd3287c4 SHA512 d556a5768ceeedc21396a38f02f2b2d8ca3556de92274038819840a6d41770437673a531d91f54cf3a905b6b4b8d72fa4011b838f81ed04b02265bde39b7b3c7 WHIRLPOOL 7643cb55ed330dacda223d5ff06dca16a29df2a8c50a6f4b2bded1ba764c07126101bce08422e5531cc7dd531960e6dd9a29114ac5e43987a3d2d9b796204d21
 DIST logwatch-7.4.0_p170.tar.gz 455794 SHA256 27f4ae2692190aa96a3af997d66b39a595e9c72e4a078cbdfa7c13f5c885a42f SHA512 6c07cfb20c0bd121b698b48f060d50b45e018b81b2ed78c96d33c5b8cb43fd23a139cf95c64af9c3148c99fe1f9e9d2c0936e1d2ab6dfba105e4ad621db2fcdb WHIRLPOOL 6af221787ce7d71f0c238fbb18d3b272cfe42cb18a3a24a70fbf617f2a6d39fd41d4978dd2c8b67687fa003594300e4beb2fc0b2f0c2425cc1c6fd1d501cda50
+DIST logwatch-7.4.1.tar.gz 464970 SHA256 35ec31f9fe981aaa727b144ab3ff2eb655997d8ccabaf66586458f5dfc3a56eb SHA512 f53400e6654b498371265ade82d51f0625904a33400f7f82b2dc8522ad561c8998fd9f23d569281f031142bb527fc1b38af1d7534fe3b3aef23780b0152e67d4 WHIRLPOOL 947f0796f5313c9eb5aff3cca8b47a861eda3ff0b3b65134a11792ddca2262fbd8fd0bdf83ce430d06efb4905187ca82a6978e6b5ae656ade63a7d181cc3faac
diff --git a/sys-apps/logwatch/files/logwatch b/sys-apps/logwatch/files/logwatch
index 4d4a2227b315..50ba356d3984 100755
--- a/sys-apps/logwatch/files/logwatch
+++ b/sys-apps/logwatch/files/logwatch
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 if [ -x /usr/sbin/logwatch.pl ] ; then
+	mkdir -p /var/cache/logwatch
 	exec /usr/sbin/logwatch.pl --output mail
 fi
diff --git a/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild b/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild
index de122ecfcc6f..303432cd8f96 100644
--- a/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild,v 1.2 2013/12/20 08:27:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0-r1.ebuild,v 1.3 2015/04/03 06:14:30 vapier Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
index a68faf030744..d8739fdd8aaa 100644
--- a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild,v 1.10 2014/01/26 12:18:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild,v 1.11 2015/04/03 06:15:37 vapier Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~polynomial-c/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/logwatch/logwatch-7.4.1.ebuild b/sys-apps/logwatch/logwatch-7.4.1.ebuild
new file mode 100644
index 000000000000..c95b7db90369
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.4.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.4.1.ebuild,v 1.1 2015/04/03 06:21:56 vapier Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/DateManip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.4.0-openssh-hpn.patch
+}
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
index 246cbe93de3b..1fe65dc98602 100644
--- a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild,v 1.1 2015/03/21 09:37:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild,v 1.2 2015/04/03 01:33:32 vapier Exp $
 
 EAPI="5"
 
@@ -85,6 +85,7 @@ lfs_fallocate_test() {
 multilib_src_configure() {
 	lfs_fallocate_test
 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 	# We manually set --libdir to the default since on prefix, econf will set it to
 	# a value which the configure script does not recognize.  This makes it set the
 	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 5c7435494ae4..a744cdcae91a 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.62 2015/03/21 09:37:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.63 2015/04/03 01:33:32 vapier Exp $
 
 EAPI="5"
 
@@ -85,6 +85,7 @@ lfs_fallocate_test() {
 multilib_src_configure() {
 	lfs_fallocate_test
 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 	# We manually set --libdir to the default since on prefix, econf will set it to
 	# a value which the configure script does not recognize.  This makes it set the
 	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
diff --git a/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild b/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
index 726c09b21fe6..7d6217abbbc0 100644
--- a/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild,v 1.9 2014/08/08 08:09:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild,v 1.10 2015/04/02 17:30:54 mr_bones_ Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ inherit pam flag-o-matic
 
 DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
 HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
-SRC_URI="sourceforge://opensc/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild
index 29121658752a..d5dec59eb2ba 100644
--- a/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild
+++ b/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild,v 1.3 2014/08/08 08:04:00 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_pkcs11/pam_pkcs11-0.6.8.ebuild,v 1.4 2015/04/02 17:46:27 mr_bones_ Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit multilib pam
 
 DESCRIPTION="PKCS#11 PAM library"
 HOMEPAGE="https://github.com/opensc/pam_pkcs11/wiki"
-SRC_URI="sourceforge://opensc/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
index fb3bd9ed5bda..5f073993baee 100644
--- a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
+++ b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild,v 1.2 2014/01/05 01:43:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild,v 1.3 2015/04/02 18:56:38 mr_bones_ Exp $
 
 EAPI="5"
 
@@ -32,7 +32,7 @@ RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
 # Products or for use with LSI Devices to its Subsequent Users;
 # (d) Distribute the Explanatory Materials related to LSI Binary Code only
 # for use with LSI Devices;
-# 
+#
 # 3. License Restrictions
 # 3.1. LSI Binary Code. The Licenses granted in Section 2.1 for LSI Binary
 # Code and related Explanatory Materials are subject to the following
diff --git a/sys-cluster/cinder/cinder-2014.2.2.ebuild b/sys-cluster/cinder/cinder-2014.2.2.ebuild
index 6cd2114cab23..4f2bbb2219b0 100644
--- a/sys-cluster/cinder/cinder-2014.2.2.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild,v 1.1 2015/02/08 02:15:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.2.ebuild,v 1.2 2015/04/02 18:57:23 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -122,7 +122,7 @@ pkg_setup() {
 #}
 
 python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
 	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
 }
 
diff --git a/sys-cluster/cinder/cinder-2014.2.9999.ebuild b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
index 8c2f834ca502..5fbb3925af28 100644
--- a/sys-cluster/cinder/cinder-2014.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.4 2015/02/08 02:15:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.5 2015/04/02 18:57:23 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -123,7 +123,7 @@ pkg_setup() {
 #}
 
 python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
 	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
 }
 
diff --git a/sys-cluster/corosync/corosync-2.3.3.ebuild b/sys-cluster/corosync/corosync-2.3.3.ebuild
index 3df5bacf7fc4..a3615a1050b9 100644
--- a/sys-cluster/corosync/corosync-2.3.3.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.3.3.ebuild,v 1.1 2014/08/12 15:27:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.3.3.ebuild,v 1.2 2015/04/02 18:34:19 mr_bones_ Exp $
 
 EAPI=4
 
@@ -76,4 +76,4 @@ pkg_postinst() {
 		ewarn "Make sure you backup your cluster configuration before proceeding"
 		ewarn " "
 	fi
-}
\ No newline at end of file
+}
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
index 3b43b5f62167..0d5beb61271c 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild,v 1.1 2013/11/02 19:49:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild,v 1.2 2015/04/02 18:58:08 mr_bones_ Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ pkg_pretend() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
 	# Merged upstream in 1.27
-	#epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903 
+	#epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903
 	epatch "${FILESDIR}"/${PN}-1.27-fix-daemon-state.patch
 	use static-libs && export STATIC=1
 }
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild
index e4a024aacfee..6dfb8fdc2eff 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild,v 1.1 2013/11/02 06:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild,v 1.2 2015/04/02 18:58:08 mr_bones_ Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ pkg_pretend() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
 	# Merged upstream in 1.27
-	#epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903 
+	#epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903
 
 	use static-libs && export STATIC=1
 }
diff --git a/sys-cluster/libqb/libqb-0.17.1.ebuild b/sys-cluster/libqb/libqb-0.17.1.ebuild
index d0aaf9700baa..bc5547b3a20d 100644
--- a/sys-cluster/libqb/libqb-0.17.1.ebuild
+++ b/sys-cluster/libqb/libqb-0.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libqb/libqb-0.17.1.ebuild,v 1.3 2015/03/24 08:52:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/libqb/libqb-0.17.1.ebuild,v 1.4 2015/04/02 16:44:59 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://fedorahosted.org/releases/q/u/quarterback/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="debug doc examples static-libs test"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild b/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild
index 3c9d514be49a..cb5afa6cbcb6 100644
--- a/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild,v 1.2 2015/03/24 04:13:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.2-r1.ebuild,v 1.3 2015/04/02 18:58:55 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -200,7 +200,7 @@ python_install() {
 	insopts -m 0440 -o root -g root
 	newins "${FILESDIR}/neutron.sudoersd" neutron
 
-	#remove superfluous stuff 
+	#remove superfluous stuff
 	rm -R "${D}/usr/etc/"
 }
 
diff --git a/sys-cluster/neutron/neutron-2014.2.9999.ebuild b/sys-cluster/neutron/neutron-2014.2.9999.ebuild
index a33563e4fd20..7bf76a157cc7 100644
--- a/sys-cluster/neutron/neutron-2014.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.11 2015/03/24 04:13:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.12 2015/04/02 18:58:55 mr_bones_ Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -201,7 +201,7 @@ python_install() {
 	insopts -m 0440 -o root -g root
 	newins "${FILESDIR}/neutron.sudoersd" neutron
 
-	#remove superfluous stuff 
+	#remove superfluous stuff
 	rm -R "${D}/usr/etc/"
 }
 
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
index 26df2c5f7fc5..692876410fea 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild,v 1.3 2015/03/24 08:52:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild,v 1.4 2015/04/02 16:44:39 jer Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 
diff --git a/sys-devel/libtool/libtool-2.4.6.ebuild b/sys-devel/libtool/libtool-2.4.6.ebuild
index 02456f00f06b..6ed02aa202af 100644
--- a/sys-devel/libtool/libtool-2.4.6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.6.ebuild,v 1.8 2015/04/01 08:32:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.6.ebuild,v 1.9 2015/04/02 20:02:04 maekke Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index c2c0e21e4e61..d79cf6e890f5 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.12 2015/03/31 07:40:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.13 2015/04/02 20:05:56 maekke Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="+xz lzma lz4 lzo xattr"
 
 RDEPEND="
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index ee36a45956b3..ef7614a7581b 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,100 +1,44 @@
-DIST genpatches-3.10-67.base.tar.xz 1011628 SHA256 148e5bbc92bbc59e721a77c2a02c963590a844f208cf3bf42fbb80b72cf969c0 SHA512 cb764718daa1f34a1bc0dfc226b0d3db21e17c604ac4a00b1d937cdcc36daee43ac13ada02f9ce1b939a57953c48f5dd2aaf5ae644a70d8b33ab46fb6cdf1366 WHIRLPOOL e2163418ef83b5d0a598d3ea180764bdceee33ca2de1a5135a930f5d9ae474b4f157ff33b54cfb30c5af4119f89ff58a2391c92b3b7c062397d880ae8b2be6ae
-DIST genpatches-3.10-67.experimental.tar.xz 48592 SHA256 e94c0fda28f853ac362895d0274b31ec980328d74defe1b7841bdaa5092e6277 SHA512 0cba9d0fa4ed5d6c0ca52994220bfc5e30a9e7e58046d7c57643136f61e4f35efcde059e34e095b66897ab4bcdd4f095133900872603f80b825fe1f66315cf25 WHIRLPOOL 622baa54b11e37a95da1b3fc159c5d01d30567023e2b233066cadc102f7a12d83c62cf0984d19eb817ad8fe9b863379966b1e8f4153d7ff5f193b814dce7ed24
-DIST genpatches-3.10-67.extras.tar.xz 17816 SHA256 8252bf806ee326f5d65c5e908ee25f2456140339167a5fa15bf9459eaeb45476 SHA512 b9976a91186c1ff5d533fc965db6a6b465d3aeeeff077a22aa244241e0e03721dd9a7342ec78fd880cc5cd853afff19fdbc59c924c2d8f233a55a50493bca875 WHIRLPOOL 149977d5b979e2a02399fb1e076d96be50c067338973053a42b52b3d31dfaf2f74d4b68d9684b63715b14c59d193d425e7194e002dee48c32159d84372a12538
-DIST genpatches-3.10-70.base.tar.xz 1052868 SHA256 cff162044a6744a0d773f5cbfdc4f108828f50f8106fd39644044775521b4be9 SHA512 9bd26053d1b808f7eaa1bb2b2ab2f269014edab65dd57c3941e794a78e84f8da5b65047ade595b28e7a72707d77f4401e0fc5468cfe883d1ae1a8bcf17e523b6 WHIRLPOOL f3ff1cba0849f42e455543b7d3fe9ed4294d65845032e92b0365c057952df4f97e60777d7c968a6b2c94f58512917dba338caf956e54dbfad7fdf589647a884e
-DIST genpatches-3.10-70.experimental.tar.xz 48592 SHA256 0b73713c99338ac0187d490533e5f9798f541e92668c95bd9c9ab39017367851 SHA512 257c9adfa4cae488ce4fb018ca2b7ccbaa070a06c6bff56024a37fa07e6c8593a4e622e8984e05c2b0c5c58e4153af77fd34f12b3ec563fc97fc3531635055af WHIRLPOOL fc4e34814dfac5a6d7e1f150ee025bc478ce9d31c55d764955b997512a309583182b477b27a0cabccd7db26fa7d4f17af277fdbfba8b3b94dd1ae17d9040905e
-DIST genpatches-3.10-70.extras.tar.xz 17820 SHA256 565a289eb9858d71d51dec710e20802ad2234b9529d4c9e15c095bece5c59f42 SHA512 5c1c69b530cba6ca27d542b287737c2e906d2b934fd89723f0a3522f8c7bc50a0df63cc871aee2cafcaae5d231cda23aa84ebf6b2198c8f3e145a26fc0d9fd01 WHIRLPOOL d4d453c6cf4acd5ae08ffb4d8e03fbdbf8e7b046af6c7e6a94505ccd1284145fa41581b58236c903fe558f3244bce11013b5e9a66d7fc30f67891b358671c484
-DIST genpatches-3.10-71.base.tar.xz 1062324 SHA256 b97c00ef46c62f53132d96c8132e325d85b2ffa0543a84cdeacdd416f9c661d9 SHA512 a729bbb9cc24962449fe73d23f5dc7b402b709b62ddf4c1fb392ab7337180d547a6e364d96d9556357fa01e7488f87edd1db89f0b436c1985277f2a948391d32 WHIRLPOOL 078b4aeefe42fac05fda3f16e719185c0ea6d994e797ec00df21679431433241d48cd499f4673eff2815d6fcc55567865543c5d08f148027c813968a8017bbd3
-DIST genpatches-3.10-71.experimental.tar.xz 60204 SHA256 ed06bb9390a91985fb10612d98dd03c40e1db64b1b7ed64d9c59711692e30ffd SHA512 783a4974fae3f9fcbdbf870073fadc4e2bbcb787236c25bf11b413ded7355bdc5b70bdb430de66704d66bcfcc7c6472f6ca8688c08d2f9061f2aeab5473ab2c9 WHIRLPOOL a876aba7def3dfdafc4449b238dc5a8e453d7bb3e90f283810e45991a4d25e5899d840eca162a52d5b6a2c780577062f3990151c37e9e67fa107cad543126513
-DIST genpatches-3.10-71.extras.tar.xz 17844 SHA256 48f51a7ac9049343041b69d0ba44d0d44404be4569703b2f94244b0fcdf98beb SHA512 413a2a21809df35d6a721546d07f8c1e4a906a2b05dee42d38c9848e2bdb1d71bd2b8c411e4615aad21617d896ae602fd1495b9bd3667fe8bcb0d32835a76250 WHIRLPOOL 17f519f3140a240725bc669098a753577dd26d3b90e86bd35dcbe577eaed5aa77dbb633c84305e6d7b86747a4ef82a4cebdcc1e0da89a889dacac2ac89b2cbd2
-DIST genpatches-3.10-73.base.tar.xz 1073332 SHA256 dbdcf36f67ec693a2f449a0770c231bc67a029fe5e8bb7e3ecc99c8744eff086 SHA512 47dcb71532ed200e44e5894f410b737177bf3dd468c0d63f3426f13f3872811a0023f88c3f259f2f02b85361cfbe5c1298c751cb2dd985d7824fb70398846d67 WHIRLPOOL f8d4c6b7b4e935bde54e51edad5853ef7a5286f319bd4df3fda71de818c0f4e795a5231813fe4f3608a6017a6f0d7e6d9202c8c264dac97a07a6d47270ed3425
-DIST genpatches-3.10-73.experimental.tar.xz 60204 SHA256 ed06bb9390a91985fb10612d98dd03c40e1db64b1b7ed64d9c59711692e30ffd SHA512 783a4974fae3f9fcbdbf870073fadc4e2bbcb787236c25bf11b413ded7355bdc5b70bdb430de66704d66bcfcc7c6472f6ca8688c08d2f9061f2aeab5473ab2c9 WHIRLPOOL a876aba7def3dfdafc4449b238dc5a8e453d7bb3e90f283810e45991a4d25e5899d840eca162a52d5b6a2c780577062f3990151c37e9e67fa107cad543126513
-DIST genpatches-3.10-73.extras.tar.xz 17844 SHA256 48f51a7ac9049343041b69d0ba44d0d44404be4569703b2f94244b0fcdf98beb SHA512 413a2a21809df35d6a721546d07f8c1e4a906a2b05dee42d38c9848e2bdb1d71bd2b8c411e4615aad21617d896ae602fd1495b9bd3667fe8bcb0d32835a76250 WHIRLPOOL 17f519f3140a240725bc669098a753577dd26d3b90e86bd35dcbe577eaed5aa77dbb633c84305e6d7b86747a4ef82a4cebdcc1e0da89a889dacac2ac89b2cbd2
-DIST genpatches-3.10-77.base.tar.xz 1118032 SHA256 73ccf7deecae85bafe3d635952c21bb6b2488c8391265f8d98ca1d2601cbdde4 SHA512 2f11d2e114dc373d24a0d24b34a10420d81dacb464f18d5f0b2035b1e8d9fa1cf530ee9b0c9a8f7f0e69a0f9ab22a9a055ca06bee4fd655b30328ef099a36643 WHIRLPOOL 4971fc22eedbb46cbb0f067b820d5625c4c1f8af73f68b7ec7b42a4556508b6b6b683b77830f7b7696d04b99d287917558780aae4111d15e98d9d8dcbc5a5fb2
-DIST genpatches-3.10-77.experimental.tar.xz 60200 SHA256 b40e56e1919e1eee6beb3fc2a839df4f2498bc75c2410452641255c48d515a0a SHA512 b4ada238cf5a0b9c07921efaba07d7516644f0236e1e9b52519012805c0bb2baf15f1138f8191087335fea5a31713d789951b467e62b02c8c9571b0388570226 WHIRLPOOL 87b83813b35316ccb77cb0fab172acefe3f260cedf89914ac806d86f2c1a3cd5f1be4d4d00491f326b2661fe2d7a5f4cf25b1091c80503c5d6b60b863dcc7208
-DIST genpatches-3.10-77.extras.tar.xz 17840 SHA256 1c4b553b658adf6fd3422fd22cb56e9862bf705e25f222bb9b66f86a88567b04 SHA512 4caf2a36ebb49dcedbcaf825a45f24442f9881cb30438f43616172da7c73f99daa4ccc01e6a672c14a931d445be1f8df1f9459e70c547c54bc289021a35cbc0f WHIRLPOOL dafda312a548db36acdacb48278051176d9853c708a58d65764a1419d2d76b97224ec5070b18b4fe29b75475f7e8c17920bdf90d0a015f4cedfe6c33ec7a6c44
 DIST genpatches-3.10-79.base.tar.xz 1132372 SHA256 64475a8e1a2dd37818b608294f49b655f28294e58c04903ea9a70be5902d62a0 SHA512 82060d5207760f9e21fd8a2fa82e403f4a236eea09945e08a4528819e45a899893cb977f8b28b57ae97ec116fcb2ca006b0e9270301adc4a1e4f82324227a16c WHIRLPOOL 8756cc102575d36d04b92aaf3763c20ad0578bbf167fbb62a4d472816bd8566f4e345fedb056f64971160215843005421c82b1b5c36b1c121b43d9648be7de9a
 DIST genpatches-3.10-79.experimental.tar.xz 60200 SHA256 b40e56e1919e1eee6beb3fc2a839df4f2498bc75c2410452641255c48d515a0a SHA512 b4ada238cf5a0b9c07921efaba07d7516644f0236e1e9b52519012805c0bb2baf15f1138f8191087335fea5a31713d789951b467e62b02c8c9571b0388570226 WHIRLPOOL 87b83813b35316ccb77cb0fab172acefe3f260cedf89914ac806d86f2c1a3cd5f1be4d4d00491f326b2661fe2d7a5f4cf25b1091c80503c5d6b60b863dcc7208
 DIST genpatches-3.10-79.extras.tar.xz 17840 SHA256 1c4b553b658adf6fd3422fd22cb56e9862bf705e25f222bb9b66f86a88567b04 SHA512 4caf2a36ebb49dcedbcaf825a45f24442f9881cb30438f43616172da7c73f99daa4ccc01e6a672c14a931d445be1f8df1f9459e70c547c54bc289021a35cbc0f WHIRLPOOL dafda312a548db36acdacb48278051176d9853c708a58d65764a1419d2d76b97224ec5070b18b4fe29b75475f7e8c17920bdf90d0a015f4cedfe6c33ec7a6c44
-DIST genpatches-3.12-34.base.tar.xz 997560 SHA256 9a242380699e3e176f21a68ee43eeed99375fac35e34edfbcc23de7fd48a0aee SHA512 0aea3e42b0be0865e55e46aaf6b7ebd768a46ee735f15ed00a34a9a1072004e616a18a8c7a188632cb4d9f98518c4377819c64dbfc8fbd3018c33c6968daba4c WHIRLPOOL c2e43e450f47d62063a81e2502887ed7f37617199926dd79ee199bde7f56587bfc8e4f318e6f257c31c79107f849d93e63f7db5393c7b21b35219d43e44070bd
-DIST genpatches-3.12-34.experimental.tar.xz 46552 SHA256 5fdf0c883c58feda21ee9a3b807bd3aaf1f91c7ecc9f3cbb1052bc7ab7fe5933 SHA512 85e844ff772baa502ad4e4f083a8181e4d22d1485015163073fac67f72025eccc884ce8a95b985b210bd0dfa4905350ee008a2ef4fd9bff2941d96efe9f50526 WHIRLPOOL da98fc8d52822b59509ea7a62b8744d21c268133ec3e00d1d214075825c674e83c6e611c68908602dd018df912a341df123daa2c6e5a0b75b7d0c7f81104aefb
-DIST genpatches-3.12-34.extras.tar.xz 18204 SHA256 3773eb0b1e4c5df649ed84cfc93a5f2bc54b170d7a68628417772a14005e1e4e SHA512 3670e0bfddd62875b515a57217d2e860badb8b4919948f20c7db7e0aa04218f6acad7f2d8902777c46bc032fd5da19a134a64b4dd408d4c088749445ca4563b9 WHIRLPOOL 49b86193cdadf557e4ead6f21c6df053478fbd5f579ac0d03b705ca341701edf0a6f41102ed269498d516cf9478ca73964c71602008a25d5ac4f16eff08c8a11
-DIST genpatches-3.12-36.base.tar.xz 1090156 SHA256 22752940466bcbd5fa146546ea747e6b4d0f3bab0f0a2848b91feae1348c26c2 SHA512 e88cfe6fffc0d1624f7ae56c81a6b579057b7d7169c56bc060778bc4161b5cc7ef1ee7b86dfc04ae3e5c5782642125494035afd3c23db13c1f4b9899d1770136 WHIRLPOOL 9add6737542395a420f5aaaabc7ecd1d1f0a2e8893f9f092f53ddb616ed0d8e73726777cca3d4c6fa50a56e30df947a5adde77a3494cbf641e752396934fbbe3
-DIST genpatches-3.12-36.experimental.tar.xz 46532 SHA256 676793e55218aedbdcf7ccc59a72e85642bcef1073b94c9e7067b7139b36af41 SHA512 4d5a9287b96004bfc29bebe3fa62533564296c1f69184c2c6db24f061c1af217283901013655ed700019c9782fe9798b5099fed18e69ef5cddf8cb784f1367c6 WHIRLPOOL ae3be1a9585aa7d68e0035be5d0258354a649023e6b0acdf3d0c32cb791ad3ae7355419d94ed7107b9833dd0edc8014d46ca92c797ed553045d3f81f06ff6400
-DIST genpatches-3.12-36.extras.tar.xz 18204 SHA256 077da6280861d375670202ebc286e90ae4ea750bab44970f7ed3a2bb966f5c3b SHA512 3583f02903ac987cc57e5181ddb54f4331482ccde231f55e87e0d3cd10509c030d234b54e2992c29bc55f279a372999cf91c6b07028709b629bd7db6820e3150 WHIRLPOOL 0154a6026a108f9731ae09052fea8db1fe88ab70020a1efdcbd0b3d57f47c2c9b2ebf797c15d31dfffd3d1331e5c38f5626f67d0031af21359d7838233ed3070
-DIST genpatches-3.12-37.base.tar.xz 1163516 SHA256 cef26b498f473c040fd129ba64c37ede74ebf8dc3826753757b9013e270690c6 SHA512 77d4f9e4e4ed6ceaaf4b57ba9912821f04e00dd4d5da7ce0ccb11e4b7a3c94f3cfb9fd28d76cb0b955b9b27101fb3ad2ef3483205e862327c26a3f2ac50a2463 WHIRLPOOL 799df9df163cd7fb00244da1449276404ddb57e3d36a47a71628263a537c16a617e05c61063002208ae4b8e84d639664920eaddc4130888fddc480b23efcbe8c
-DIST genpatches-3.12-37.experimental.tar.xz 46520 SHA256 b572c3057ae66d2419ac4a40782a747767bba025bab57e76b969c8e32f6cb707 SHA512 da99d5977f083b0bc631e88fca7b641036c2aab6b6b0bd299373168fc11803245983e38bafa1056139963d7f09368fbce7c91488e4fb853f67927c9273b4dcfd WHIRLPOOL a79cdd307a80193e89e83b25b18973df938a3da701bd1e363c2f4e00efb6715cca0e8490c1d7fa855a21a68e1bb3f5ef3a333e98ebcf5091ab48d0a5aff27312
-DIST genpatches-3.12-37.extras.tar.xz 18236 SHA256 916c726c33bf1e621932559768918372b6d20cae67041caaee7538ec57bf5d17 SHA512 2516cfb4c2245b23bfafbf5ebbd4eab6118508d6700b58156f292e411c7ed569636cb16c930081220d302d6ecbdad9c9e99edf5ad26f39731f8bb8703ab5051c WHIRLPOOL 36c82d8fc1a95862d642c9f32b0b51199624ed1effad4d62807c393bbe9b311472e5ffa91aa8d2ad53fc25f9380cdcd6bd2120f58c17bb8a8635be6f8cf319c7
+DIST genpatches-3.10-81.base.tar.xz 1159264 SHA256 3afeff08645cd2705409084668da72aae72ef1a8a797e445d6cbfc445ea1bfe2 SHA512 fe319a956a3bc6cbce4928498945e80a6aa3b7db35118b1ec35e1a430984bc075bf28db655e70f550307c63d69247b6c4ab5e5e31e82927ad1f60a71b68df791 WHIRLPOOL 3688d255033ae0aa824d575735c33c69c9345d0cf274a9dc7b125bbe02986574e967c6fcce17d41ab0b87c4f78146bdc82d721a66820b7d3af8af6a2beac3be0
+DIST genpatches-3.10-81.experimental.tar.xz 60200 SHA256 b40e56e1919e1eee6beb3fc2a839df4f2498bc75c2410452641255c48d515a0a SHA512 b4ada238cf5a0b9c07921efaba07d7516644f0236e1e9b52519012805c0bb2baf15f1138f8191087335fea5a31713d789951b467e62b02c8c9571b0388570226 WHIRLPOOL 87b83813b35316ccb77cb0fab172acefe3f260cedf89914ac806d86f2c1a3cd5f1be4d4d00491f326b2661fe2d7a5f4cf25b1091c80503c5d6b60b863dcc7208
+DIST genpatches-3.10-81.extras.tar.xz 17840 SHA256 1c4b553b658adf6fd3422fd22cb56e9862bf705e25f222bb9b66f86a88567b04 SHA512 4caf2a36ebb49dcedbcaf825a45f24442f9881cb30438f43616172da7c73f99daa4ccc01e6a672c14a931d445be1f8df1f9459e70c547c54bc289021a35cbc0f WHIRLPOOL dafda312a548db36acdacb48278051176d9853c708a58d65764a1419d2d76b97224ec5070b18b4fe29b75475f7e8c17920bdf90d0a015f4cedfe6c33ec7a6c44
 DIST genpatches-3.12-38.base.tar.xz 1190368 SHA256 2ddaf33ddb8d4f31e4ff99ddcb6cf43628e5b125cd2dcb4fe02ded15162e72a6 SHA512 85234c0512215d75f542029e847789a1f79d78b866beb2a381d6b653bda5fee29c2c999601586b9e795b9f4cfc4109179abfd6a764da2da6e2422bdf3701849a WHIRLPOOL 7043c249b061515b15b0a151c192700076694c3bd59ec8f78662401ac73985ad82cb3704e69576f7d49bfb128dd03604e96830cc0f49f03bb79caf9b986a1aae
 DIST genpatches-3.12-38.experimental.tar.xz 46524 SHA256 44781424b4a2e6a04005ec257130da77c80319c75396a304bd448e85de9e9376 SHA512 64060a03dd125a4c77c35baccd907247dffc76676c0fe2532bd8777ebf24f118125933d2c6f2c9495492c253d195236fd92058b54f7d1177c03ecbbd9ea53647 WHIRLPOOL 105af4baa2b0120e8f8ac10b4e4ea4c4497ef4fb50e8ab8da255ce92048b7e80c690b232e1faed24206e35edd7da84c7b2d78ec38a820eb39a9a5f256dc2b41d
 DIST genpatches-3.12-38.extras.tar.xz 18236 SHA256 b6174fd3e7af18bdb30f9494a5ac1d5f19d1008ebb0494f5709c21982500801f SHA512 8aa18b89dbb37af9dd82fc2e6e88e2e8875298f5033737271a8b7651a0756780cef1c6b632adf6fb1cff2d5e4345c981366cebccc135e33d11efecbacf57ddaf WHIRLPOOL a258b58872255cdc98bb409e13b649d1993731e64400e2e6bce222296727689849afbe32b3d06e673cac6a41bd378d7c98ab7ca4aed1800a3c4bb87e4736115b
-DIST genpatches-3.13-14.base.tar.xz 292688 SHA256 889aeb1d1d6173d9f7b6a92312995c6085e91788d4c683bc8cb6f798abe3973e SHA512 04480bc989431630fc9d3e4a0d81fe6bb76951044a32827ebf12aa34ff6c4f8d022013593cc87b4dee511bf1608a7c6e4789da8794369e72a3c1da7faab20ddf WHIRLPOOL 58daad871dab13573e33432eb74c0d129506063397e3e97fccf092c8c0140b4ee042b084b20162b5c6c32fa812ce3f2a5565d692d33bebab0c34a1c6f6e98346
-DIST genpatches-3.13-14.experimental.tar.xz 50996 SHA256 081da6b56209f08f9bdfce4e7854c9c275d3085344be0b211032d7e8d738a466 SHA512 3dc38c374de14d919490d002fc93a9aca529801eb8e7bdc608aa7b1cc8f3893ebb2aaa79fd36d892f1c967a4494a7e0f92ea14cee45ccfe1bf8da65678f575af WHIRLPOOL 808ec9b834c25c93da80bc1a3807366c3308c1685bdc41a5156bb707fbef39225de5816254cbea781fb4426ecad129ade6161cec24a60df3380ce781aa2297ce
-DIST genpatches-3.13-14.extras.tar.xz 18240 SHA256 aa302dc1de4a64fdf1b01b2e0f9b949be3b91e0d1d43ffa99d701076c13b83a5 SHA512 67621934e3c437cca531914368aa51e35c448ad44f98e583b9eda90aec005b21c0d0f40ef25182579577444c6eff1f1cb8fa853c862e2529a9dcaf56d5e69da6 WHIRLPOOL 9a7dd161e24cb5da8edf816c62c2ef0f660f4d147876c3b58f8a6de33ef56ee384d2e6c207db94b4c7dbb755fc3d215cb5db53a71cac3225e985f66651b2f14e
-DIST genpatches-3.14-29.base.tar.xz 636908 SHA256 2b2f1f4cec536b879c070ddfa8fa1ef430550ad25051a377a9598a4305e3f926 SHA512 9ddc68907d87009ca561d8c41c7b460078bbd9a889f601610d4f09ed468f26a78a1f095c06425ba720172f20f8af693d32ac774dd1c5a28a3e4934da2299a780 WHIRLPOOL d1da7ab4ebfc24e75227be10b1f8a17ee537fb20bad0612a09be66cf6e242d76f075c342e68d4231c1a9fe3bd2e09595e052c9d6b9c0b05d6909dd22bbc4d21c
-DIST genpatches-3.14-29.experimental.tar.xz 51224 SHA256 02e428aae2c1b1844006488b7e9ed5ebbd93f869fa96e8e76bacc92f6b5fe255 SHA512 c84296d0450311900d1d3d3ef50ae58edf1e0b477ff73cfe443b66d84276ae94394d2eeac76a724f85e6f7db7e124dcd4365b53898dbf7c6df6447bedd84950b WHIRLPOOL 3233901dbd2e7932c8c33e78dcfee67eecfe9ff0cc98391af0eda66bf14261c978bdd8f0ca7161dcc393b409c79744c9e249b7dbd11bcf07c46b5387d9abedff
-DIST genpatches-3.14-29.extras.tar.xz 18236 SHA256 dc72cdb2e4538b919a6069774d40506500d9ab7b3400072690cf0ff6a03fc7af SHA512 f11c14d9c90d3db521a6a436e3a13e339b481b7d21831011bbce90c59501c797c252a45ffc53411c00d9094c0e833dd60348c43d24d29456dcdbcde3ab94babb WHIRLPOOL 3be403396c1093a7a925574c8d77f66702a9aa35135a354f8a81213936c8d409c661dc4731de19b72e69439dddba69bd07d61323d17e3221320e17aafef286b3
-DIST genpatches-3.14-32.base.tar.xz 711936 SHA256 1812e388236cbc08f59c4a6266dfd2a4d2444187d966148fd14f3a2f0e20cff7 SHA512 5f0048a825727a858f6b6b5a44531fcbc925f58a04417a5fc8fccfa346a652c59164ba83c5c73146e856ecb7fdb9925df5b62bbd4d85e1f82e3be491304feab6 WHIRLPOOL 2f6ceffc2e76e7c1421008e9015f654502807841309d2351827beef28d0e33710a751709489fa03a93b70542bbec75ac96aaed57d6b71daeaa7b56de85f336fb
-DIST genpatches-3.14-32.experimental.tar.xz 51212 SHA256 2007f6ce3174673e3c16fbe6afed3456522102708a7db7f9cfa1f3e138c7f729 SHA512 5417e71ec9197e9d1478134a17036c51291903165a8a34882e6c374f363260752e9863fc1c6c0ca1f7ba5e0b117d371721ad6e8876379e47a23006004f36a14f WHIRLPOOL 3577647cebb0f4a9375a4afb4e3a53f2fb17bcad7e6caeb20664c655157382bdd2793d6a44c69b34ef56aafbc84ba65dcccda0f751aa01fef4bda71f1238b442
-DIST genpatches-3.14-32.extras.tar.xz 18224 SHA256 2cedb98b61074f64ee2bd9d34df1d4ebb65c917b4d5c325010910b265250398f SHA512 e29c18502a01144ba2fb59b80f7398511787c203cb71ea2faff9c50ae194d3a216736a68510406c4378ea8945745e4e4b6b134df70c7f3dbca1ef4f2b263b0e7 WHIRLPOOL 584b0e0a126fdfa18d67628f05ee315f5cbe1e5be7dc17655a6246f0b6d5325e8f89e17ab4c19afc70acd065a9605ce81ba373b41bf1f6514396f817ac1c5f44
-DIST genpatches-3.14-33.base.tar.xz 724864 SHA256 ed5310c921e513bd60a38a360bbd9f1e219a315f55bff03b58a586b49ee02201 SHA512 72c2618fa57b64c06d2373f7e94465fb2ef5e67706b947855f508c1e3ac491d7fe27643fd099993bb84a27f1734e45fdf49c7d9d1fc6d07fce4ccf56a3e06f8c WHIRLPOOL 1b06ca8a83d0780523cddc8dd7b5ff3f4a9490a6656e87ebfe18fc767f2e2e52fb1e117ade976063fb99dbbea42310526c079ad5baed35570ee082fc5ce9a116
-DIST genpatches-3.14-33.experimental.tar.xz 60312 SHA256 048b3b9737313bd3a3e311c33c3981553b77b63fbefd92820c59f957c3c8ba6e SHA512 ee14fc2503da2b2029ad57a15629cba1a46055dfccf628a1238e82da45ea771c7d43c55f3d1f0897725f7fb8b511ed4cba07e3b64b1a4af8d42960382fd9bccc WHIRLPOOL 011932eebfa3704d8877bc4a531fa891a89cf9184786a44864166d0d538e96629e839be7b436486f2fd3e9331980626f360a3083b6536c930b6fe1e8e685401d
-DIST genpatches-3.14-33.extras.tar.xz 18264 SHA256 1b25f873b53807751386c1c72a45b2dc7d7c67ab1acb853dfdbd8af5cb89d75c SHA512 2036b13f12e1d6f896c185ad133c9f431245db21b344b98f2d6eeffb2c2fc19a111a440ad49556e905aa04a739f8c7aed0e95aeadea2f0bb0fd8e93d0f9c6edf WHIRLPOOL 7aedd095c10f3b3b1c7cc82e917726eac3abb962e2efe6978244e54091720bc59bb3cc3874104d838c9fec856f62d126f24a3853f4871abd06c33b3579802192
-DIST genpatches-3.14-34.base.tar.xz 744364 SHA256 fe8f56fb27962a72b0f5499874c5b35ff760b72d742569a598c9cf0e1f4aca8f SHA512 ccb319f42fc7bf31de1562e3ac4bdf890608c16b098a94b482c583b6813df46701c9975a70aecb827dbebf67eb019ce17473d28b6af5ff9a06337e1a085fb1a9 WHIRLPOOL 04cd157d22f21b3bc3bd3280b8fc7973e0ba1c09013daf37ae50071eba3efe65a5311764e0e9568854158108d17f40df28b2d8b01359fefe5439ccab75337698
-DIST genpatches-3.14-34.experimental.tar.xz 60296 SHA256 43eb15500796bd0e9eacffaf514dbd5e1aac9babfc169c8aae1d1661357746f0 SHA512 6b3459f11cb8863f2a9028da17d7a7ed5edd2e9e9dc5c6528cc8bfe8a8f1c2f13e2f820a483c51ec2c59718dad02310c5e59c2d70cfb4e61040491f0be0c6a5e WHIRLPOOL 678755e546340ab512f459b52e0288262ab395a387d62fd416f215836b08ad27588e73f1ccaee008ed9b0be683d59024870a0d8c6e344b75046d553c7f2eae21
-DIST genpatches-3.14-34.extras.tar.xz 18264 SHA256 e5a251cdf74c9de10a72bde882fae3b6e109174c833aae36e689eba375dbf091 SHA512 96939a5b4f221792717a434ab10d97e5fd691a0bcd9bcec0d9ad2f88df8d4ab9d16a032a67f94c3e1cb25b4f664bf1c40e9609f3ad7787a7c400331960656788 WHIRLPOOL a24657f1d0998b96410e7cdf9ea4c427364a031401308437222f4c7ecbe5ca1a37c3bd84ef6d67082752e30a8dbf8938e5481e3bbb9b635789ef2f13f3112f90
-DIST genpatches-3.14-38.base.tar.xz 819288 SHA256 af1d91d3e068f13765b9f56a000a82dcfa6be0f0f3e92ba7598aa67383758c69 SHA512 44dfb6ecddb91131a343db9cfaaa55d43fcd49fa0b90813d78071dc31da4298cec51c7f452391ad675e2c1402e89cebb6e2346601e7bab953d27a2171edf0b65 WHIRLPOOL 6e950a294ec4bd1a7da44e42f9cee8448b5df3c17aeeb236f57a43b9e9356aef017cc5d6736c3a642ba47e00d32fb437bae06d5231f90d5401f59a573ed51299
-DIST genpatches-3.14-38.experimental.tar.xz 60312 SHA256 614694965a318ac8583883de8c66124e4318b1cfe6d1e0cb7b06fd98624be22b SHA512 957617ac3d3bcf40cfdc06a642db911478b525c7cadd96118dd4ac3ff4801a19c48dcfc5442b6ae4c4a196233ac3d8a020bd2326d30e0c270e3376fea10e6dbf WHIRLPOOL 5acd8a0512db3ed1d7dce001cd42d4a3f57abc4c09c52f2280793abefb3817145956f828682bbbcecb3beeb17766af39cbb41de623abc3a9b6dae9fc097bc862
-DIST genpatches-3.14-38.extras.tar.xz 18264 SHA256 45221d59d6e45f374a4ab289fdd35aaea7396736666cbecf9922cc6170d7578e SHA512 885944b1498ad48a78f73de78d95b19bc7daf042f6355412f846f9ce107d3f34d3f2f93acd531ed3b64937f02680ea5d83a3788f9412ba5806957b1095a37f9b WHIRLPOOL 409ff3b392658f5dfebd7e87a36f473f90f1f9c35d3b223d4c84cc25be231080eb5b9af63b770b239302e1cb1762f0303c1c81eed0105472d16473c0e3e2ae67
+DIST genpatches-3.12-39.base.tar.xz 1229388 SHA256 aff386c475000efe6655a58964a47908c0fc6d0bc0f2665b94961ae83392ca56 SHA512 5802731f20f32c53dd59b0afddb70aca952d08b0ad06a6e4519fe075525b8ec7d0c49267cc5d14714f0fe73bc94547ad1b6fe0504998d2571d4188f821a19f93 WHIRLPOOL 32d3302a42e161b602b1f74131beaaec05337cb673919d9d6fa8cd52d67abe20db01905259ec7eb08b8756b92294356fbc15b7ee4802ee61c3a23ddf194a17c5
+DIST genpatches-3.12-39.experimental.tar.xz 46520 SHA256 361ebbeb0391b686d904e8d6b01b92fba510e89fdbd94739f10b81bb73e586a8 SHA512 2030dc9b41bbb5deccf54962a2355d596040b38b7de394248c53851fa961316a5324da5890387a149f8c58cd3649f726e63ba06fc0efea9946a1ac3922890ae8 WHIRLPOOL 12b3f5f1d86b17e254bf68c7c797dbfc0219e78fa3e2f483306decbbbb70a017482815beb3e83bb61a3e81ff93e6549f24fcaa651a97cfc96d2f4a1c95530eea
+DIST genpatches-3.12-39.extras.tar.xz 18232 SHA256 e3676ca478b65884474924747d36a3b697e30f8b8b3405404a1da11e5b34866c SHA512 c830158b2d5710dff4ac902142e1bd712b0501e32b2bad21a123bff94dfbf20f3ab87cf6ab077b9206f4f2d1416c2a7a5d1e1b07c2abc6beb4a0f2ba32e6b678 WHIRLPOOL 2aecab5aeab96664f202069b396c62c5cc496ac725c3ad1ba72b1488030d5f8b01c4a6864adbc1f06c6f0e631aea1bc75374b3968f6e49c9088a74e02c4fffce
 DIST genpatches-3.14-40.base.tar.xz 837940 SHA256 25c67732d96507ee809bfa08dc3dcbe87edeceae9ba4650ac0634a98ae3e8211 SHA512 33f8008cf2ef439c42e085eb094f51b9ca70ef7e5c43c2584d756576eead77ac7ca6d10ff2c3ed6315ec1acc0e330e19e4f6f3dd53e488a70470dc3cd2ff1961 WHIRLPOOL d366581f7e2b4cb2ad806ffd3248c561e9e993ba2998a48b7c4a2f44ac8037d3943c052340f94517bbea23046b4c2fe5ddd00b41c8195fbf60f27f126069508f
 DIST genpatches-3.14-40.experimental.tar.xz 60336 SHA256 d9258d2746b61aeae69b939e38cf4ff563cadb0cc042676625da98a5c3b84623 SHA512 6a567fe55d2ea07d032ce298ae149cccc8e7d5c6664c89c2315a130beffccd1d36221a24ab95652cb6045cb5e7bd4a6ce17c63ca7039c81b4a45fb327609de59 WHIRLPOOL a90bd38cdb829cf0cc40bfa860c048a010623b60a08a7a330688015c342eec7826d17ca27b017687f536f6bec0b25d9a06d6081577470cfcadde8ed7d5a66e5e
 DIST genpatches-3.14-40.extras.tar.xz 18268 SHA256 842118f2712e9d34f0a890affb5805af9dbcaf4e7ee1c7b91ef95b265103b4ec SHA512 03b9198d993e506abe2b9224bdc8d0c82e9f579acdd8cdc5551752b585e1d0791eb6bcae5630bb64ea7719355c8eef207f9ad7e32357acb7e011bad1c3433605 WHIRLPOOL c0be863213e4586b98ffb19e3d5e8292f3bdb524ba335b805be1d83d2ae2133f0b773ef980e9cba8e46e3bc7e357525f38ae0a1becc8ee933db2fa6de5c2f976
-DIST genpatches-3.15-12.base.tar.xz 214792 SHA256 28f0f807f768d5e8819df4be70c74e8ec01ff8c1a4917a0908cf75b8e51825fd SHA512 0f3e9fab4531bc36820c4ee681e9da7ad1bf79859c822ee40f0285120515d4b18a3558f2ae9d8fd22e003492d9f8f6a38fcd8a5ea00984350340f5054b8e7ebe WHIRLPOOL dd5ec234e088d2a9e0fe6c74cc84275e2f532bb4783bd5100c79d15364c9d082029db73e3241aac5f82a106bd5fa88c637ff8eb2bedf33c44243c7bf590af1c0
-DIST genpatches-3.15-12.experimental.tar.xz 55820 SHA256 4c8c5780020bd93f7b5e40101999fb4cb1610a7bc92e1d1c2bb44acff9b4e614 SHA512 51bcc576b0c968924846ce4b21ad4460516d7f1de8e9f0f17b1c606c93f594b189d5cad911016dd7d85b9127121e916ce0f3d1bbd3f245f042ea1387f3b80911 WHIRLPOOL 49be20460f1e9bfc4ffa6992dd27eb3142559897e161910577ae470816dc0bf340cf4cf2294f21f05ccdf30ad6eb74d16829d5dc885e84b2532039906f4b9d76
-DIST genpatches-3.15-12.extras.tar.xz 17664 SHA256 97897a464ff638dda372c8bed7ee10723fde7f370cab2c770fd28b450bf3221f SHA512 251639762bdd1477314a2f2b89249955826848e15874677242c10c56e9f724c54b1afdaeae8479b5326bd4861efc73e8d29658170379a6e1724450335c0c1faa WHIRLPOOL dd38dd64c263dea74f20658e8904bf2f88858cd3f613b16f0361195f9bcb73859310897f35ba501a3f46fe1ccba573e051a61fe42b2d3383bf3750081ff6269a
-DIST genpatches-3.16-9.base.tar.xz 296544 SHA256 03e5020fa5fe79a0bd4c7b4daeff240c327017ad81e6a9f2bc36dc1931971aa1 SHA512 f09db7553c2ba629193284efca527a0eefcca37eafa267c48f3f7b62bcb19d58ad072e9a65fc4b02dbe46b4feafc141eb1b60a859385b908f48c7c4f06f5aab4 WHIRLPOOL 6552bc17c2a412c80230780e5a4ba4e343e1a0861d42d1529bfe0b62d77d2b8b1d7cbb8281f40ea0c23043754606e815db2879754220d8fb5acfd1c092a0d616
-DIST genpatches-3.16-9.experimental.tar.xz 160196 SHA256 93d4794f12dbfea19199e9b4ada3465b0292207f3dd95e5adea70c26e7a9d6f1 SHA512 a1de0276fb449cd4599ccf7f7c82b04e01f7440e84dd3c859d8dd7be99e3fa2b425b3e19d3b40690df4df0a6f038207fe2b58fa42dff3f1af1208dd04c03e029 WHIRLPOOL fbd5c2fb5eb926a1059727a567f98e7b6c232a1ce6e71f81cf426a51685252306bf09896a5e6e7aca7c7cd387be6307a8ebee568fe520a27a59e736644d5c982
-DIST genpatches-3.16-9.extras.tar.xz 17668 SHA256 5cbe00bb8172111e21e799db42b4b0205ab486afc6eb3522ae492c0722ec16e1 SHA512 d62825ef81f5c18e48909678403bde31ffc730909873ce4fcf459d16dba74620d50940a9cf5b4ec78b81b8f2102539a2bee62198066468ae299c3cccb21a0eb3 WHIRLPOOL 0b8205fd9deb9db14ea9edc2f04b12189a1544dfbfe86a4bba7ab4542b4a565a2b5b188caa866a6c5627f2f6d083e71e85293d1f17977b81fdcd2db7a0af7350
+DIST genpatches-3.14-42.base.tar.xz 881468 SHA256 f4b7deef8842326755a6b54199b559151aadb6ae017faec56a2c17ccafbda7a0 SHA512 b51180aeef5d7acdd6c261e896dbc07a1a452d8e551b13df67d5f5b2dfe0df689a4f6e6517d154a1d0b6dece40387461df44ac53b701b24ac8f39f40bb55a40e WHIRLPOOL dd446413b17c88e4b932c0862326fe3f713a74a328bb70a4756daf13d5b3f1d0cedb9ec5338e46c7917a7a1a7c76276fe84c4b3b795f600bc81083806bf15395
+DIST genpatches-3.14-42.experimental.tar.xz 60324 SHA256 f2ba54de5a767fa09366568e75f93cf213e0e297d6a749dc94e6f5718b84543e SHA512 5b15bc9c56131323f5b96fd78032dd87c4ebed2b77d13bdeef887372c357da073f0062fa70f314947d517c99ce7321a26d44a82624545dba47cea05b449cc832 WHIRLPOOL 1d24eb22d8f95fd865a6497bc14eca7353f34198042740f3cdb26ab8c8fae5daea65e5fb3e37fa617b5541a8080e3328d232b9131500cc2c70492f7c38841ed3
+DIST genpatches-3.14-42.extras.tar.xz 18260 SHA256 48085c3ceea449f1a1257e2ac5f0fc81a72eddee616828e4c4253e0bdd3604ba SHA512 baf0657a26356250946a70e6987b353efacaa768d0591a3ddcefea7b13dac83d27fb65ca6532b4c6d7e27f74080f8a54aa4ac92a5b2c357103bdc8b015a4b0d3 WHIRLPOOL a33ff402b9bf261879e8ff958c6363dc677106203eb5cd50d912b70a59a2ec1c12463b07f8add9531c69dc7fbc4a5e21e44cca2fd210406e4232948511b31dd8
 DIST genpatches-3.18-11.base.tar.xz 257480 SHA256 5c42cb7769ce03e8b234b1981b256ff53deac337191ab61a3c41ce37697dd2d1 SHA512 541ce106b66f52f422d02feb1fb1838959e5ea1041b1dc21773d599b382938ab95ce9d4a1c92cf75e474bf0b45e8d6b0add128c2c5982119a67c73887cb3c369 WHIRLPOOL c0e8a9478dea4424e4bce08c31b7fdd39c759965e034e966e88bdd74937013b1aab8189c2981063e1933304ff3cd4e1cc9c27383f5ccf6422d235b44aec61719
 DIST genpatches-3.18-11.experimental.tar.xz 61532 SHA256 0645955271dce8c653dd21716229ed46163fb1574ba5710e5b5753b0352bc925 SHA512 f60d297a9145e7dbaf241b5f68e392159201f9f6a4dd64d8f9679d6b5d0ffaff980eea5ba0085d1620e92c3f152f275201d0da67ca8264058813c8eb358799bd WHIRLPOOL ef36f610f4b3bbb541b6007238ac6b9200fe64324c1cb9336c15f2cb38ef6976a3c0a9954503fd338742531af7c177e1d9140870b49382f99aa2aec3c5a93e8f
 DIST genpatches-3.18-11.extras.tar.xz 16184 SHA256 576370ba1c6449b0ea04a5dfcc600f3971504ff03cb4b0a221601d533e5e6b5d SHA512 d4a477a6c7a5b69cf549c8f29f0b158ec642c7d9627ea1c41294900fd605936612cc6dd5de44bb9bee211b8f8c63207cbd22a7fb7e690fb2cdf735aff284bed1 WHIRLPOOL 1f63e754521d774708f22143f93ca7d85f13e7165433829c66c77931ebd4c7894c292df0413f22a617711ec55f1b75b380fbcbd493c585a6147453a77848bf5a
-DIST genpatches-3.18-9.base.tar.xz 207580 SHA256 931fee6744642d052ce2d7e5324f904cefed9d62d1314d16a7dfbacee43bbef9 SHA512 dd156bcdee7b9f9dbd66ca0720743a2378ca4a828f867ab086d5e99d91618b375bf44e8e8796b6e2ca0db6c584f0c32135dc20b16a603f1c0bdf0605af978d5e WHIRLPOOL 6f1ae442d8b7bb8686f8dbff55d6bc2243a2073c32c246a8db1040e7c578d92d4e4fd313c15079a3e7c774ac0731939864e7804061a3a260c0e584bcb883ade7
-DIST genpatches-3.18-9.experimental.tar.xz 60316 SHA256 f6bf44847d8b9539e22d3d240b910aa9c47ada054001b88dafdd579ef8e25e84 SHA512 6897ab8deb506e941ed4974619db5372eed04b5e7539837f656db67091ec4492000686c0c5132a100b388f156a7d52b69e84f53548b6e641a17fbb735ecc11f6 WHIRLPOOL 7697a03f7fde3ff6aead775b691cc6b37925750b5a0b5bcef29b1afdfbe8b8efc30db2700351931a0ff6c1e07cfaf4f88bfb7573a078866aedf6588d2c4055cf
-DIST genpatches-3.18-9.extras.tar.xz 16180 SHA256 edd42f842d055068e19916955bd586da60b0a1cb6af954aac1505466ab469eb8 SHA512 6e4759a58cc61bddc9d703932e22c8db14c4b437b788bb0eee6aedb709bc8223e3621e853fc6dc51ba23309778e5633e6982af59fdd9bcbecfbedfa619ba006b WHIRLPOOL b76c94fd7ae178344c20e921153d568c9bcf220670d4c9130c53dec398be9e04ad7700d48e3f94dcc4da1b631f9e2831f0d7c3b29f98d66c9b75098aa3ecd358
-DIST genpatches-3.19-1.base.tar.xz 3228 SHA256 f1cb186a18c9b075ebc38c179eb9306dd00600da8358d7f4ea6b434f4d4a10b4 SHA512 a128e78662896021940d6d87a61c0752ad5da4bd1fdfb0f8e784f3353bd6ed3f46ba34632ccdd34ac2526861226e829f63a253a0b28e0b5a373e0b1b27d49ccf WHIRLPOOL 364d8b04724b5e9528a68bb328329a9b73f88e43aa5015f92a008da4718ce9a635b4a2b51a531b7d58355ea96762d575e14b7c7a3087ac61aabb2cc19b541409
-DIST genpatches-3.19-1.experimental.tar.xz 3556 SHA256 4636fb56a98deba14d296b2b8f87edc17deb396a0ab4cdebbb1c888a00a49316 SHA512 6d764929ee05d7a4a4139675f9f5beff41e2313031b10a570473b7676679e9bf83636cb5a221d04a303a32912f821e760c738a75b22808b039339fcd188920b3 WHIRLPOOL a1bbb0b8d44e747b239a66602dfc25e425c8e9881a886f199d8e9c0a0e33010ed5aa11d9f9e0a6a6e7600b294f23d4dba90493b8d59bffb869e8a5c362284ac2
-DIST genpatches-3.19-1.extras.tar.xz 1456 SHA256 63959517328e3266a0e27044b1611fe7d3a9ac69e43e806b468ff45b05407036 SHA512 1340c63dab494766fb458b5a8c7982693d483b00c83f9a40c97f4754c5f64db94987f73997c89f00d302654d4376f21f94c858e594a51fb2257a15ec30378a4f WHIRLPOOL 02a3349b0c77f5fc4fdab9c5c5fb20f100039e0cd03c3fc2bcdc3f2adc99d0b46e0941696b3fd6f28ca07ebfc300f888f4649a0e964dc02314ac5417d71bc47e
+DIST genpatches-3.18-12.base.tar.xz 302096 SHA256 de9d9297a5f3262e3840ace4e07e50445e0e170bb6bb10e811ecc5dc48d7eeb6 SHA512 6ad3f6cb70cc592a7aa0e12b4ac8737ec9d389a5f1f609c5462bdacf901a3bbee5d833ca6866bb560cd9b6782de6878d111157c912e629238621f8735d10edd8 WHIRLPOOL 1aaaa040bde58bcfcf099b353294f2b08ff8a13c8ca9bcfffe96eacfe6a7d0aa6aca295f001d3888d059e43e41cbcd544f27a5779435c839880b5ba1908d2965
+DIST genpatches-3.18-12.experimental.tar.xz 61644 SHA256 4f1eda36d5f6bbac3dbe5d4f4e01c0e868c8e34dacc0bea35dc6a1c92a8327c1 SHA512 ea2fa60a5fce800a23906f50bd1edf369937e02db542f4453b72fb2ac59d219d8bcac4513dfa31c25e511a2ec1a5145b70f3833a3e19536ea0efb1ca58db8e7e WHIRLPOOL 33ea890e383338951006641c8af34e34f474c37844e550bf2bc6b4d20da3209ee0664ec6bfc5cc72d1b91b06872bdd4bd72cc90070247fe70912efcc50a46834
+DIST genpatches-3.18-12.extras.tar.xz 16188 SHA256 f1621d1cbaa5614ed31e8b69df4ba77ee644a8656c1684bf9d365b436b42b541 SHA512 1a557e64cb60f0bdac8889984a095fa35af30638dc28a9de53706ade69bf1c505a8cf1c29fc3fb27347d6e84e2850b6dcfd8ef669814d52faa4a0322d7ba092e WHIRLPOOL 36aa9405437db8b1cf8698985232cff8dec5c6f5eb68bc72685a3274af98f4fce427334ca095d8ed1b8f497e8ff85cfd80c0df75751d46e5d0f0ef90e1f2f6bb
 DIST genpatches-3.19-2.base.tar.xz 63824 SHA256 5eeae4cedfd2716e74dd71ad3ebe0a898be2127aa56fbe6ca32be39af3ab939f SHA512 ebfd2b5ff4a2665a05f7cda15a691c8f8e06b1fb44eaa350d1d0024b0f292104272c9f0be45f05311fd7df1d2345786b92e9dcd92a8b0a5941ae3eebe4d05420 WHIRLPOOL b4c06de34114a353daf2ae15e6b6127ba59d0d67aa08673eda4e1dc7c4cc98eb480186a9da9eac71e0b071f7821a9b3b1377a1440af3e0b52ca2566e65898eaf
 DIST genpatches-3.19-2.experimental.tar.xz 61548 SHA256 78987ec65196b94f9e7592d5655929cfd5acece2025636cc3213d368315539af SHA512 948f6f41ece562a5143e22d2ef01c7b6c499b782a5e62ff00b28f3adaa4a1490494c585524f825f37304193381937a29c891b02c3b5194cbf296cfb25a78a4cf WHIRLPOOL cea187e13d40e1dca8250eb50a13ccf1b45e8e0976972f7570b89f44b1d42eec738869fcac92f766892cd6d145ce105a4dc9264b1e75767c5ad1df7a8454439a
 DIST genpatches-3.19-2.extras.tar.xz 16212 SHA256 d481a4cfcd757013512e132872176504464c4f2db8a2d9b1ae2a68dbaec22299 SHA512 b3c5cbdbd0184e04b8d763485a34d1865e109260038f071956bd2aa11a66fb65b0cdc01cf83df9471a1f56316e35e816a928bf0727d6b36b8f28299092f9c62a WHIRLPOOL 64065acc2254c4d68d18fa4463db2f3a5ff736c1643a43b12b90c50c828f86b8b00752eb5541f01c64c64b255be50e520717f7004a394bd23660fa5e1c1dec23
-DIST genpatches-3.4-87.base.tar.xz 1210220 SHA256 a2689a56e567805b5ed8e842c692c0cfded629bf2958ecc171b1d1ae3e5496b4 SHA512 ece2ab756f83101cfca81f4b7fff3335336428dbc4b98915c6526801c2051f961d0cf88dd3b9e6a1b925d758e379346ed913efbf8328f7108769588630d9fd60 WHIRLPOOL 0945380bd8df7772f42cefe970779a4f6cda42d77aa25f3043d34837729161bef15018daa96104872661c2171f7af6d2eccdfae2faa91bf29509f8a5190901c3
-DIST genpatches-3.4-87.extras.tar.xz 18208 SHA256 d1ffb428d8e9c3553dbc0bf078fc3b7d4c6f8d27e0e0fa5dd71385d84549a9fb SHA512 823a35f8e140b2553dbb8b8dad20dd100db80699bf0ac94b42f8b194141ed44f79ca69ce88ef343c2c9332568cabdb8281331fa5235d8da4d3a855bf4a3b230a WHIRLPOOL 95d5ac7047e14940c3e774a9694e344f114e135b74d3e43b0cf5a2da173c08594b2daa78d28aabd4b1c9fb8e29019e8111a51a19243f0a206c4f7abbf9e43f22
-DIST genpatches-3.4-88.base.tar.xz 1229652 SHA256 eaf176904b80df3a710df6cd21d3e77b9dc0fefeab7bf87a5ecf67903f320665 SHA512 7b9ef5a1e91f6521c587af00b7f4ed084bb324aeb30ac62a1676f6bac8627ce936f054bad70f48612b92830c03ea8587ff6d4014677fcf0953627de3de595e54 WHIRLPOOL 9c5bc41bc74c5445c2f5248fbd8db433c44e2034e5e111bdc2c016400b499be262d31b43588b1523573e6bd2bf419fec7016789af364b683ec3ae41533dacff9
-DIST genpatches-3.4-88.extras.tar.xz 18216 SHA256 373787aca6be0436d2b72e0300463b1969e96ee1c2e4c2193b9dfc1ec56dc6f5 SHA512 d49967d09520c8e130d9d5106e9763c0a87b08ddf246a5d9e455ba40eca0264e3a0f1bf71fe7786b2087c643fcc37266d170118071cc77b0f180229c4f2d918c WHIRLPOOL 4e00c2966ab4e117a425247c47ba1348240b1d79659baa40e563c0255780d82f402923894da806bfeb5225e387822ec8524c27bb9979ce9f8d6809fffc93a91e
+DIST genpatches-3.19-4.base.tar.xz 149032 SHA256 c3d23689206a7c5d3c851424ca38edfd903e0aaf31aa607f5d9c82108ae4ae59 SHA512 dc78e638b242bcc93deb1f7ca50843e02cb4904d850031867ce2fd00a0ee1fefc4e3657fde2a4d2647606607abf935b15fba1f86d4f0011230eff24a83f0f670 WHIRLPOOL 147fb303afd8694b1da45b8e7cecab186c1d739c4b3ea5f5fe744f233008b1bb7b52d2b5911ca8eb2a6d99df2fa25e27992d03853dcfa352526453bf71670d68
+DIST genpatches-3.19-4.experimental.tar.xz 61644 SHA256 0127ff5c4902d446b80e3c38cf37b57899d7c05d650d270a13e22ce3eec2e4f1 SHA512 41066df571583dabd082ab0eec6d00bca8cdc26ec38997fcabcd1a759e7a25add31141670236ce7ef526a256a20f576d298de58457c13b134ba3434d0d1ffb18 WHIRLPOOL 09fe9ce8b6f135bfc2c875835a4bdc491ed795377ded524aeff06d1aac1c4b1505084be26e9e9b72326ced848aee2745c8230099a7dbd1613fa92e705f250c35
+DIST genpatches-3.19-4.extras.tar.xz 16280 SHA256 6c5a7b4dc060f733c5178e5c7bb850304ec63d25cadff2e74b2592cb682750a8 SHA512 01a57204e66e3e5a78dbf1f37c3e5a037799f2b2f5264b2fbf4de0aa3c1cf0aefecc9c672d9432c2d6329b50aaeb322894b465b7a9614ea97d0853bf02739366 WHIRLPOOL cfc00e8f11985d137ad599870c62b77742176b4f7df951e676bab81b8791707db35b3e3c0320cb56ab27e7e13dfca82904be257e0cec7a43bfbb7bff6b6d6b1e
 DIST genpatches-3.4-89.base.tar.xz 1274612 SHA256 67f1fc28b1a48e201d011f543aa8cbb2cbf596557cde7e66e68c40310639d327 SHA512 2e3ff2b26a0a4f7bbabda2b1845660ccfaead481c408af461b3bd8965a9657b99a5aac80fd8735d6eb6b1e0e9e5699bb5f9cb9c45d6845b37abfd17c546ca4bf WHIRLPOOL 78af99b652223aca35ac94e6e9d7d696b17cfd5690183deb9e0eda831925866145ec8ddf6e5e9e9f6e39a215af0e3b25c2165878557737997816106ad6b69eb5
 DIST genpatches-3.4-89.extras.tar.xz 18240 SHA256 c93ee7aa7b095db85cb12f990a2d344e87f4caaee64cdd8e85336c483459b69d SHA512 936c2baf1b5015913a1dc2f43353cd8286a5749f5deb382c0cf569d9ca302b9f85c6ba678d77156c5d54c87ba2f3147751fe4622fd6738b2d1b55b0f44c09c34 WHIRLPOOL 7a8d218525509e1a1eddba81341cb20ac06a4b4120d2e43a92d0855584e38eb39ce497538931d4972e2406bd48ce77f2613aea3a407b0f884936fa9ff22fa6fc
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
-DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
-DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
-DIST linux-3.16.tar.xz 80501624 SHA256 4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0 SHA512 64033e741d3f42ed06010e63e69d66e1d3d9414ef20f76834508878d4218b72619541a18ef4fd377204af2859e52198310998109b20ed9b67722586b28c9a231 WHIRLPOOL 69e5e367751185ff4e8d7c1f23c6f1e8f547fe782f581f6cf5f0bde301fa922185c8b996b815cf19fb7f14ca64042e264e87d321872ee3096adad02b1015769b
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
-DIST tuxonice-for-linux-3.10.51-2014-08-07.patch.bz2 129346 SHA256 e48b0e4df725833c59f4429efa9cdf79e1a40ff4652638a90e62419c8bd59823 SHA512 48850b9832b2f61e68a8fa27b92f89550eac0fb79029a9f10f1ce56b2a2da8506a4a632bde5c50fb10a5196650cfa6300738a4e24118933d8d40a39f13ce123e WHIRLPOOL 31c8dedc7b86dcd7b09f2ad214c350ef7007b6b4d377ae4954e7e6c5e602e224d170b1f185099d2a352728f759398de06a67d876e960139509f91c40c4ec31a2
-DIST tuxonice-for-linux-3.10.68-2015-02-10.patch.bz2 129314 SHA256 bb277d348ce4ae7f6ae393e92a79711b18456a48401d4d952c5489cdabafd3db SHA512 a1785bcc26c11c91648a239f55098094be83eca7eeaeef71b8dedd7019c0aac7217a800283a21987700814236061acc919fda6d08eff1c05a0b40d64d69d60d0 WHIRLPOOL c175e6be0e6179d4e618040cec93b907fb481e462c9f638582ef096c06ff688ad93dd49f9500dc2843df9047f61e14c7542cdead52d02ac9325201b876b4bad2
 DIST tuxonice-for-linux-3.10.69-2015-02-14.patch.bz2 129331 SHA256 00d58d383b207439c2849abcae5f511d2512591be5105d8e55da451c3c813335 SHA512 ff22acb7e614e37a78c9b7a688f70463834c1ccc43baeb1687f961e341535cce1af48b71ec722b7d322f28d66ba78696972679058764106cf297e059489641ed WHIRLPOOL 069c2c8f30dc47134aa55f1b18a8cac88c23ef9d7d66be46ab28c89af1290b228c08f2c758b3bcaedafb5815dd7cca95d92acff2533f7d42256e26e3c44951e3
-DIST tuxonice-for-linux-3.12.26-2014-08-07.patch.bz2 129349 SHA256 97f1ae995fb7b8e8d8ae27eb5f83ed69031f1bb135f1a645158bea807807aa7b SHA512 ac48360913dcb8034bb4ebf96eaa3a3cd379b992d0b3ea239a1acfd4047c9e1aa2005cdcec8e69d8b65e46c2e4a37877108a515a10e4a57620fbe84be2ebf06e WHIRLPOOL 605fca24b9a5958df3e69c6928c94e349b2a4503e67fe4539756c3d848360e48cac3d631b6ea53429f10cfe8abf46ce266b93cc46f48de0bd3a795ed57961fb9
 DIST tuxonice-for-linux-3.12.37-2015-02-02.patch.bz2 129411 SHA256 092ca9c6d399f9909951b7106a6fbf3389151dc58d2867474a035bc33c2769f4 SHA512 cb26e7f2c921d02633f659ac758a589ea9c0d3f314598b6128c9998fff135dd169bf4f9a0de1fa10ff2e511eccfe3dd69bee2f304bae244039c392eb9d7d08ad WHIRLPOOL 2d8aafdf58fbcfc028e3804aaa6a411d6a30f37f0556529eb3b05f7613089c3f447d469b5bde1f2cc84dc1362bcd7b9885080675f1606a7d4aec0a9f67efcbab
-DIST tuxonice-for-linux-3.13.11-2014-04-24.patch.bz2 129611 SHA256 bf9cb157bea00bec4c08f150a63f7a90bddde27accb0ff07bd192b259238dadc SHA512 80ca75f01e0798da47bdd6aa772c5f360dffafd3320d94f8792c3a3fb613d0bb5dea79ec69e30e7ed9836b622c2dcf0132f5adcb92ca7641942fc232692dfdee WHIRLPOOL 4bf1a0981aff60c88e54f55db8f5ff920ea2c00e6bf3e60c7a5ddca76f8a8f2b79f2bf801e491fb4fb76f4a7653f6b2cf5b5d01f9264f2fb92b3c1d64a98826f
-DIST tuxonice-for-linux-3.14.15-2014-08-07.patch.bz2 129494 SHA256 967c1b50156e5f4073309087b747066757dd96d85838fe4d8dc40f1af0305ee2 SHA512 c02403641fa875f5a76bacf269c3d5687b5f1050b4b19e225b53a596c62e4f5451481300368519f98f2fc0eac55591ff6a59378fecbc9f15a30ff14e29402fd5 WHIRLPOOL ad0f7f00d2e8a8ae662d609b0e0c07996b40cf31c8b386a31af51418d4d09a6b5c4ee9c01391229f4abaaa6be3c895bc500e2f6be1fc095718b8880b5637d120
-DIST tuxonice-for-linux-3.14.32-2015-02-10.patch.bz2 129455 SHA256 e421662668179d4179b6f2d18af59b0371081ef44b27edb5d2222d470a2c5d55 SHA512 9ac11234eb434f1b295a4d1a0a7cbc5b56b6b7b87c7c5e68ffa907a57571c3a05932ffd65e9d923220290a810e7437ff4307d176381750c9bf86a2303b7d5e23 WHIRLPOOL b51a87a8867bbd925901f99d72330a6101710f3364888a1ed41d1cc3088bad258dd1ed63040c60591d807246ce40a9cd5beaf780f7e38285d2ebcdac5224f4a5
 DIST tuxonice-for-linux-3.14.33-2015-02-14.patch.bz2 129697 SHA256 ee98d1e679a817d6482d027300b8c86a18c75c8bbae1d5ce1d82d1c2b1173a69 SHA512 e5c9ac1a0576ee121fcb601dda68afa4f30357a80f23695252e4a93591e796caafbe0ac8465463cdd6672c7f94a2ea14d04f87ca22275cc13f3956a8eeab2769 WHIRLPOOL a94b29308bef96ab3aabe738ba0af9920166a66b97fd1fcfe62cea2ab800718babd882b5158eb0efb480444f1fa8f43c10ba0b5788bf92139231ab569c359602
-DIST tuxonice-for-linux-3.15.8-2014-08-07.patch.bz2 128818 SHA256 e005cc434056a141d4c256719cad5853a4c7590e34783e25769d90e6672bdf77 SHA512 df4e19e726fbee3c982c33290b2b81935765f2bc302de6198e7d80101d29786b5e431ffa2c3b0da064f1c83fbebd042740258de71eb1b37af2e57da94260b355 WHIRLPOOL 24bc17f19ac8d65195b2191fba2a06a4357d9153a832c8ca8633ed2a5b8b1fedf80740c2e0975254e3f8593c39ec1919e17280c43fe60fc1203cdc1349ab2370
-DIST tuxonice-for-linux-3.18.6-2015-02-10.patch.bz2 127633 SHA256 1d9af543ac6cc96d1a67ca4c74592215a294be5104bf7ede7869010aa4437c89 SHA512 a95a9c9546bcb8cbe127bd588fb9e47e700a1612276afe86adfbce104e4f955c74ccf50add18f9e4f44e3944588bc1e725b353ad0c48af91ce093434b811f11c WHIRLPOOL 420f5858fa79e41f2ca875c10fc94d4288b28168fc81e33ebb7143fabd6d0a113cfc11d0d00a851399df786eddbe6264eb2b8ad2cd8fe3a0a01b86e010fbbe33
 DIST tuxonice-for-linux-3.18.7-2015-02-14.patch.bz2 127694 SHA256 fb94b85c3b4e3f6a9a3dd95a3a22236a99a712b4b3d25365f7ba610494b45e96 SHA512 29ed44cd85db14cd2955ef3236fdbfd489bbe3fa232c67e2f267cb4c11035855cbd33f6becbdaed78b648e5a1e4991c8d94be6baa8cfddd35d253f9b8962c22b WHIRLPOOL b2282042d7ff0fd4273bae9b6d62a85f01f4b3f508c0895bba53e16c87b76f4df5ca14606d71b5f3374263ad232a7ee05e95e762c5b65e10672ab23a70db2b4f
-DIST tuxonice-for-linux-3.4.101-2014-08-07.patch.bz2 131497 SHA256 b37d18adfb2aaf4c8d5f7b112e82eab15d8a1e207f2ab79ef1952dd3ee21814f SHA512 fd333515bb0656dd6d38a19fadaf109d289e37886353ae93d2d824e4d3730de75a9a0cbdcc0b19ff30829debbbd61b24804e49b871c41b1ba5c7eb6e17145dfc WHIRLPOOL 0863e33aba8dede9c06028a60330d9c704b5b097f16d5d5c70681f7abddb8aa3ede3853c30bbb10a8b2c0192c5e8ce9c0a913fe58554ba4d67e10cd9efab8737
 DIST tuxonice-for-linux-3.4.106-2015-02-10.patch.bz2 131321 SHA256 93998a24b0b4645cfa87272446d5cdbf8f8050fa4c4e74cd23d9188394a32acf SHA512 3c15ece9366eaea749cf0cea156b021b7bcbd69803f4fb76ebbb72f00be4bd36949a91bc5f459628cb80e34485a0a0d2918d9e053b97b95ec0ac9a21ac796567 WHIRLPOOL a3e4fdfa923a8208eae6bd4acce26dd63a2b3a9339595e330f8c71a7ea61bce8da1e2d0957056f7109b8c1a3bed4f6fee73f7e02b7ba245017529a2fd5db0a65
-DIST tuxonice-for-linux-head-3.16.0-rc7-2014-07-31.patch.bz2 128847 SHA256 9cefd9838f3299c9c83bed45633f2c7a87ae1f9706e57ae674ed97a9fb3433ab SHA512 28e26a1f3b067f3d3013f46445f1df61188d71894e41f92fb52d75628ab820d10995151aaba3db93b8217835c25140d61ea62735746e98d01e375c27ed8ffac1 WHIRLPOOL bbdfecd90f24ba9d6ff06d242bba705aca3dab7f8eca1a96fe23d5919ea8777eb6f2989345a9cebc65a85d3106a98b22e11493657bd4e4b972058fe5c7ab54a6
 DIST tuxonice-for-linux-head-3.19.0-2015-02-10.patch.bz2 130927 SHA256 9105e11eff55be56714f8b55703b9efe51ea2cab813cca714e264020014a42c1 SHA512 9671531338c2a6c2e5c012ead813ce2c4e07bae522ecb57a510576cc9269d3806333a6e6b08c0665b3031c827767233442b299ddb66792c55ddc253b56e182e4 WHIRLPOOL 4ef8e63ad92d1f970c647a07564a3d308915a93dccdf08ac40a8024194b1ac9f37481219fc802526e4b779f0265a378355c5b97c09dee5f338d58eb8a03360d6
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.60.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.60.ebuild
deleted file mode 100644
index 5a9d1f509e77..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.60.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.60.ebuild,v 1.1 2014/11/19 02:03:49 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="67"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.10.51"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.63.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.63.ebuild
deleted file mode 100644
index cc2e4105cc42..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.63.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.63.ebuild,v 1.1 2014/12/21 15:05:55 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="70"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.10.51"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.64.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.73.ebuild
similarity index 89%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.10.64.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.10.73.ebuild
index 35af1a19439d..98470dbc94ae 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.64.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.73.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.64.ebuild,v 1.1 2015/01/13 21:45:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.73.ebuild,v 1.1 2015/04/02 16:38:03 floppym Exp $
 
 EAPI="5"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="71"
+K_GENPATCHES_VER="81"
 
 inherit kernel-2
 detect_version
@@ -14,8 +14,8 @@ detect_arch
 DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
 
-TUXONICE_PV="3.10.51"
-TUXONICE_DATE="2014-08-07"
+TUXONICE_PV="3.10.69"
+TUXONICE_DATE="2015-02-14"
 
 TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
 TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.32.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.32.ebuild
deleted file mode 100644
index 0bf25082586a..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.32.ebuild,v 1.1 2014/11/09 03:46:04 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="34"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.12.26"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.35.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.35.ebuild
deleted file mode 100644
index 4830da580aed..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.35.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.35.ebuild,v 1.1 2014/12/21 15:05:55 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="36"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.12.26"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.37.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.39.ebuild
similarity index 93%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.12.37.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.12.39.ebuild
index c008338cbe76..9d1e82a87f8f 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.37.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.39.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.37.ebuild,v 1.1 2015/02/14 02:58:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.39.ebuild,v 1.1 2015/04/02 16:38:03 floppym Exp $
 
 EAPI="5"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="37"
+K_GENPATCHES_VER="39"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.13.11.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.13.11.ebuild
deleted file mode 100644
index 320486865f87..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.13.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.13.11.ebuild,v 1.1 2014/04/25 19:07:59 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="14"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.13.11"
-TUXONICE_DATE="2014-04-24"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.24.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.24.ebuild
deleted file mode 100644
index 80291f0fd7b6..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.24.ebuild,v 1.1 2014/11/19 02:03:49 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="29"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.14.15"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.27.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.27.ebuild
deleted file mode 100644
index 24759bdf5043..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.27.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.27.ebuild,v 1.1 2014/12/21 15:05:55 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="32"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.14.15"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.28.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.28.ebuild
deleted file mode 100644
index e4b44ddcf21b..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.28.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.28.ebuild,v 1.1 2015/01/13 21:45:44 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="33"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.14.15"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.29.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.29.ebuild
deleted file mode 100644
index 03ec26ade29c..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.29.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.29.ebuild,v 1.1 2015/01/27 00:41:31 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="34"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.14.15"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.33.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.33.ebuild
deleted file mode 100644
index f74afeff5329..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.33.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.33.ebuild,v 1.1 2015/02/14 02:58:18 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="38"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.14.32"
-TUXONICE_DATE="2015-02-10"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.69.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.37.ebuild
similarity index 89%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.10.69.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.14.37.ebuild
index f7d3f7f4e88f..a389192bc3b7 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.69.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.37.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.69.ebuild,v 1.1 2015/02/14 02:58:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.37.ebuild,v 1.1 2015/04/02 16:38:03 floppym Exp $
 
 EAPI="5"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="77"
+K_GENPATCHES_VER="42"
 
 inherit kernel-2
 detect_version
@@ -14,8 +14,8 @@ detect_arch
 DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
 
-TUXONICE_PV="3.10.68"
-TUXONICE_DATE="2015-02-10"
+TUXONICE_PV="3.14.33"
+TUXONICE_DATE="2015-02-14"
 
 TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
 TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.10.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.10.ebuild
deleted file mode 100644
index 53ae9ff80df5..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.15.10.ebuild,v 1.1 2014/08/16 20:54:43 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.15.8"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.16.7.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.16.7.ebuild
deleted file mode 100644
index 122a0df10536..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.16.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.16.7.ebuild,v 1.1 2014/11/09 03:46:04 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="head-3.16.0-rc7"
-TUXONICE_DATE="2014-07-31"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.65.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.10.ebuild
similarity index 89%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.10.65.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.18.10.ebuild
index 5005a4d0a90b..5efcf713a1bf 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.65.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.65.ebuild,v 1.1 2015/01/27 00:41:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.10.ebuild,v 1.1 2015/04/02 16:38:03 floppym Exp $
 
 EAPI="5"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="73"
+K_GENPATCHES_VER="12"
 
 inherit kernel-2
 detect_version
@@ -14,8 +14,8 @@ detect_arch
 DESCRIPTION="TuxOnIce + Gentoo patchset sources"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
 
-TUXONICE_PV="3.10.51"
-TUXONICE_DATE="2014-08-07"
+TUXONICE_PV="3.18.7"
+TUXONICE_DATE="2015-02-14"
 
 TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
 TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.7.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.7.ebuild
deleted file mode 100644
index 73d86efd098c..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.7.ebuild,v 1.1 2015/02/14 02:58:18 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.18.6"
-TUXONICE_DATE="2015-02-10"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.0.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.3.ebuild
similarity index 93%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.19.0.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.19.3.ebuild
index 601ecadf7e44..4dccb6f0e97e 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.0.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.0.ebuild,v 1.1 2015/02/14 02:58:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.19.3.ebuild,v 1.1 2015/04/02 16:38:03 floppym Exp $
 
 EAPI="5"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="4"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.104.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.104.ebuild
deleted file mode 100644
index 955f8d5ba3e1..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.104.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.104.ebuild,v 1.1 2014/10/01 19:09:47 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="87"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.4.101"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.105.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.105.ebuild
deleted file mode 100644
index cef8340bdcac..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.105.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.105.ebuild,v 1.1 2014/12/21 15:05:55 floppym Exp $
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="88"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
-
-TUXONICE_PV="3.4.101"
-TUXONICE_DATE="2014-08-07"
-
-TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
-TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
-UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch b/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch
new file mode 100644
index 000000000000..9b318df5a5ca
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/540856
+
+respect user CFLAGS
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,7 +23,7 @@ numastat_CFLAGS = $(AM_CFLAGS) -std=gnu99
+ 
+ numademo_SOURCES = numademo.c stream_lib.c stream_lib.h mt.c mt.h clearcache.c clearcache.h
+ numademo_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE
+-numademo_CFLAGS = -O3 -ffast-math -funroll-loops
++numademo_CFLAGS = $(AM_CFLAGS) -ffast-math -funroll-loops
+ if HAVE_TREE_VECTORIZE
+ numademo_CFLAGS += -ftree-vectorize
+ endif
diff --git a/sys-process/numactl/numactl-2.0.10-r2.ebuild b/sys-process/numactl/numactl-2.0.10-r2.ebuild
new file mode 100644
index 000000000000..f286d971c3b6
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.10-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.10-r2.ebuild,v 1.1 2015/04/03 06:10:07 vapier Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
+SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# ARM lacks the __NR_migrate_pages syscall.
+KEYWORDS="~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	eautoreconf
+	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
+	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
+}
+
+src_test() {
+	if [ -d /sys/devices/system/node ]; then
+		einfo "The only generically safe test is regress2."
+		einfo "The other test cases require 2 NUMA nodes."
+		emake regress2
+	else
+		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+	fi
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+}
+
+multilib_src_install_all() {
+	DOCS=( README TODO CHANGES DESIGN )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}
diff --git a/virtual/man/man-0-r1.ebuild b/virtual/man/man-0-r1.ebuild
index ab6d1482cc2b..1ff84921a879 100644
--- a/virtual/man/man-0-r1.ebuild
+++ b/virtual/man/man-0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/man/man-0-r1.ebuild,v 1.5 2014/01/18 22:18:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/man/man-0-r1.ebuild,v 1.6 2015/04/02 18:35:02 mr_bones_ Exp $
 
 EAPI=3
 
@@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( sys-apps/man-db sys-apps/man )"
\ No newline at end of file
+RDEPEND="|| ( sys-apps/man-db sys-apps/man )"
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
index e0fed409171a..a2e937314905 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild,v 1.11 2015/02/18 08:36:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild,v 1.12 2015/04/02 21:16:08 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
index 7766a2e3b8b7..cd93635314d1 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.11 2015/02/18 08:36:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.12 2015/04/02 21:09:20 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
index dd4ec1f130bc..91ef16f2790e 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.14 2015/03/30 22:43:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.15 2015/04/02 21:13:27 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
index 1a0d9db3de92..11c14d1e39aa 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild,v 1.11 2015/02/18 08:37:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild,v 1.12 2015/04/02 21:29:48 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
index b1a9d081ea13..5bab95d5c469 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild,v 1.12 2015/02/18 08:37:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild,v 1.13 2015/04/02 21:02:40 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
index 64d8c516f741..8ae66ddb0fc0 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.11 2015/02/18 08:37:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.12 2015/04/02 21:35:17 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
index efa72bdc7c3b..e9c4aeb68188 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild,v 1.10 2015/02/18 08:37:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild,v 1.11 2015/04/02 20:59:16 dilfridge Exp $
 
 EAPI=5
 
@@ -17,4 +17,6 @@ RDEPEND="
 	|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
+	>=virtual/perl-Compress-Raw-Zlib-${PV}
+	>=virtual/perl-Compress-Raw-Bzip2-${PV}
 "
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
index 83380f5f2b81..cdc88b1d9447 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild,v 1.11 2015/02/18 08:37:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild,v 1.12 2015/04/02 21:18:40 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
index 52620cae2de0..ee29f18f5f6e 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild,v 1.11 2015/02/18 08:38:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild,v 1.12 2015/04/02 21:06:55 tgall Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild b/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild
index 404e85691097..ae0055d29c90 100644
--- a/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild
+++ b/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild,v 1.1 2014/11/08 17:14:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.220.0-r3.ebuild,v 1.2 2015/04/02 18:59:40 mr_bones_ Exp $
 
 # Some important notes about detecting libnet version
-# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes 
+# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
 
 EAPI=5
 
diff --git a/virtual/perl-libnet/perl-libnet-1.270.0.ebuild b/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
index a70b09f20c1e..688849d8c432 100644
--- a/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
+++ b/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.270.0.ebuild,v 1.12 2015/03/29 18:25:47 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.270.0.ebuild,v 1.13 2015/04/02 18:59:40 mr_bones_ Exp $
 
-# Some important notes about detecting libnet version 
-# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes   
+# Some important notes about detecting libnet version
+# http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes
 
 # perl-5.20 probably was 1.260 (which is not on cpan anymore)
 # lets stabilize this one day together with dev-lang/perl-5.20
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
index db64a58e03b6..d4b8ea89d927 100644
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ b/virtual/python-singledispatch/python-singledispatch-0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-singledispatch/python-singledispatch-0.ebuild,v 1.1 2014/11/15 12:35:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-singledispatch/python-singledispatch-0.ebuild,v 1.2 2015/04/02 16:15:16 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python functools.singledispatch module"
@@ -15,4 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_2 python3_3)"
+RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3)"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 15348994de3d..f9108547c3e3 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_42.0.2311.60-1_amd64.deb 46878316 SHA256 0028ef7f5c3c544965cbfbc9931fc2c1360b89017a1732b6b57d0b8b333ae1dc SHA512 5c8079b9f83a9df3fcdb95e430909b78cb54433c9990996fe29170ea00a38b2920d1674aca338203b5fd7fe0c1c892be61e7fc1d178e801b5c00aef29f4f209c WHIRLPOOL 60a888f4d67bc33b777eb4543d5e305df70a93bad9a4e10093988b6dbdaaae2f930e08f0e0f6a6062b4d664961ec9052c35eb2ac77e9089cc655752e59ea0866
-DIST google-chrome-beta_42.0.2311.60-1_i386.deb 45947420 SHA256 d45f734e476fc65b3d12e995314c04892536d0773cd5e080e6a2dbac1a6c1016 SHA512 8496ef43eeed304a320dd716fe5966f3ddb2e0f07f6cc29eda869b26d817b4e06337d083a774eaf289c3e7de9c9c82bf6864eaf9dfccf19f0665aab7c2fd6a4e WHIRLPOOL 6f0ad2950734989b2f66eb5c6d4260922a9b1c436ca43f73360165690417c2d7e248e145415a4b56e2d6a8bfdbfe9ab8fe26fb0838679c5b66ce03401c607cb0
+DIST google-chrome-beta_42.0.2311.68-1_amd64.deb 46107792 SHA256 391ba92c2a9ef10bd12a48c61b6ea4d6b7f7e9a2c4c58e6d4698bff0cf365239 SHA512 c10591e7d00cce98041eb2d17abd28c261eb2fba044a3a75e55ab29412f334c73c04bd0f3583e706c5e90650dd39c893092eefe9010da8125c76d575bbafbbcc WHIRLPOOL eb94733963f163bf2c079aa697b1eb72722a79635b441615f06e0403c7acfd85cffd7cb35de87191518261eeabf6eebb22193182720ffa5b6dbe15e2a782b332
+DIST google-chrome-beta_42.0.2311.68-1_i386.deb 45951134 SHA256 b577fe4d13af8d91606974676442519c4160e0aa9b8d0b67d6de59caa90bd94e SHA512 27145e36a23dc238301ce8b87ed69d97474baa88db66bdcbabda663b7ba64f59904d9f53672b1f0c5ec7bacdf3ef86d9044ff386d1573ccaa8e2023aaf28832c WHIRLPOOL 81d4f4827f9ea45c3c3e2f2d36c45c4f39811759c59905dbdb95266ab5d3d4952390d3c51dfe7ede8bbef99c0f9b32932c3160f0d2624ced3941355234faa8d9
diff --git a/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.60_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.68_p1.ebuild
similarity index 98%
rename from www-client/google-chrome-beta/google-chrome-beta-42.0.2311.60_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-42.0.2311.68_p1.ebuild
index bd983f0ef8d9..76193ece0d76 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.60_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.68_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.60_p1.ebuild,v 1.1 2015/03/25 19:52:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-42.0.2311.68_p1.ebuild,v 1.1 2015/04/02 21:18:59 floppym Exp $
 
 EAPI="5"
 
diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
index 3b31be3a653a..e45853c5c68b 100644
--- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.27.0.ebuild,v 1.2 2014/04/26 20:02:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.27.0.ebuild,v 1.3 2015/04/02 19:00:23 mr_bones_ Exp $
 
 # TO DO:
-# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then 
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then
 #		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
 # * dependencies of unknown status:
 # 	dev-perl/Archive-Zip
diff --git a/www-servers/apache/apache-2.4.12.ebuild b/www-servers/apache/apache-2.4.12.ebuild
index c710a471e1dc..d7ec15638e95 100644
--- a/www-servers/apache/apache-2.4.12.ebuild
+++ b/www-servers/apache/apache-2.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.12.ebuild,v 1.1 2015/02/04 18:16:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.12.ebuild,v 1.2 2015/04/02 19:01:08 mr_bones_ Exp $
 
 EAPI=5
 
@@ -169,7 +169,7 @@ src_install() {
 		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
 	done
 
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the 
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
 	# old location until all ebuilds and eclasses have been modified to
 	# use the new location.
 	local apxs="/usr/bin/apxs"
diff --git a/x11-libs/libfm/libfm-1.2.3.ebuild b/x11-libs/libfm/libfm-1.2.3.ebuild
index a9e509e98911..0eb6c74c4ddb 100644
--- a/x11-libs/libfm/libfm-1.2.3.ebuild
+++ b/x11-libs/libfm/libfm-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild,v 1.5 2015/03/28 21:32:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild,v 1.6 2015/04/02 20:03:59 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE="+automount debug doc examples exif gtk udisks vala"
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
index 1bf9f374ba49..77482652ac1a 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild,v 1.6 2015/03/28 21:32:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild,v 1.7 2015/04/02 20:04:40 maekke Exp $
 
 EAPI="5"
 inherit eutils fdo-mime readme.gentoo
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.18:2
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index bd9d4125cfe2..07f3608208d5 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/sux-1.0-r4.ebuild,v 1.5 2015/04/01 08:33:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sux/sux-1.0-r4.ebuild,v 1.6 2015/04/02 20:18:47 maekke Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://fgouget.free.fr/sux/sux"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc sparc x86"
+KEYWORDS="~alpha amd64 arm ppc sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
index 020920a375ab..c9ad46d4711b 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.17 2013/08/31 14:25:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.18 2015/04/02 18:35:45 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils gkrellm-plugin toolchain-funcs
@@ -23,4 +23,4 @@ src_prepare() {
 
 src_compile() {
 	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-}
\ No newline at end of file
+}
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 80bbf1ada0aa..655e92802a5c 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -1 +1,2 @@
 DIST xmonad-contrib-0.11.2.tar.gz 401758 SHA256 515d87838ad1f9622d0b491390c5961318d2cb84c96410dee91b5653c5388c62 SHA512 373e1ed1744cbdf26902402d74b4efafa043a4ccf1953c26ec55a03ef8de31818b0c4cfced08b43e664e5f052e52923c6dfb08d68be86726e9f0ed1d96ad7910 WHIRLPOOL 8356462938d9565ee010335c90646d5f23adf3b830bbf7727ef8fa89ff6c027ff94be44b99260ae3c57f9773b6cf985029ba2f183cc7b8c9e18d18fd260f90a9
+DIST xmonad-contrib-0.11.4.tar.gz 401743 SHA256 a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7 WHIRLPOOL 1f25fff0088f15942bddd6a8e285fcf283f723527cc10b120c81cbb9a74a56106d5f7c5f676cf6b3fcd118bc3843e510169161898267f160c73b35c0fba458df
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
new file mode 100644
index 000000000000..d887e857da03
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.11.4-import-Applicative.patch
@@ -0,0 +1,21 @@
+--- xmonad-contrib-0.11.4-orig/XMonad/Util/Invisible.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Util/Invisible.hs	2015-04-03 15:12:17.485143018 +1100
+@@ -22,6 +22,8 @@
+                             , fromIMaybe
+                             ) where
+ 
++import Control.Applicative
++
+ -- $usage
+ -- A wrapper data type to store layout state that shouldn't be persisted across
+ -- restarts. A common wrapped type to use is @Maybe a@.
+--- xmonad-contrib-0.11.4-orig/XMonad/Hooks/DebugEvents.hs	2015-03-28 05:00:21.000000000 +1100
++++ xmonad-contrib-0.11.4/XMonad/Hooks/DebugEvents.hs	2015-04-03 15:17:02.207816322 +1100
+@@ -30,6 +30,7 @@
+ 
+ -- import           Graphics.X11.Xlib.Extras.GetAtomName        (getAtomName)
+ 
++import           Control.Applicative
+ import           Control.Exception.Extensible         as E
+ import           Control.Monad.State
+ import           Control.Monad.Reader
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
new file mode 100644
index 000000000000..7d12b7d0a407
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad-contrib/xmonad-contrib-0.11.4.ebuild,v 1.1 2015/04/03 04:45:25 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=x11-wm/xmonad-0.11:=[profile?] <x11-wm/xmonad-0.12:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+# Upstream bug 597 xmonad-contrib-0.11.4 does not compile
+# https://code.google.com/p/xmonad/issues/detail?id=597
+PATCHES=("${FILESDIR}/${P}-import-Applicative.patch")
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index ba7b29064188..e2d8ead4b4c7 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1 +1,2 @@
+DIST xmonad-0.11.1.tar.gz 59307 SHA256 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512 4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528 WHIRLPOOL 5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c
 DIST xmonad-0.11.tar.gz 59119 SHA256 e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc WHIRLPOOL 9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54
diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild
new file mode 100644
index 000000000000..8af4617036c8
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.11.1.ebuild,v 1.1 2015/04/03 04:46:15 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="+default-term no-autorepeat-keys"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?]
+	>=dev-haskell/x11-1.5:=[profile?] <dev-haskell/x11-1.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_prepare() {
+	epatch "$FILESDIR"/${PN}-0.11-sample.patch
+	use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch
+
+	cabal_chdeps \
+		"utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1"
+
+	# allow user patches
+	epatch_user
+}
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+	dohtml man/xmonad.1.html
+
+	dodoc CONFIG README
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}