diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild
index e80c63775fd1..fd6597a805c8 100644
--- a/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild,v 1.2 2012/03/28 07:42:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild,v 1.3 2012/04/05 05:24:08 jdhore Exp $
 
 EAPI="4"
 inherit toolchain-funcs user
@@ -13,7 +13,7 @@ SRC_URI="http://kerryt.orcon.net.nz/${MY_P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index c614b07fa7fa..58d973b75969 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
 DIST VBoxGuestAdditions_4.1.10.iso 50749440 RMD160 dc852aa069789bdbbebd0add984339c4c629c76b SHA1 0a6440b74d9a664c0d23209c07d95ff6593e2b90 SHA256 70e859545cff07ce33c38f8c970856907cb1961ebf15a639505092e205614817
+DIST VBoxGuestAdditions_4.1.12.iso 50776064 RMD160 7f791a153a534568f6c25c43676ab3093fe99fea SHA1 f3918fde23dcf2de9cd8e7eee26135fe7be4efd0 SHA256 7dce13dd99c8b4757d56f5bada19a61a3ad50c69d7e0d9c245c0b88f50c0c245
 DIST VBoxGuestAdditions_4.1.4.iso 44716032 RMD160 af6062dcf625c82ec2184921d91ffdd2e326f1a6 SHA1 5d4b1d0ed5745f54b7aa9f709bc9a129c6e41e38 SHA256 75796a780f35c697c752d754b100d61afed7ee858ee49f34710c2d79ad50dc32
-DIST VBoxGuestAdditions_4.1.6.iso 44761088 RMD160 3c640f68e7d681052872977d7b854f8331639b88 SHA1 082e1cc631fb2aeec26d728166e693b7c5014079 SHA256 f544516a7443da759632a4a1345f0ed7e894065eb834f339bc7490f5d7908b3d
 DIST VBoxGuestAdditions_4.1.8.iso 45471744 RMD160 8730184e30ff856ad09f75ea3e6886f872339ba0 SHA1 92b5bedf25619f976a49391bb1998c3dbc8efca9 SHA256 2265aa350de2d62021e91ae6bbd1438c291a74494778bb443926e9b7b962c63d
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild
similarity index 83%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild
index 332094742a4f..c3d679acb80a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.6.ebuild,v 1.1 2011/11/04 23:06:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.12.ebuild,v 1.1 2012/04/05 07:42:50 polynomial-c Exp $
 
 EAPI=2
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index ea870c860153..2850ac669267 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz 10047772 RMD160 5891f472b300f203e73da5597257060fa22e5542 SHA1 8ce8369ae74429062abc3e4fd3f2b4bebd5024b4 SHA256 e1ddcbb62de299b67350a4c9f3425b1f71aca490611891fd07e98f15a890d09f
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 RMD160 0a65fb69ad482c655f564a3f63ed958390c26c48 SHA1 28d63bceca076ae65afc3df814d622b630f8d372 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.tar.gz 9585392 RMD160 7e35093c06edf3956c0edb77e2dd1fb1b439a7d8 SHA1 4db22b5720557f4d42447891174bc7e34a6dca3d SHA256 67311c407eac2db94c29ab8a4baf47f51ddaea0423d3fac3b409728cd6ada80c
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
 DIST VirtualBox-4.1.10-76795-Linux_amd64.run 77250001 RMD160 f0f2b84c9574d18dc66dfba2b02e1faaaa9076fa SHA1 c6c32f43f6c70feaeb746ab66fb94cecdf708de6 SHA256 07a8a28feda96fc54caed1c2c3338473a02c061d7bb564f3b5280cbfad3e24c8
 DIST VirtualBox-4.1.10-76795-Linux_x86.run 76993997 RMD160 01e206dcca898af966af60a87ed762f15d26b52f SHA1 b87b829828bfbcfd8a250fe4c85b6110350f96c4 SHA256 4bd6388f7f3803635de01e77de45957e80bb0e2b75c2d2e4ffd01bc89c99afd7
+DIST VirtualBox-4.1.12-77245-Linux_amd64.run 77250001 RMD160 4e40a017d2765305396e646a70dc105bfa558849 SHA1 5ef57d22e31a319f317f1d904e1dcee12478c594 SHA256 006eabe522116abcce7af4b5ea6f32f862d3d95ab565e44e5077ab5ced62ba24
+DIST VirtualBox-4.1.12-77245-Linux_x86.run 77137358 RMD160 b8b4fb917b7beb3e38d650f0f9cae66ea7641aca SHA1 b8c25f59caafd01b9449dd40b62e1fcd0c6dfcbb SHA256 49890bf1077b3649181d1607372d5b92bcf347371e0631a4af6a43193492f047
 DIST VirtualBox-4.1.4-74291-Linux_amd64.run 73235921 RMD160 d9d067ea922a358062b9fe1e8d17216974cff400 SHA1 3d6ee4c217ab936eb6acf175fcc408133f201507 SHA256 b079b311f6aa662332cd5118bbe01d47589595849c4dd53f4b65af25de923a0a
 DIST VirtualBox-4.1.4-74291-Linux_x86.run 73020877 RMD160 1a12db57d13286690a7b2a06d3d09d14a9f9d91e SHA1 87b9536b0d309bb2fdf549ff5d0db3e17945a7b9 SHA256 a907733bf41c32896a211b146b066aadaa1a3e11afb9e9c80ef3ed642cc3c94d
-DIST VirtualBox-4.1.6-74727-Linux_amd64.run 73297360 RMD160 e81e043e63a09e567aab2675714e4d96562914fb SHA1 4932555b366618b50e6341c1fc6d34938d42cd82 SHA256 9c7464c7b59b9491e3fc1ea51697b766fc6bb2130bc677ed0e3c66a6cff6f868
-DIST VirtualBox-4.1.6-74727-Linux_x86.run 73113036 RMD160 37e72d2e3eac1aacf7bcd60576b609867af4d073 SHA1 b950b3a0a9ebd42d23c91298ed963b325a29b830 SHA256 84f1cecb3fca09f8b13df0372b20e8f78b7f2f7f2365e811438a33e0d07ae4f0
 DIST VirtualBox-4.1.8-75467-Linux_amd64.run 75027920 RMD160 5bc2f47d870be78ec201d77971b4914f4b019c50 SHA1 bb9e80ddfc812d99cd27135c05304e20b6a28535 SHA256 7d0d45dfc8e4ef27a817c017c6589d5204a6515d86f0c874843cb99ccfe319ee
 DIST VirtualBox-4.1.8-75467-Linux_x86.run 75007436 RMD160 58ea91a06f030893676805097f403c0fd0419fb2 SHA1 8833fc8de41f9a3bbaee05b6c27750fffdccf919 SHA256 7780d8fc171ccfa3047a3d6373f9965b8c2896b11137817314f29cf5a3bc514f
 DIST VirtualBoxSDK-4.1.10-76795.zip 8896483 RMD160 99c7160857821c914ad413ec131597c1ed456590 SHA1 b400bc2d4905ec9dd92149e0fe34dc3b161beaff SHA256 bf3a8f5ebc2ee7c8cd107fec627b0d84359b71080a1c19327015703bf43842f1
+DIST VirtualBoxSDK-4.1.12-77245.zip 8896345 RMD160 a9431c0907e397d77ede4d4de4be962e89dc43ed SHA1 372d6db2dcaeaa8f6855e110babfa5c00375be80 SHA256 a490878e7bc2443c7e4b51115382a6c5b65cda44cfc449af1676778093b307fa
 DIST VirtualBoxSDK-4.1.4-74291.zip 8803983 RMD160 a8a925a3d61c7a6fe03bfcdbfb2ff4c2c8e754f0 SHA1 77436fe0d22d58f371123df7402b556330e82bf9 SHA256 c0a5855a921611ae3264d70cfde64a3c2fb5ff3a1cd564716a1de0b23e7e9d3d
-DIST VirtualBoxSDK-4.1.6-74713.zip 8804355 RMD160 e635f4727575bae927bedb02ccca063ec1207d47 SHA1 2253614f56300c821de7a0a7a8674a2d2dda264e SHA256 19fb30c04c8a979ee275205a8aaf8867d1435885d8bcfe5fa2c49d9b285d0621
 DIST VirtualBoxSDK-4.1.8-75467.zip 8805659 RMD160 13e73b31cdd452a8c9262aea62afa3fbdf4a6f06 SHA1 f57fb944b1ea143ffc3130671e7c90b4d554957e SHA256 116d855456fa8661c6d7a3178fcd604d6994d1c8365e697368c25f638e588aff
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild
similarity index 93%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild
index bae0e209a78d..fc7f726dae1c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild,v 1.2 2012/02/05 05:25:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.12.ebuild,v 1.1 2012/04/05 07:42:20 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils unpacker fdo-mime pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils
 
-MY_PV=${PV}-74727
-SDK_PV=${PV}-74713
+MY_PV=${PV}-77245
+SDK_PV=${MY_PV}
 EXTP_PV=${SDK_PV}
 MY_P=VirtualBox-${MY_PV}-Linux
 EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack
@@ -58,7 +58,6 @@ RDEPEND="!!app-emulation/virtualbox
 			dev-lang/python:2.7
 			dev-lang/python:2.6
 			dev-lang/python:2.5
-			dev-lang/python:2.4
 		) )"
 
 S=${WORKDIR}
@@ -71,13 +70,9 @@ QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
 	opt/VirtualBox/VBoxDD2.so
 	opt/VirtualBox/VBoxOGLrenderspu.so
 	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
 	opt/VirtualBox/VBoxPython2_5.so
 	opt/VirtualBox/VBoxPython2_6.so
 	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxVRDP.so
 	opt/VirtualBox/VBoxDDU.so
@@ -118,13 +113,9 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/VBoxOGLhosterrorspu.so
 	opt/VirtualBox/VBoxOGLrenderspu.so
 	opt/VirtualBox/VBoxPython.so
-	opt/VirtualBox/VBoxPython2_3.so
-	opt/VirtualBox/VBoxPython2_4.so
 	opt/VirtualBox/VBoxPython2_5.so
 	opt/VirtualBox/VBoxPython2_6.so
 	opt/VirtualBox/VBoxPython2_7.so
-	opt/VirtualBox/VBoxPython3_0.so
-	opt/VirtualBox/VBoxPython3_1.so
 	opt/VirtualBox/VBoxREM.so
 	opt/VirtualBox/VBoxREM32.so
 	opt/VirtualBox/VBoxREM64.so
@@ -157,6 +148,8 @@ QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
 	opt/VirtualBox/libQtOpenGLVBox.so.4
 	opt/VirtualBox/vboxwebsrv"
 
+PYTHON_UPDATER_IGNORE="1"
+
 src_unpack() {
 	unpack_makeself ${MY_P}_${ARCH}.run
 	unpack ./VirtualBox.tar.bz2
@@ -171,13 +164,32 @@ src_unpack() {
 	fi
 }
 
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
 src_install() {
 	# create virtualbox configurations files
 	insinto /etc/vbox
 	newins "${FILESDIR}/${PN}-config" vbox.cfg
 
 	if ! use headless ; then
-		newicon VBox.png ${PN}.png
+		pushd "${S}"/icons &>/dev/null || die
+		for size in * ; do
+			if [ -f "${size}/virtualbox.png" ] ; then
+				insinto "/usr/share/icons/hicolor/${size}/apps"
+				newins "${size}/virtualbox.png" ${PN}.png
+			fi
+		done
+		dodir /usr/share/pixmaps
+		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
+			|| die
+		popd &>/dev/null || die
+
 		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
 	fi
 
@@ -225,7 +237,7 @@ src_install() {
 
 	if use python; then
 		local pyver
-		for pyver in 2.4 2.5 2.6 2.7 3.0 3.1 ; do
+		for pyver in 2.5 2.6 2.7; do
 			if has_version "=dev-lang/python-${pyver}*" && [ -f "${S}/VBoxPython${pyver/./_}.so" ] ; then
 				doins VBoxPython${pyver/./_}.so || die
 			fi
@@ -303,6 +315,8 @@ src_install() {
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 
+	gnome2_icon_cache_update
+
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
 
 	elog ""
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index d890b2326015..21e2e14b958e 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.10-76795.tar.gz 10047772 RMD160 5891f472b300f203e73da5597257060fa22e5542 SHA1 8ce8369ae74429062abc3e4fd3f2b4bebd5024b4 SHA256 e1ddcbb62de299b67350a4c9f3425b1f71aca490611891fd07e98f15a890d09f
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 RMD160 0a65fb69ad482c655f564a3f63ed958390c26c48 SHA1 28d63bceca076ae65afc3df814d622b630f8d372 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.4-74291.tar.gz 9566803 RMD160 bc6862800a627c1275812e3a52fcfc438925f81d SHA1 128cdff4fc022be0c9878b717e5ac8d099681d65 SHA256 819b778dcd86de715e011a2cc7c075518859339680544d492730efa3a2b932ec
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.6.tar.gz 9585392 RMD160 7e35093c06edf3956c0edb77e2dd1fb1b439a7d8 SHA1 4db22b5720557f4d42447891174bc7e34a6dca3d SHA256 67311c407eac2db94c29ab8a4baf47f51ddaea0423d3fac3b409728cd6ada80c
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.8-75467.tar.gz 9725202 RMD160 ce54aaf128d6aec757032f20ffb93e2ce7f17a64 SHA1 9e28d3751ab192c4dd77a69dfbc6976603b24197 SHA256 137c4d7a5440abc834b8014728a609a10abbaa6af5ad6742988cd8d1b4a8b245
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild
similarity index 77%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild
index 77696f93ef76..c506eb9f1946 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.6.ebuild,v 1.1 2011/11/04 23:08:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.12.ebuild,v 1.1 2012/04/05 07:45:10 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils
 
+MY_BUILD="77245"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}"
+MY_P="${MY_PN}-${PV}-${MY_BUILD}"
 
 DESCRIPTION="PUEL extensions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index b655ead73fef..27073d119e3e 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,4 @@
 DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
+DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild
similarity index 97%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild
index 56881ef5d141..1d09815a021f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.6-r1.ebuild,v 1.1 2011/11/06 23:40:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.12.ebuild,v 1.1 2012/04/05 07:46:12 polynomial-c Exp $
 
 EAPI=2
 
@@ -43,7 +43,7 @@ BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
 			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
-S="${WORKDIR}/${MY_P}_OSE"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 		linux-mod_pkg_setup
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 84883d3f1a50..fe4df67a13ea 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
 DIST vbox-kernel-module-src-4.1.10.tar.xz 458956 RMD160 cc367f577348bec9aac13c6753cb70c1b7834683 SHA1 d88db3022d31b36da83a50a93a36081695e2bb3a SHA256 a5659cb71e9e22857c3f4e2b132a3c99323a33685eeb129af87ba87d549d219d
+DIST vbox-kernel-module-src-4.1.12.tar.xz 459148 RMD160 3cc0d80f0cd50259bd63b2b4353c4160f414d50c SHA1 f4cd83788dde4f735d10593f2676345a0ef3b91e SHA256 70707451b9dab6128005410f515f0c2c5d8c295b319243d9e623ae68c5acff1f
 DIST vbox-kernel-module-src-4.1.4.tar.bz2 505952 RMD160 c540fb563d6fdab747366c66d5e472ebffbd3639 SHA1 35a4274118d44bd8603fecfa93817ef129c8e57c SHA256 03577cd31e5ff322102e9bec1ed40f189c50d94032e2d62206b6541a0fda1fb8
-DIST vbox-kernel-module-src-4.1.6.tar.xz 454840 RMD160 f1166c7b2e95276a60beb4c6dbe022826bc21ff2 SHA1 7816f6773f00f28cb287eaf4eb8b31a9b3bbdd37 SHA256 557425714e5d9e1b737c963d5a4d1b67a6e60ec47c2ddf2449dbbfd786c41cdf
 DIST vbox-kernel-module-src-4.1.8.tar.xz 457648 RMD160 2451d2c23e5ab14b70b9b6da79c164499a864eec SHA1 ac97198d3275a338905bb04efffde467bbeff9dc SHA256 565c9d9b193e88679549995d63c5796e19f881f9f95215f8cc6a11d13e749a9f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild
similarity index 88%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild
index 72a076337c0f..3d269c348d2a 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.6.ebuild,v 1.3 2011/12/03 17:36:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.12.ebuild,v 1.1 2012/04/05 07:41:26 polynomial-c Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -35,9 +35,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# bug #389953
-	epatch "${FILESDIR}"/${PN}-4.1.6-kernel-3.2-vboxpci.patch
-
 	if kernel_is -ge 2 6 33 ; then
 		# evil patch for new kernels - header moved
 		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index b655ead73fef..27073d119e3e 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,4 +1,4 @@
 DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
+DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
diff --git a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild b/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
index 5982efe53898..d7e6c1f4b6b2 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.2 2012/03/23 20:18:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.10.ebuild,v 1.3 2012/04/05 07:44:41 polynomial-c Exp $
 
 EAPI=4
 
@@ -182,7 +182,7 @@ src_prepare() {
 	# Link to correct gsoap library. Bug #408569
 	# This has been fixed upstream and should be removed when virtualbox is
 	# bumped
-	epatch ${FILESDIR}/${P}-libgsoapssl.patch
+	epatch "${FILESDIR}"/${P}-libgsoapssl.patch
 }
 
 src_configure() {
diff --git a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
similarity index 92%
rename from app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-4.1.12.ebuild
index 87d1699ba8f5..d627acb8c3f6 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.6-r1.ebuild,v 1.3 2011/12/20 13:14:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:44:41 polynomial-c Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=VirtualBox-${PV}
 	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}_OSE"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
@@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 		media-libs/libsdl[X,video]
 	)
 	vnc? ( >=net-libs/libvncserver-0.9.7 )
-	java? ( >=virtual/jre-1.5 )"
+	java? ( virtual/jre:1.6 )"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.999
 	>=dev-lang/yasm-0.6.2
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
-	java? ( >=virtual/jdk-1.5 )
+	java? ( virtual/jdk:1.6 )
 	dev-util/pkgconfig
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
@@ -116,15 +116,6 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	if built_with_use sys-devel/gcc hardened && gcc-config -c | grep -qv -E "hardenednopie|vanilla"; then
-		eerror "The PIE feature provided by the \"hardened\" compiler is incompatible with ${PF}."
-		eerror "You must use gcc-config to select a profile without this feature.  You may"
-		eerror "choose either \"hardenednopie\", \"hardenednopiessp\" or \"vanilla\" profile;"
-		eerror "however, \"hardenednopie\" is preferred because it gives the most hardening."
-		eerror "Remember to run \"source /etc/profile\" before continuing.  See bug #339914."
-		die
-	fi
-
 	if ! use headless && ! use qt4 ; then
 		einfo "No USE=\"qt4\" selected, this build will not include"
 		einfo "any Qt frontend."
@@ -168,9 +159,6 @@ src_prepare() {
 	# Don't build vboxpci.ko module (D'oh!)
 	epatch "${FILESDIR}"/${PN}-4.1.2-vboxpci-build.patch
 
-	# Fixed compilation with yasm-1.2.0 (bug #391189)
-	epatch "${FILESDIR}"/${P}-yasm120-fix.patch
-
 	# Use PAM only when pam USE flag is enbaled (bug #376531)
 	if ! use pam ; then
 		elog "Disabling PAM removes the possibility to use the VRDP features."
@@ -185,6 +173,11 @@ src_prepare() {
 			-i "${S}"/Config.kmk || die
 		java-pkg-opt-2_src_prepare
 	fi
+
+	# Fix compile error on hardened bug 339914 (disable PIE)
+	if gcc-specs-pie ; then
+		epatch "${FILESDIR}"/virtualbox_nopie.patch
+	fi
 }
 
 src_configure() {
@@ -220,7 +213,7 @@ src_compile() {
 	# strip-flags
 
 	MAKE="kmk" emake \
-		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'-Gentoo_ \
+		VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_Gentoo_ \
 		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
 		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
 		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
@@ -306,7 +299,14 @@ src_install() {
 			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
 		fi
 
-		newicon	"${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 20 32 40 48 64 128 ; do
+			insinto /usr/share/icons/hicolor/${size}x${size}/apps
+			newins ${PN}-${size}px.png ${PN}.png
+		done
+		insinto /usr/share/pixmaps
+		newins ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
 	else
 		doins VBoxHeadless || die
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
@@ -314,6 +314,7 @@ src_install() {
 		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
 	fi
 
+	insinto /usr/$(get_libdir)/${PN}
 	# Install EFI Firmware files (bug #320757)
 	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
 	for fwfile in VBoxEFI{32,64}.fd ; do
diff --git a/app-misc/gcstar/gcstar-1.6.2.ebuild b/app-misc/gcstar/gcstar-1.6.2.ebuild
index 98dc58b04d96..7c74ba0a8ad4 100644
--- a/app-misc/gcstar/gcstar-1.6.2.ebuild
+++ b/app-misc/gcstar/gcstar-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcstar/gcstar-1.6.2.ebuild,v 1.2 2012/01/07 12:20:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcstar/gcstar-1.6.2.ebuild,v 1.3 2012/04/05 08:43:22 jdhore Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/gcstar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb gnome mp3 spell stats tellico vorbis"
 
 RDEPEND="dev-lang/perl
diff --git a/app-office/passepartout/passepartout-0.7.0.ebuild b/app-office/passepartout/passepartout-0.7.0.ebuild
index 3e666ebda2f5..f50a95881616 100644
--- a/app-office/passepartout/passepartout-0.7.0.ebuild
+++ b/app-office/passepartout/passepartout-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.6 2012/04/02 16:43:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.7 2012/04/05 08:09:58 jdhore Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
 IUSE="gnome"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPS="dev-cpp/libxmlpp:2.6
 	>=dev-libs/libxml2-2
diff --git a/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild b/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
index 2dcd1988e829..4ab93af150ad 100644
--- a/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
+++ b/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.3 2012/04/01 17:20:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.3.ebuild,v 1.4 2012/04/05 06:19:28 jdhore Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
 SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="as-is"
-KEYWORDS="amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/dev-db/m17n-db/m17n-db-1.6.3.ebuild b/dev-db/m17n-db/m17n-db-1.6.3.ebuild
index f307a5228ecf..0147e4cf71ca 100644
--- a/dev-db/m17n-db/m17n-db-1.6.3.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.3.ebuild,v 1.5 2012/04/04 18:01:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.3.ebuild,v 1.6 2012/04/05 08:18:09 jdhore Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild
index d6d2f5c2bc8a..88205261a843 100644
--- a/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild,v 1.1 2012/03/01 02:52:22 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.2.ebuild,v 1.2 2012/04/05 09:26:29 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug"
 
diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
index 0619b6c3c4b2..14a2f015935a 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.4 2012/04/04 17:56:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.5 2012/04/05 06:14:05 jdhore Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://fallabs.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="cxx debug java perl ruby zlib"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
diff --git a/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild
index 9605b9250924..99146e8dd842 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild,v 1.3 2012/04/01 17:26:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Any-Moose/Any-Moose-0.180.0.ebuild,v 1.4 2012/04/05 06:58:30 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Use Moose or Mouse modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc ~x86 ~ppc-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86 ~ppc-macos"
 IUSE=""
 
 RDEPEND="|| ( >=dev-perl/Mouse-0.40 dev-perl/Moose )
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild
index aef6dc8b97bf..c88e11bddf84 100644
--- a/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild,v 1.4 2012/03/29 15:01:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild,v 1.5 2012/04/05 06:50:56 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Sub-Name"
diff --git a/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild b/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild
index 4d019deb72a1..d793b4d7ee27 100644
--- a/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild
+++ b/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild,v 1.4 2012/04/01 17:31:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DBIx-DBSchema/DBIx-DBSchema-0.400.0.ebuild,v 1.5 2012/04/05 06:34:06 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Database-independent schema objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/DBI
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild
index 2480859d4c25..f86954e4acc7 100644
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild,v 1.5 2012/03/30 18:02:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild,v 1.6 2012/04/05 07:49:56 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Work with IO sockets in ipv6"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Socket6"
diff --git a/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild b/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild
index ad1c48819542..063b18e541b8 100644
--- a/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild
+++ b/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild,v 1.3 2012/04/01 17:27:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-Audit/Mail-Audit-2.227.0.ebuild,v 1.4 2012/04/05 06:24:01 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Mail sorting/delivery module for Perl."
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/MIME-tools
diff --git a/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild b/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild
index d7803b6391e5..55d6df3ff8b6 100644
--- a/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild
+++ b/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild,v 1.2 2012/03/28 07:36:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Amazon/Net-Amazon-0.610.0.ebuild,v 1.3 2012/04/05 05:05:52 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Net::Amazon - Framework for accessing amazon.com via SOAP and XML/HTTP"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-perl/libwww-perl
diff --git a/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild b/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild
index 3f257e2c0612..9ce5c09f43cd 100644
--- a/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild
+++ b/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild,v 1.2 2012/01/07 12:19:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-FreeDB/Net-FreeDB-0.80.0.ebuild,v 1.3 2012/04/05 08:43:50 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="OOP interface to the FreeDB database"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/NetPacket/NetPacket-1.3.0.ebuild b/dev-perl/NetPacket/NetPacket-1.3.0.ebuild
index b07ce8c12bb8..e1d843395348 100644
--- a/dev-perl/NetPacket/NetPacket-1.3.0.ebuild
+++ b/dev-perl/NetPacket/NetPacket-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetPacket/NetPacket-1.3.0.ebuild,v 1.3 2012/04/01 17:28:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/NetPacket/NetPacket-1.3.0.ebuild,v 1.4 2012/04/05 06:28:34 jdhore Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl NetPacket - network packets assembly/disassembly"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild b/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild
index 64a5bfa3b5e7..813ee391d671 100644
--- a/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild
+++ b/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild,v 1.7 2012/04/01 18:09:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PAR-Dist/PAR-Dist-0.480.0.ebuild,v 1.8 2012/04/05 06:37:24 jdhore Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Create and manipulate PAR distributions"
 
 SLOT="0"
-KEYWORDS="amd64 hppa ~x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild b/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild
index c6de5ecdc80d..8177ae12867d 100644
--- a/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild
+++ b/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild,v 1.4 2012/04/01 18:10:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/locale-maketext-fuzzy/locale-maketext-fuzzy-0.110.0.ebuild,v 1.5 2012/04/05 06:40:01 jdhore Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="Maketext from already interpolated strings"
 
 SLOT="0"
 LICENSE="CC0-1.0-Universal"
-KEYWORDS="amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-python/mecab-python/mecab-python-0.98.ebuild b/dev-python/mecab-python/mecab-python-0.98.ebuild
index 64fc95ecb98a..1ea233903d85 100644
--- a/dev-python/mecab-python/mecab-python-0.98.ebuild
+++ b/dev-python/mecab-python/mecab-python-0.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mecab-python/mecab-python-0.98.ebuild,v 1.3 2012/03/28 07:41:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mecab-python/mecab-python-0.98.ebuild,v 1.4 2012/04/05 05:16:04 jdhore Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN/-*}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=app-text/mecab-${PV}"
diff --git a/dev-python/pydns/pydns-3.0.1.ebuild b/dev-python/pydns/pydns-3.0.1.ebuild
index dcb9240c9dc0..f7b8ec9915f8 100644
--- a/dev-python/pydns/pydns-3.0.1.ebuild
+++ b/dev-python/pydns/pydns-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.1.ebuild,v 1.2 2012/03/28 07:42:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.1.ebuild,v 1.3 2012/04/05 06:16:52 jdhore Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3"
@@ -15,7 +15,7 @@ SRC_URI="http://downloads.sourceforge.net/project/pydns/py3dns/${P/py/py3}.tar.g
 
 LICENSE="CNRI"
 SLOT="3"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND="!dev-python/py3dns
diff --git a/dev-ruby/arel/arel-3.0.2-r1.ebuild b/dev-ruby/arel/arel-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..bf91a39151ee
--- /dev/null
+++ b/dev-ruby/arel/arel-3.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-3.0.2-r1.ebuild,v 1.1 2012/04/05 06:41:38 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
+
+# Generating the gemspec from metadata causes a crash in jruby
+RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Arel is a Relational Algebra for Ruby."
+HOMEPAGE="http://github.com/rails/arel"
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-2.10 )
+	test? (
+		>=dev-ruby/hoe-2.10
+		virtual/ruby-minitest
+	)"
+
+all_ruby_prepare() {
+	# Put the proper version number in the gemspec.
+	sed -i -e "s/ s.version = \".*\"/ s.version = \"${PV}\"/" arel.gemspec || die
+}
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index 59f17954f095..f667890390e0 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -1,3 +1,4 @@
 DIST gambc-v4_6_2.tgz 10463697 RMD160 9557ad441e1b1175a83cf397294477647ed9521d SHA1 72729e1c96f5f31553365e27039cbe6d8feb0a05 SHA256 2e6c2b9597050212376a2544c0e810da5ea26151b8c1e2894381c3664832e8e5
 DIST gambc-v4_6_3.tgz 10661300 RMD160 66093724eb0261821a4fcfb3d3f263928c595856 SHA1 d07807f09dd8960e383b10755ec8eed349596038 SHA256 66cbc805484898bcadeab9921d8bcdb07d536dd401c57ff92edb461d7230ff81
 DIST gambc-v4_6_4.tgz 10694646 RMD160 8bbffa149e65e2b30381f9127cf5269d20742dae SHA1 d47d86e3a0193aa00a09afa77422d7f19733d245 SHA256 6bbe7af0ca410a85716c27d29ded0cc207904e9d9d1a8012db50537d5dd1a5f9
+DIST gambc-v4_6_5.tgz 10699787 RMD160 2ab84686483c541b1a2e182520740bf8293d266c SHA1 16a73446440714aa1985c861aa225d0238528544 SHA256 54de513a78f0fb1841ef1411b8f2d64a2bd6810cee7554fe408b0ba79ff00910
diff --git a/dev-scheme/gambit/gambit-4.6.5.ebuild b/dev-scheme/gambit/gambit-4.6.5.ebuild
new file mode 100644
index 000000000000..b9d090268d4a
--- /dev/null
+++ b/dev-scheme/gambit/gambit-4.6.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/gambit-4.6.5.ebuild,v 1.1 2012/04/05 07:15:45 hkbst Exp $
+
+EAPI="4"
+
+inherit eutils elisp-common
+
+MY_PN=gambc
+MY_PV=${PV//./_}
+MY_P=${MY_PN}-v${MY_PV}
+
+DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter."
+HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
+SRC_URI="http://www.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/source/${MY_P}.tgz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND=""
+
+SITEFILE="50gambit-gentoo.el"
+
+S=${WORKDIR}/${MY_P} #-devel
+
+IUSE="emacs static"
+
+src_configure() {
+	econf $(use_enable !static shared) --docdir="${EPREFIX}"/usr/share/doc/${PF} --enable-single-host --disable-absolute-shared-libs
+}
+
+src_compile() {
+	emake bootstrap || die
+
+	if use emacs; then
+		elisp-compile misc/*.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
new file mode 100644
index 000000000000..7abff50a0fc0
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/desktop-file-utils/desktop-file-utils-0.20-r1.ebuild,v 1.1 2012/04/05 07:10:13 ssuominen Exp $
+
+EAPI=4
+inherit elisp-common eutils
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="http://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-validate_Categories_XFCE.patch
+
+	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch
new file mode 100644
index 000000000000..9cbcd7893a80
--- /dev/null
+++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.20-validate_Categories_XFCE.patch
@@ -0,0 +1,12 @@
+http://lists.freedesktop.org/archives/xdg/2012-April/012348.html
+
+--- src/validate.c
++++ src/validate.c
+@@ -499,6 +499,7 @@
+   { "Core",                   FALSE, FALSE, FALSE, { NULL } },
+   { "KDE",                    FALSE, FALSE, FALSE, { "Qt", NULL } },
+   { "GNOME",                  FALSE, FALSE, FALSE, { "GTK", NULL } },
++  { "XFCE",                   FALSE, FALSE, FALSE, { "GTK", NULL } },
+   { "GTK",                    FALSE, FALSE, FALSE, { NULL } },
+   { "Qt",                     FALSE, FALSE, FALSE, { NULL } },
+   { "Motif",                  FALSE, FALSE, FALSE, { NULL } },
diff --git a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
index 5c9ea1ff2f2c..95dccacced5b 100644
--- a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.1 2012/04/01 18:20:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.2 2012/04/05 09:47:46 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -47,7 +47,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
 	>=dev-util/intltool-0.35.5
 	>=app-text/gnome-doc-utils-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
+	doc? ( >=dev-util/gtk-doc-1 )
+	java? ( virtual/jdk:1.6 )"
 #	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )
 
 pkg_setup() {
diff --git a/gnustep-apps/cenon/cenon-3.9.5.ebuild b/gnustep-apps/cenon/cenon-3.9.5.ebuild
index 7ee0e076076b..ba3c9fa80375 100644
--- a/gnustep-apps/cenon/cenon-3.9.5.ebuild
+++ b/gnustep-apps/cenon/cenon-3.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.5.ebuild,v 1.1 2012/02/15 12:14:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.5.ebuild,v 1.2 2012/04/05 09:32:35 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -10,7 +10,7 @@ S=${WORKDIR}/${PN/c/C}
 DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
 HOMEPAGE="http://www.cenon.info/"
 SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/${P/c/C}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="Cenon"
 IUSE=""
diff --git a/gnustep-apps/gmines/gmines-0.2.ebuild b/gnustep-apps/gmines/gmines-0.2.ebuild
index b1ebc0b7038b..cd7146e804be 100644
--- a/gnustep-apps/gmines/gmines-0.2.ebuild
+++ b/gnustep-apps/gmines/gmines-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/gmines-0.2.ebuild,v 1.1 2012/02/14 21:46:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/gmines-0.2.ebuild,v 1.2 2012/04/05 09:33:58 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -8,7 +8,7 @@ inherit gnustep-2
 DESCRIPTION="The well-known minesweeper game."
 HOMEPAGE="http://gap.nongnu.org/gmines/index.html"
 SRC_URI="http://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/gnustep-apps/gorm/gorm-1.2.16.ebuild b/gnustep-apps/gorm/gorm-1.2.16.ebuild
index bd33b3562687..cccc405bcde2 100644
--- a/gnustep-apps/gorm/gorm-1.2.16.ebuild
+++ b/gnustep-apps/gorm/gorm-1.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.16.ebuild,v 1.1 2012/02/08 15:01:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gorm/gorm-1.2.16.ebuild,v 1.2 2012/04/05 09:34:42 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -9,7 +9,7 @@ DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
 HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild
index c52349beecc1..88b22342def4 100644
--- a/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild,v 1.1 2011/11/04 15:17:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild,v 1.2 2012/04/05 09:34:23 ago Exp $
 
 EAPI=3
 inherit gnustep-2
@@ -9,7 +9,7 @@ DESCRIPTION="A workspace manager for GNUstep"
 HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
index b41438635923..ac9983e21886 100644
--- a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
+++ b/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild,v 1.1 2012/02/09 10:44:43 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild,v 1.2 2012/04/05 09:33:37 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -12,7 +12,7 @@ SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="dbus"
 
 DEPEND=">=dev-libs/libical-0.27
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild
index 9a2907b7782f..f11f5198b767 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild,v 1.2 2012/02/17 10:58:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild,v 1.3 2012/04/05 09:30:34 ago Exp $
 
 EAPI=4
 inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
index d6a3749ef7fb..61453545a9a8 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.2 2012/02/17 10:57:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.3 2012/04/05 09:31:03 ago Exp $
 
 EAPI=4
 inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild
index 88ee709a031f..d5c6c70ccabc 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild,v 1.2 2012/02/17 10:56:01 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild,v 1.3 2012/04/05 09:31:33 ago Exp $
 
 EAPI=4
 inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl xim"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
index 80f0d42da5f1..80e97040ac14 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.1 2012/02/23 10:09:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.2 2012/04/05 09:29:35 ago Exp $
 
 EAPI=4
 inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="+icu +libffi ssl zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
index 1219af6d93ff..f33a52d50fb6 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.2 2012/02/22 15:59:29 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.3 2012/04/05 09:30:02 ago Exp $
 
 EAPI=4
 inherit gnustep-base multilib
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cups gif jpeg png speech"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index 6029916cad75..0614ec4dbbb6 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.5 2012/04/02 20:46:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.6 2012/04/05 09:29:04 ago Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
index 0280f720e834..b1df23552b01 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild,v 1.2 2012/02/09 21:36:18 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild,v 1.3 2012/04/05 09:28:25 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="app-shells/bash"
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild
index f9f935b8783a..fd196a6a9f0a 100644
--- a/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild
+++ b/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild,v 1.1 2011/08/19 12:37:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild,v 1.2 2012/04/05 09:32:13 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -10,7 +10,7 @@ S=${WORKDIR}/Cenon
 DESCRIPTION="Default library required to run Cenon"
 HOMEPAGE="http://www.cenon.info/"
 SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-${PV}-1.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="Cenon"
 IUSE=""
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
index 74c253591cf5..25d2b4a465b0 100644
--- a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
+++ b/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.4 2012/04/03 20:52:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.5 2012/04/05 09:33:18 ago Exp $
 
 EAPI=4
 inherit autotools gnustep-2
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=sys-apps/dbus-1.2.1"
diff --git a/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild b/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild
index 5aa201930f60..8bcd38d9f1ec 100644
--- a/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild
+++ b/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild,v 1.1 2012/02/15 12:34:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild,v 1.2 2012/04/05 09:32:54 ago Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -13,7 +13,7 @@ SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/sxiv/sxiv-1.0.ebuild b/media-gfx/sxiv/sxiv-1.0.ebuild
index 4437213edb9a..d881897afe6f 100644
--- a/media-gfx/sxiv/sxiv-1.0.ebuild
+++ b/media-gfx/sxiv/sxiv-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.0.ebuild,v 1.2 2012/03/29 08:36:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.0.ebuild,v 1.3 2012/04/05 07:43:49 jdhore Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/downloads/muennich/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
diff --git a/media-sound/seq24/seq24-0.9.2-r1.ebuild b/media-sound/seq24/seq24-0.9.2-r1.ebuild
index 867c796ded0b..46a0131d06ab 100644
--- a/media-sound/seq24/seq24-0.9.2-r1.ebuild
+++ b/media-sound/seq24/seq24-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.9.2-r1.ebuild,v 1.2 2012/03/28 07:35:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.9.2-r1.ebuild,v 1.3 2012/04/05 07:36:31 jdhore Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="jack lash"
 
 RDEPEND="media-libs/alsa-lib
diff --git a/media-video/smplayer/smplayer-0.7.1.ebuild b/media-video/smplayer/smplayer-0.7.1.ebuild
index ac1ec3c26b16..bbf6f7af9648 100644
--- a/media-video/smplayer/smplayer-0.7.1.ebuild
+++ b/media-video/smplayer/smplayer-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.7.1.ebuild,v 1.3 2012/04/04 02:06:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.7.1.ebuild,v 1.5 2012/04/05 09:25:55 ago Exp $
 
 EAPI=4
 LANGS="bg ca cs da de en_US es et eu fi fr gl hr hu it ja ka ko ku lt mk nl pl
@@ -25,7 +25,7 @@ DESCRIPTION="Great Qt4 GUI front-end for mplayer"
 HOMEPAGE="http://smplayer.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND="x11-libs/qt-gui:4
diff --git a/metadata/cache/app-admin/logsurfer+-1.8-r1 b/metadata/cache/app-admin/logsurfer+-1.8-r1
index 40e8ba3fff50..91bde33490e4 100644
--- a/metadata/cache/app-admin/logsurfer+-1.8-r1
+++ b/metadata/cache/app-admin/logsurfer+-1.8-r1
@@ -6,7 +6,7 @@ http://kerryt.orcon.net.nz/logsurfer-1.8.tar.gz http://www.crypt.gen.nz/logsurfe
 http://www.crypt.gen.nz/logsurfer/
 as-is
 Real Time Log Monitoring and Alerting
-amd64 ~x86
+amd64 x86
 multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.12 b/metadata/cache/app-emulation/virtualbox-4.1.12
new file mode 100644
index 000000000000..c64fde02af48
--- /dev/null
+++ b/metadata/cache/app-emulation/virtualbox-4.1.12
@@ -0,0 +1,22 @@
+!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+0
+http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
+
+http://www.virtualbox.org/
+GPL-2
+Family of powerful x86 virtualization products for enterprise as well as home use
+~amd64 ~x86
+base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
++additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
+java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
+additions? ( ~app-emulation/virtualbox-additions-4.1.12 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.12 )
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/virtualbox-4.1.6-r1 b/metadata/cache/app-emulation/virtualbox-4.1.6-r1
deleted file mode 100644
index b27f18c395c3..000000000000
--- a/metadata/cache/app-emulation/virtualbox-4.1.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.5 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-Family of powerful x86 virtualization products for enterprise as well as home use
-~amd64 ~x86
-base eutils fdo-mime flag-o-matic java-pkg-opt-2 java-utils-2 linux-info multilib pax-utils python qt4-r2 toolchain-funcs user versionator
-+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
-java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
-additions? ( ~app-emulation/virtualbox-additions-4.1.6 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.6 )
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-additions-4.1.6 b/metadata/cache/app-emulation/virtualbox-additions-4.1.12
similarity index 74%
rename from metadata/cache/app-emulation/virtualbox-additions-4.1.6
rename to metadata/cache/app-emulation/virtualbox-additions-4.1.12
index ac54db48fb29..5e5bb26ce05b 100644
--- a/metadata/cache/app-emulation/virtualbox-additions-4.1.6
+++ b/metadata/cache/app-emulation/virtualbox-additions-4.1.12
@@ -1,7 +1,7 @@
 
 !app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 0
-http://download.virtualbox.org/virtualbox/4.1.6/VBoxGuestAdditions_4.1.6.iso
+http://download.virtualbox.org/virtualbox/4.1.12/VBoxGuestAdditions_4.1.12.iso
 mirror
 http://www.virtualbox.org/
 PUEL
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.12 b/metadata/cache/app-emulation/virtualbox-bin-4.1.12
new file mode 100644
index 000000000000..1a6eb20d27d4
--- /dev/null
+++ b/metadata/cache/app-emulation/virtualbox-bin-4.1.12
@@ -0,0 +1,22 @@
+app-arch/unzip >=sys-apps/sed-4
+!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.12 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+0
+amd64? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12-77245-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12-77245-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBoxSDK-4.1.12-77245.zip ) http://download.virtualbox.org/virtualbox/4.1.12/Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz
+mirror
+http://www.virtualbox.org/
+GPL-2 PUEL
+Family of powerful x86 virtualization products for enterprise as well as home use
+~amd64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib pax-utils toolchain-funcs unpacker user versionator
++additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/virtualbox-bin-4.1.6-r1 b/metadata/cache/app-emulation/virtualbox-bin-4.1.6-r1
deleted file mode 100644
index b2dc80fa70dc..000000000000
--- a/metadata/cache/app-emulation/virtualbox-bin-4.1.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip
-!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.6 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-0
-amd64? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6-74727-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6-74727-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBoxSDK-4.1.6-74713.zip ) http://download.virtualbox.org/virtualbox/4.1.6/Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.tar.gz
-mirror
-http://www.virtualbox.org/
-GPL-2 PUEL
-Family of powerful x86 virtualization products for enterprise as well as home use
-~amd64 ~x86
-eutils fdo-mime multilib pax-utils toolchain-funcs unpacker user
-+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp
-
-
-
-2
-
-install postinst postrm unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.12 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.12
new file mode 100644
index 000000000000..921077e7b786
--- /dev/null
+++ b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.12
@@ -0,0 +1,22 @@
+
+~app-emulation/virtualbox-4.1.12
+0
+http://download.virtualbox.org/virtualbox/4.1.12/Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz
+mirror strip
+http://www.virtualbox.org/
+PUEL
+PUEL extensions for VirtualBox
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+2
+
+install
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.6 b/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.6
deleted file mode 100644
index 6acffca19b0e..000000000000
--- a/metadata/cache/app-emulation/virtualbox-extpack-oracle-4.1.6
+++ /dev/null
@@ -1,22 +0,0 @@
-
-~app-emulation/virtualbox-4.1.6
-0
-http://download.virtualbox.org/virtualbox/4.1.6/Oracle_VM_VirtualBox_Extension_Pack-4.1.6.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.6.tar.gz
-mirror strip
-http://www.virtualbox.org/
-PUEL
-PUEL extensions for VirtualBox
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.12 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.12
new file mode 100644
index 000000000000..6b81f79df66c
--- /dev/null
+++ b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.12
@@ -0,0 +1,22 @@
+X? ( ~x11-drivers/xf86-video-virtualbox-4.1.12 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+X? ( ~x11-drivers/xf86-video-virtualbox-4.1.12 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+0
+http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
+
+http://www.virtualbox.org/
+GPL-2
+VirtualBox kernel modules and user-space tools for Linux guests
+~amd64 ~x86
+eutils linux-info linux-mod multilib toolchain-funcs user versionator
+X kernel_linux
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.6-r1 b/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.6-r1
deleted file mode 100644
index d657696dc96b..000000000000
--- a/metadata/cache/app-emulation/virtualbox-guest-additions-4.1.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-X? ( ~x11-drivers/xf86-video-virtualbox-4.1.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-0
-http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox kernel modules and user-space tools for Linux guests
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-X kernel_linux
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-emulation/virtualbox-modules-4.1.6 b/metadata/cache/app-emulation/virtualbox-modules-4.1.12
similarity index 95%
rename from metadata/cache/app-emulation/virtualbox-modules-4.1.6
rename to metadata/cache/app-emulation/virtualbox-modules-4.1.12
index e5a35ff6b2a2..e7dfc622c0fb 100644
--- a/metadata/cache/app-emulation/virtualbox-modules-4.1.6
+++ b/metadata/cache/app-emulation/virtualbox-modules-4.1.12
@@ -1,7 +1,7 @@
 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 !=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 0
-http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.6.tar.xz
+http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.12.tar.xz
 
 http://www.virtualbox.org/
 GPL-2
diff --git a/metadata/cache/app-misc/gcstar-1.6.2 b/metadata/cache/app-misc/gcstar-1.6.2
index 1131766e4af6..8d1a9e28a147 100644
--- a/metadata/cache/app-misc/gcstar-1.6.2
+++ b/metadata/cache/app-misc/gcstar-1.6.2
@@ -6,7 +6,7 @@ http://download.gna.org/gcstar/gcstar-1.6.2.tar.gz
 http://www.gcstar.org/
 GPL-2
 Manage your collections of movies, games, books, music and more
-amd64 ~x86
+amd64 x86
 eutils fdo-mime gnome2-utils multilib toolchain-funcs user
 cddb gnome mp3 spell stats tellico vorbis
 
diff --git a/metadata/cache/app-office/passepartout-0.7.0 b/metadata/cache/app-office/passepartout-0.7.0
index 3813114b9b35..bcdd0d3c9188 100644
--- a/metadata/cache/app-office/passepartout-0.7.0
+++ b/metadata/cache/app-office/passepartout-0.7.0
@@ -6,7 +6,7 @@ mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2
 http://www.stacken.kth.se/project/pptout/
 BSD
 A DTP application for the X Window System
-amd64 ~x86
+amd64 x86
 autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 gnome debug
 
diff --git a/metadata/cache/app-vim/minibufexpl-6.4.3 b/metadata/cache/app-vim/minibufexpl-6.4.3
index 819f0713f48b..24a28525d11b 100644
--- a/metadata/cache/app-vim/minibufexpl-6.4.3
+++ b/metadata/cache/app-vim/minibufexpl-6.4.3
@@ -6,7 +6,7 @@ https://github.com/fholgado/minibufexpl.vim/tarball/6.4.3 -> minibufexpl-6.4.3.t
 https://github.com/fholgado/minibufexpl.vim
 as-is
 vim plugin: easily switch between buffers
-amd64 ~mips ~ppc ~x86
+amd64 ~mips ~ppc x86
 vim-doc vim-plugin
 
 
diff --git a/metadata/cache/dev-db/m17n-db-1.6.3 b/metadata/cache/dev-db/m17n-db-1.6.3
index 1f9b26d77646..debe68ebf965 100644
--- a/metadata/cache/dev-db/m17n-db-1.6.3
+++ b/metadata/cache/dev-db/m17n-db-1.6.3
@@ -6,7 +6,7 @@ http://www.m17n.org/m17n-lib-download/m17n-db-1.6.3.tar.gz
 http://www.m17n.org/m17n-lib/
 LGPL-2.1
 Database for the m17n library
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-db/pgadmin3-1.14.2 b/metadata/cache/dev-db/pgadmin3-1.14.2
index 713af38d4cf1..8913ead7a50c 100644
--- a/metadata/cache/dev-db/pgadmin3-1.14.2
+++ b/metadata/cache/dev-db/pgadmin3-1.14.2
@@ -6,7 +6,7 @@ mirror://postgresql/pgadmin3/release/v1.14.2/src/pgadmin3-1.14.2.tar.gz
 http://www.pgadmin.org/
 POSTGRESQL
 wxWidgets GUI for PostgreSQL.
-~amd64 ~ppc ~x86 ~x86-fbsd
+amd64 ~ppc ~x86 ~x86-fbsd
 eutils multilib toolchain-funcs user versionator wxwidgets
 debug
 
diff --git a/metadata/cache/dev-db/qdbm-1.8.78-r1 b/metadata/cache/dev-db/qdbm-1.8.78-r1
index 3de4b6b0e450..8f8f1f763b49 100644
--- a/metadata/cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/cache/dev-db/qdbm-1.8.78-r1
@@ -6,7 +6,7 @@ http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 http://fallabs.com/qdbm/
 LGPL-2.1
 Quick Database Manager
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 eutils java-pkg-opt-2 java-utils-2 multilib toolchain-funcs user versionator
 cxx debug java perl ruby zlib elibc_FreeBSD java
 
diff --git a/metadata/cache/dev-perl/Any-Moose-0.180.0 b/metadata/cache/dev-perl/Any-Moose-0.180.0
index 9bf1ab1ae5ca..142c124f8c50 100644
--- a/metadata/cache/dev-perl/Any-Moose-0.180.0
+++ b/metadata/cache/dev-perl/Any-Moose-0.180.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SA/SARTAK/Any-Moose-0.18.tar.gz
 http://search.cpan.org/dist/Any-Moose/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Use Moose or Mouse modules
-alpha amd64 ~hppa ia64 ~ppc sparc ~x86 ~ppc-macos
+alpha amd64 ~hppa ia64 ~ppc sparc x86 ~ppc-macos
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Class-Accessor-0.340.0 b/metadata/cache/dev-perl/Class-Accessor-0.340.0
index 8a350559bf5e..cb65ec4923ae 100644
--- a/metadata/cache/dev-perl/Class-Accessor-0.340.0
+++ b/metadata/cache/dev-perl/Class-Accessor-0.340.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
 http://search.cpan.org/dist/Class-Accessor/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Automated accessor generation
-~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/DBIx-DBSchema-0.400.0 b/metadata/cache/dev-perl/DBIx-DBSchema-0.400.0
index 206533075918..27d6fd567d23 100644
--- a/metadata/cache/dev-perl/DBIx-DBSchema-0.400.0
+++ b/metadata/cache/dev-perl/DBIx-DBSchema-0.400.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.40.tar.gz
 http://search.cpan.org/dist/DBIx-DBSchema/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Database-independent schema objects
-~alpha amd64 hppa ~ppc ~x86
+~alpha amd64 hppa ~ppc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/IO-Socket-INET6-2.690.0 b/metadata/cache/dev-perl/IO-Socket-INET6-2.690.0
index 111ea891361d..3b8426dc621a 100644
--- a/metadata/cache/dev-perl/IO-Socket-INET6-2.690.0
+++ b/metadata/cache/dev-perl/IO-Socket-INET6-2.690.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.69.tar.gz
 http://search.cpan.org/dist/IO-Socket-INET6/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Work with IO sockets in ipv6
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Mail-Audit-2.227.0 b/metadata/cache/dev-perl/Mail-Audit-2.227.0
index 104abbdd5804..f9519a18e7d6 100644
--- a/metadata/cache/dev-perl/Mail-Audit-2.227.0
+++ b/metadata/cache/dev-perl/Mail-Audit-2.227.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RJ/RJBS/Mail-Audit-2.227.tar.gz
 http://search.cpan.org/dist/Mail-Audit/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Mail sorting/delivery module for Perl.
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Net-Amazon-0.610.0 b/metadata/cache/dev-perl/Net-Amazon-0.610.0
index 24b197e2081b..417e2bc86264 100644
--- a/metadata/cache/dev-perl/Net-Amazon-0.610.0
+++ b/metadata/cache/dev-perl/Net-Amazon-0.610.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/B/BO/BOUMENOT/Net-Amazon-0.61.tar.gz
 http://search.cpan.org/dist/Net-Amazon/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Net::Amazon - Framework for accessing amazon.com via SOAP and XML/HTTP
-amd64 ~x86
+amd64 x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Net-FreeDB-0.80.0 b/metadata/cache/dev-perl/Net-FreeDB-0.80.0
index 938058ec3c9d..ab6fa24ae6af 100644
--- a/metadata/cache/dev-perl/Net-FreeDB-0.80.0
+++ b/metadata/cache/dev-perl/Net-FreeDB-0.80.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROAM/Net-FreeDB-0.08.tar.gz
 http://search.cpan.org/dist/Net-FreeDB/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 OOP interface to the FreeDB database
-amd64 ~x86
+amd64 x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/NetPacket-1.3.0 b/metadata/cache/dev-perl/NetPacket-1.3.0
index 51292de854e7..191a42971a1b 100644
--- a/metadata/cache/dev-perl/NetPacket-1.3.0
+++ b/metadata/cache/dev-perl/NetPacket-1.3.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.3.0.tar.gz
 http://search.cpan.org/dist/NetPacket/
 Artistic-2
 Perl NetPacket - network packets assembly/disassembly
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/PAR-Dist-0.480.0 b/metadata/cache/dev-perl/PAR-Dist-0.480.0
index 438cc17a3564..a56160efba01 100644
--- a/metadata/cache/dev-perl/PAR-Dist-0.480.0
+++ b/metadata/cache/dev-perl/PAR-Dist-0.480.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SM/SMUELLER/PAR-Dist-0.48.tar.gz
 http://search.cpan.org/dist/PAR-Dist/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Create and manipulate PAR distributions
-amd64 hppa ~x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris
+amd64 hppa x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/locale-maketext-fuzzy-0.110.0 b/metadata/cache/dev-perl/locale-maketext-fuzzy-0.110.0
index 22cc9d5800b1..e0d67eccc17a 100644
--- a/metadata/cache/dev-perl/locale-maketext-fuzzy-0.110.0
+++ b/metadata/cache/dev-perl/locale-maketext-fuzzy-0.110.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz
 http://search.cpan.org/dist/Locale-Maketext-Fuzzy/
 CC0-1.0-Universal
 Maketext from already interpolated strings
-amd64 hppa ~ppc ~x86
+amd64 hppa ~ppc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-python/mecab-python-0.98 b/metadata/cache/dev-python/mecab-python-0.98
index 923e739ee474..3b4cb358c8c4 100644
--- a/metadata/cache/dev-python/mecab-python-0.98
+++ b/metadata/cache/dev-python/mecab-python-0.98
@@ -6,7 +6,7 @@ mirror://sourceforge/mecab/mecab-python-0.98.tar.gz
 http://mecab.sourceforge.net/
 || ( BSD LGPL-2.1 GPL-2 )
 Python binding for MeCab
-amd64 ~ia64 ~ppc64 ~x86
+amd64 ~ia64 ~ppc64 x86
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/pydns-3.0.1 b/metadata/cache/dev-python/pydns-3.0.1
index 72f8f91149b7..bcdb32cd3888 100644
--- a/metadata/cache/dev-python/pydns-3.0.1
+++ b/metadata/cache/dev-python/pydns-3.0.1
@@ -6,7 +6,7 @@ http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.1.tar.gz
 http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
 CNRI
 Python module for DNS (Domain Name Service)
-amd64 ~x86
+amd64 x86
 distutils multilib python toolchain-funcs
 examples
 
diff --git a/metadata/cache/dev-ruby/arel-3.0.2-r1 b/metadata/cache/dev-ruby/arel-3.0.2-r1
new file mode 100644
index 000000000000..b685dd4d5979
--- /dev/null
+++ b/metadata/cache/dev-ruby/arel-3.0.2-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby18] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ree18] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ree18] virtual/ruby-minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] virtual/ruby-minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+3.0
+mirror://rubygems/arel-3.0.2.gem
+
+http://github.com/rails/arel
+MIT
+Arel is a Relational Algebra for Ruby.
+~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-scheme/gambit-4.6.5 b/metadata/cache/dev-scheme/gambit-4.6.5
new file mode 100644
index 000000000000..a1d2900abbc1
--- /dev/null
+++ b/metadata/cache/dev-scheme/gambit-4.6.5
@@ -0,0 +1,22 @@
+emacs? ( virtual/emacs )
+
+0
+http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-v4_6_5.tgz
+
+http://www.iro.umontreal.ca/~gambit/
+|| ( Apache-2.0 LGPL-2.1 )
+Gambit-C is a native Scheme to C compiler and interpreter.
+~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+elisp-common eutils multilib toolchain-funcs user
+emacs static
+
+
+
+4
+
+compile configure install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/dev-util/desktop-file-utils-0.20-r1 b/metadata/cache/dev-util/desktop-file-utils-0.20-r1
new file mode 100644
index 000000000000..182856e442fb
--- /dev/null
+++ b/metadata/cache/dev-util/desktop-file-utils-0.20-r1
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.12 emacs? ( virtual/emacs ) dev-util/pkgconfig
+>=dev-libs/glib-2.12 emacs? ( virtual/emacs )
+0
+http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.20.tar.xz
+
+http://freedesktop.org/wiki/Software/desktop-file-utils
+GPL-2
+Command line utilities to work with desktop menu entries
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+elisp-common eutils multilib toolchain-funcs user
+emacs
+
+
+
+4
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/gnome-extra/libgda-5.0.3-r1 b/metadata/cache/gnome-extra/libgda-5.0.3-r1
index 4a9158032998..181c302d61af 100644
--- a/metadata/cache/gnome-extra/libgda-5.0.3-r1
+++ b/metadata/cache/gnome-extra/libgda-5.0.3-r1
@@ -1,4 +1,4 @@
-app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 5
 mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
diff --git a/metadata/cache/gnustep-apps/cenon-3.9.5 b/metadata/cache/gnustep-apps/cenon-3.9.5
index 37270ef21857..362645232023 100644
--- a/metadata/cache/gnustep-apps/cenon-3.9.5
+++ b/metadata/cache/gnustep-apps/cenon-3.9.5
@@ -6,7 +6,7 @@ http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.5.tar.bz2
 http://www.cenon.info/
 Cenon
 Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-apps/gmines-0.2 b/metadata/cache/gnustep-apps/gmines-0.2
index 29d3a3af3002..cb07e00abec8 100644
--- a/metadata/cache/gnustep-apps/gmines-0.2
+++ b/metadata/cache/gnustep-apps/gmines-0.2
@@ -6,7 +6,7 @@ http://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
 http://gap.nongnu.org/gmines/index.html
 GPL-2
 The well-known minesweeper game.
-~amd64 ~ppc ~x86 ~x86-fbsd
+amd64 ~ppc ~x86 ~x86-fbsd
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-apps/gorm-1.2.16 b/metadata/cache/gnustep-apps/gorm-1.2.16
index 394b62901529..1d418f9b1073 100644
--- a/metadata/cache/gnustep-apps/gorm-1.2.16
+++ b/metadata/cache/gnustep-apps/gorm-1.2.16
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.16.tar.gz
 http://www.gnustep.org/experience/Gorm.html
 GPL-2
 A clone of the NeXTstep Interface Builder application for GNUstep
-~amd64 ~x86 ~x86-fbsd
+amd64 ~x86 ~x86-fbsd
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-apps/gworkspace-0.9.0 b/metadata/cache/gnustep-apps/gworkspace-0.9.0
index dde08a07dc8d..b9eeae76cc85 100644
--- a/metadata/cache/gnustep-apps/gworkspace-0.9.0
+++ b/metadata/cache/gnustep-apps/gworkspace-0.9.0
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.0.tar.gz
 http://www.gnustep.org/experience/GWorkspace.html
 GPL-2
 A workspace manager for GNUstep
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-apps/simpleagenda-0.42.2 b/metadata/cache/gnustep-apps/simpleagenda-0.42.2
index 3b2a44d6ac8a..a1c109669913 100644
--- a/metadata/cache/gnustep-apps/simpleagenda-0.42.2
+++ b/metadata/cache/gnustep-apps/simpleagenda-0.42.2
@@ -6,7 +6,7 @@ http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.42.2.tar.gz
 http://coyote.octets.fr/simpleagenda
 GPL-2
 a simple calendar and agenda application
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 dbus debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-back-art-0.22.0 b/metadata/cache/gnustep-base/gnustep-back-art-0.22.0
index 0b2c7f07e089..12c87759c122 100644
--- a/metadata/cache/gnustep-base/gnustep-back-art-0.22.0
+++ b/metadata/cache/gnustep-base/gnustep-back-art-0.22.0
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 http://www.gnustep.org
 LGPL-2.1
 libart_lgpl back-end component for the GNUstep GUI Library
-~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 eutils flag-o-matic gnustep-base multilib toolchain-funcs user
 opengl xim debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-back-cairo-0.22.0 b/metadata/cache/gnustep-base/gnustep-back-cairo-0.22.0
index 82ffad103e32..1b1ba8f998e1 100644
--- a/metadata/cache/gnustep-base/gnustep-back-cairo-0.22.0
+++ b/metadata/cache/gnustep-base/gnustep-back-cairo-0.22.0
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 http://www.gnustep.org
 LGPL-2.1
 Cairo back-end component for the GNUstep GUI Library.
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 eutils flag-o-matic gnustep-base multilib toolchain-funcs user
 opengl xim debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-back-xlib-0.22.0 b/metadata/cache/gnustep-base/gnustep-back-xlib-0.22.0
index 1196409a9961..53048bccf7f5 100644
--- a/metadata/cache/gnustep-base/gnustep-back-xlib-0.22.0
+++ b/metadata/cache/gnustep-base/gnustep-back-xlib-0.22.0
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 http://www.gnustep.org
 LGPL-2.1
 Default X11 back-end component for the GNUstep GUI Library
-~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 eutils flag-o-matic gnustep-base multilib toolchain-funcs user
 opengl xim debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-base-1.24.0-r1 b/metadata/cache/gnustep-base/gnustep-base-1.24.0-r1
index 3d4310a79629..26271276b836 100644
--- a/metadata/cache/gnustep-base/gnustep-base-1.24.0-r1
+++ b/metadata/cache/gnustep-base/gnustep-base-1.24.0-r1
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.0.tar.gz
 http://www.gnustep.org
 GPL-2 LGPL-2.1
 A library of general-purpose, non-graphical Objective C objects.
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 eutils flag-o-matic gnustep-base multilib toolchain-funcs user
 +icu +libffi ssl zeroconf debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-gui-0.22.0 b/metadata/cache/gnustep-base/gnustep-gui-0.22.0
index cfde6259c3a1..b909e7b08c5e 100644
--- a/metadata/cache/gnustep-base/gnustep-gui-0.22.0
+++ b/metadata/cache/gnustep-base/gnustep-gui-0.22.0
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.22.0.tar.gz
 http://www.gnustep.org/
 LGPL-2.1
 Library of GUI classes written in Obj-C
-~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 eutils flag-o-matic gnustep-base multilib toolchain-funcs user
 cups gif jpeg png speech debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-make-2.6.2 b/metadata/cache/gnustep-base/gnustep-make-2.6.2
index ab67cf00b1cb..40d9d03c67ba 100644
--- a/metadata/cache/gnustep-base/gnustep-make-2.6.2
+++ b/metadata/cache/gnustep-base/gnustep-make-2.6.2
@@ -6,7 +6,7 @@ ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 http://www.gnustep.org
 GPL-2
 GNUstep Makefile Package
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 eutils flag-o-matic gnustep-base multilib prefix toolchain-funcs user
 native-exceptions debug doc
 
diff --git a/metadata/cache/gnustep-base/gnustep-updater-0.2 b/metadata/cache/gnustep-base/gnustep-updater-0.2
index fe50e2b72916..0e866c625c71 100644
--- a/metadata/cache/gnustep-base/gnustep-updater-0.2
+++ b/metadata/cache/gnustep-base/gnustep-updater-0.2
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.2.tar.bz2
 http://www.gentoo.org
 GPL-2
 Helper tool to upgrade Gentoo GNUstep installations
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/gnustep-libs/cenonlibrary-3.9.4 b/metadata/cache/gnustep-libs/cenonlibrary-3.9.4
index daedb3ec14a2..84c044599c22 100644
--- a/metadata/cache/gnustep-libs/cenonlibrary-3.9.4
+++ b/metadata/cache/gnustep-libs/cenonlibrary-3.9.4
@@ -6,7 +6,7 @@ http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-3.9.4-1.t
 http://www.cenon.info/
 Cenon
 Default library required to run Cenon
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-libs/dbuskit-0.1 b/metadata/cache/gnustep-libs/dbuskit-0.1
index b664da6ce2b4..4e91989c79d7 100644
--- a/metadata/cache/gnustep-libs/dbuskit-0.1
+++ b/metadata/cache/gnustep-libs/dbuskit-0.1
@@ -6,7 +6,7 @@ http://download.gna.org/gnustep/dbuskit-0.1.tar.bz2
 http://www.gnustep.org
 LGPL-2.1
 framework that interfaces Objective-C applications with the D-Bus IPC service
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 autotools eutils flag-o-matic gnustep-2 gnustep-base libtool multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/gnustep-libs/highlighterkit-0.1.2 b/metadata/cache/gnustep-libs/highlighterkit-0.1.2
index 51ce3580384f..02e49d708bf3 100644
--- a/metadata/cache/gnustep-libs/highlighterkit-0.1.2
+++ b/metadata/cache/gnustep-libs/highlighterkit-0.1.2
@@ -6,7 +6,7 @@ http://download.gna.org/gnustep-nonfsf/HighlighterKit-0.1.2.tar.gz
 http://wiki.gnustep.org/index.php/HighlighterKit
 GPL-2
 Syntax highlighter framework
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
 debug doc
 
diff --git a/metadata/cache/media-gfx/sxiv-1.0 b/metadata/cache/media-gfx/sxiv-1.0
index 8bc9424bb07a..e26233b11c89 100644
--- a/metadata/cache/media-gfx/sxiv-1.0
+++ b/metadata/cache/media-gfx/sxiv-1.0
@@ -6,7 +6,7 @@ https://github.com/downloads/muennich/sxiv/sxiv-1.0.tar.gz
 https://github.com/muennich/sxiv/
 GPL-2
 Simple (or small or suckless) X Image Viewer
-amd64 ~x86
+amd64 x86
 eutils multilib portability savedconfig toolchain-funcs user
 savedconfig
 
diff --git a/metadata/cache/media-sound/seq24-0.9.2-r1 b/metadata/cache/media-sound/seq24-0.9.2-r1
index 2529bd893ca7..83fabd0294dc 100644
--- a/metadata/cache/media-sound/seq24-0.9.2-r1
+++ b/metadata/cache/media-sound/seq24-0.9.2-r1
@@ -6,7 +6,7 @@ http://edge.launchpad.net/seq24/trunk/0.9.2/+download/seq24-0.9.2.tar.bz2
 https://edge.launchpad.net/seq24/
 GPL-2
 Seq24 is a loop based MIDI sequencer with focus on live performances.
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 eutils multilib toolchain-funcs user
 jack lash
 
diff --git a/metadata/cache/media-video/smplayer-0.7.1 b/metadata/cache/media-video/smplayer-0.7.1
index f4733a9a755f..713fb741ea04 100644
--- a/metadata/cache/media-video/smplayer-0.7.1
+++ b/metadata/cache/media-video/smplayer-0.7.1
@@ -6,7 +6,7 @@ mirror://sourceforge/smplayer/smplayer-0.7.1.tar.bz2
 http://smplayer.sourceforge.net/
 GPL-2
 Great Qt4 GUI front-end for mplayer
-~amd64 ~arm hppa ~x86 ~x86-fbsd
+amd64 ~arm hppa x86 ~x86-fbsd
 base eutils multilib qt4-r2 toolchain-funcs user
 debug linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_US linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ka linguas_ko linguas_ku linguas_lt linguas_mk linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_sk linguas_sr linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW linguas_ar linguas_el linguas_ro linguas_ru linguas_sl linguas_uk linguas_vi
 
diff --git a/metadata/cache/net-analyzer/mtr-0.82 b/metadata/cache/net-analyzer/mtr-0.82
index 69ffd275111c..40a77d979df9 100644
--- a/metadata/cache/net-analyzer/mtr-0.82
+++ b/metadata/cache/net-analyzer/mtr-0.82
@@ -6,7 +6,7 @@ ftp://ftp.bitwizard.nl/mtr/mtr-0.82.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz
 http://www.bitwizard.nl/mtr/
 GPL-2
 My TraceRoute, an Excellent network diagnostic tool
-~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 gtk ipv6 suid
 
diff --git a/metadata/cache/net-analyzer/ostinato-0.5 b/metadata/cache/net-analyzer/ostinato-0.5
index 23d155ac47bc..0313e920a02d 100644
--- a/metadata/cache/net-analyzer/ostinato-0.5
+++ b/metadata/cache/net-analyzer/ostinato-0.5
@@ -6,7 +6,7 @@ http://ostinato.googlecode.com/files/ostinato-src-0.5.tar.gz
 http://code.google.com/p/ostinato/
 GPL-3
 A packet generator and analyzer
-amd64 ~x86
+amd64 x86
 base eutils multilib qt4-r2 toolchain-funcs user
 
 
diff --git a/metadata/cache/net-analyzer/sarg-2.3.2 b/metadata/cache/net-analyzer/sarg-2.3.2
index 7f24d3152306..44ea8dd1bf1b 100644
--- a/metadata/cache/net-analyzer/sarg-2.3.2
+++ b/metadata/cache/net-analyzer/sarg-2.3.2
@@ -6,7 +6,7 @@ mirror://sourceforge/sarg/sarg-2.3.2.tar.gz
 http://sarg.sourceforge.net/sarg.php
 GPL-2
 Squid Analysis Report Generator
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-analyzer/sflowtool-3.24 b/metadata/cache/net-analyzer/sflowtool-3.24
index 313c82cd5cc7..60bfdb6bb3eb 100644
--- a/metadata/cache/net-analyzer/sflowtool-3.24
+++ b/metadata/cache/net-analyzer/sflowtool-3.24
@@ -6,7 +6,7 @@ http://www.inmon.com/bin/sflowtool-3.24.tar.gz
 http://www.inmon.com/technology/sflowTools.php
 inmon-sflow
 sflowtool is a utility for collecting and processing sFlow data
-~amd64 ~ppc ~x86
+~amd64 ~ppc x86
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-irc/charybdis-3.3.0 b/metadata/cache/net-irc/charybdis-3.3.0
index efc1716e73ed..6247987f7cb0 100644
--- a/metadata/cache/net-irc/charybdis-3.3.0
+++ b/metadata/cache/net-irc/charybdis-3.3.0
@@ -6,7 +6,7 @@ http://www.stack.nl/~jilles/irc/charybdis-3.3.0.tbz2 http://dev.gentoo.org/~bink
 http://atheme.org/project/charybdis http://www.stack.nl/~jilles/irc/#charybdis
 GPL-2
 The atheme project's IRCd based on ratbox
-~amd64 ~x86
+amd64 ~x86
 autotools eutils libtool multilib toolchain-funcs user
 debug +ipv6 largenet ssl zlib
 
diff --git a/metadata/cache/net-irc/ircii-20111115 b/metadata/cache/net-irc/ircii-20111115
index 0b98f72267bb..e6ae814f2b96 100644
--- a/metadata/cache/net-irc/ircii-20111115
+++ b/metadata/cache/net-irc/ircii-20111115
@@ -6,7 +6,7 @@ ftp://ircii.warped.com/pub/ircII/ircii-20111115.tar.bz2 ftp://ircii.warped.com/p
 http://eterna.com.au/ircii/
 BSD
 An IRC and ICB client that runs under most UNIX platforms
-amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 eutils multilib toolchain-funcs user
 ipv6
 
diff --git a/metadata/cache/net-irc/shadowircd-6.3.2.1 b/metadata/cache/net-irc/shadowircd-6.3.2.1
index edc4fcc8effb..f189692db464 100644
--- a/metadata/cache/net-irc/shadowircd-6.3.2.1
+++ b/metadata/cache/net-irc/shadowircd-6.3.2.1
@@ -6,7 +6,7 @@ http://shadowircd.net/downloads/shadowircd-6.3.2.1.tar.bz2
 http://shadowircd.net
 GPL-2
 An IRCd based on charybdis that adds several useful features
-~amd64 ~x86
+amd64 ~x86
 eutils multilib toolchain-funcs user
 debug +ipv6 largenet ssl zlib
 
diff --git a/metadata/cache/net-irc/weechat-0.3.7 b/metadata/cache/net-irc/weechat-0.3.7
index 27a6a75ae8b4..eee5eebfbd4d 100644
--- a/metadata/cache/net-irc/weechat-0.3.7
+++ b/metadata/cache/net-irc/weechat-0.3.7
@@ -6,7 +6,7 @@ http://weechat.org/files/src/weechat-0.3.7.tar.bz2
 http://weechat.org/
 GPL-3
 Portable and multi-interface IRC client.
-~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux
+amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 base cmake-utils eutils flag-o-matic java-utils-2 multilib python ruby-ng toolchain-funcs user versionator
 guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer +irc +crypt doc nls +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru elibc_FreeBSD ruby_targets_ruby18
 
diff --git a/metadata/cache/net-wireless/wireless-regdb-20110428-r1 b/metadata/cache/net-wireless/wireless-regdb-20110428-r1
index cc19317413ec..d29a37464a64 100644
--- a/metadata/cache/net-wireless/wireless-regdb-20110428-r1
+++ b/metadata/cache/net-wireless/wireless-regdb-20110428-r1
@@ -6,7 +6,7 @@ http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2011.04.28.tar
 http://wireless.kernel.org/en/developers/Regulatory
 as-is
 Binary regulatory database for CRDA
-amd64 ~mips ~ppc ~ppc64 ~x86
+amd64 ~mips ~ppc ~ppc64 x86
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/perl-core/File-Path-2.08 b/metadata/cache/perl-core/File-Path-2.08
index 681c295fedb1..51762790c08b 100644
--- a/metadata/cache/perl-core/File-Path-2.08
+++ b/metadata/cache/perl-core/File-Path-2.08
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DL/DLAND/File-Path-2.08.tar.gz
 http://search.cpan.org/dist/File-Path/
 || ( Artistic GPL-2 )
 File path and name utilities
-amd64 ~ia64 ~sparc ~x86
+amd64 ~ia64 ~sparc x86
 alternatives base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-apps/paxctl-0.7 b/metadata/cache/sys-apps/paxctl-0.7
deleted file mode 100644
index 0167b57b56fd..000000000000
--- a/metadata/cache/sys-apps/paxctl-0.7
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-devel/binutils-2.14.90.0.8-r1
-
-0
-http://pax.grsecurity.net/paxctl-0.7.tar.gz
-
-http://pax.grsecurity.net
-GPL-2
-Manages various PaX related program header flags for Elf32, Elf64, binaries.
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils flag-o-matic multilib toolchain-funcs user
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/paxctl-0.7-r1 b/metadata/cache/sys-apps/paxctl-0.7-r1
index fdca2e4199f8..49ee9237f6a7 100644
--- a/metadata/cache/sys-apps/paxctl-0.7-r1
+++ b/metadata/cache/sys-apps/paxctl-0.7-r1
@@ -6,7 +6,7 @@ http://pax.grsecurity.net/paxctl-0.7.tar.bz2
 http://pax.grsecurity.net
 GPL-2
 Manages various PaX related program header flags for Elf32, Elf64, binaries.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/sys-fs/mtd-utils-1.4.8 b/metadata/cache/sys-fs/mtd-utils-1.4.8
index a46623119d53..41de52ce2a5e 100644
--- a/metadata/cache/sys-fs/mtd-utils-1.4.8
+++ b/metadata/cache/sys-fs/mtd-utils-1.4.8
@@ -6,7 +6,7 @@ http://git.infradead.org/mtd-utils.git/snapshot/v1.4.8.tar.gz -> mtd-utils-1.4.8
 http://git.infradead.org/?p=mtd-utils.git;a=summary
 GPL-2
 MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
-amd64 arm ~mips ~ppc ~x86 ~x86-linux
+amd64 arm ~mips ~ppc x86 ~x86-linux
 eutils multilib toolchain-funcs user
 xattr
 
diff --git a/metadata/cache/virtual/gnustep-back-0.22.0 b/metadata/cache/virtual/gnustep-back-0.22.0
index afbba7e58118..576b1a25e5a6 100644
--- a/metadata/cache/virtual/gnustep-back-0.22.0
+++ b/metadata/cache/virtual/gnustep-back-0.22.0
@@ -6,7 +6,7 @@
 
 
 Virtual for back-end component for the GNUstep GUI Library
-~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 
 
 
diff --git a/metadata/cache/virtual/perl-File-Path-2.08 b/metadata/cache/virtual/perl-File-Path-2.08
index 8aed8a57a5b1..edc00ba67cc4 100644
--- a/metadata/cache/virtual/perl-File-Path-2.08
+++ b/metadata/cache/virtual/perl-File-Path-2.08
@@ -6,7 +6,7 @@
 
 
 Virtual for File-Path
-amd64 ~ia64 ~sparc ~x86
+amd64 ~ia64 ~sparc x86
 
 
 
diff --git a/metadata/cache/www-apache/mod_xsendfile-0.12 b/metadata/cache/www-apache/mod_xsendfile-0.12
index 3f33eef4debf..89f457a290bd 100644
--- a/metadata/cache/www-apache/mod_xsendfile-0.12
+++ b/metadata/cache/www-apache/mod_xsendfile-0.12
@@ -6,7 +6,7 @@ https://tn123.org/mod_xsendfile/mod_xsendfile-0.12.tar.gz
 https://tn123.org/mod_xsendfile/
 Apache-2.0
 Apache2 module that processes X-SENDFILE headers registered by the original output handler
-~amd64 ~sparc x86 ~amd64-linux
+amd64 ~sparc x86 ~amd64-linux
 apache-module depend.apache multilib toolchain-funcs
 
 
diff --git a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1 b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.12
similarity index 91%
rename from metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1
rename to metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.12
index 6218c14c9d83..ecf3ec4701dd 100644
--- a/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1
+++ b/metadata/cache/x11-drivers/xf86-video-virtualbox-4.1.12
@@ -1,7 +1,7 @@
 x11-base/xorg-server[-minimal] x11-libs/libXcomposite >=dev-util/kbuild-0.1.999 =dev-lang/python-2* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-libs/libXdmcp x11-libs/libXau x11-libs/libX11 x11-libs/libXfixes x11-libs/libXext dri? ( x11-proto/xf86driproto >=x11-libs/libdrm-2.4.5 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 0
-http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
+http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
 
 http://www.virtualbox.org/
 GPL-2
diff --git a/metadata/cache/x11-libs/goocanvas-2.0.1 b/metadata/cache/x11-libs/goocanvas-2.0.1
index 4b0c41dd16d8..7d1989391f18 100644
--- a/metadata/cache/x11-libs/goocanvas-2.0.1
+++ b/metadata/cache/x11-libs/goocanvas-2.0.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.1.tar.xz
 http://live.gnome.org/GooCanvas
 GPL-2
 Canvas widget for GTK+ using the cairo 2D library for drawing
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 doc examples +introspection python
 
diff --git a/metadata/cache/x11-themes/smplayer-themes-20120131 b/metadata/cache/x11-themes/smplayer-themes-20120131
index 5aa6b57d9f54..9f24cecd9866 100644
--- a/metadata/cache/x11-themes/smplayer-themes-20120131
+++ b/metadata/cache/x11-themes/smplayer-themes-20120131
@@ -6,7 +6,7 @@ mirror://sourceforge/smplayer/smplayer-themes-20120131.tar.gz
 http://smplayer.sourceforge.net/
 CCPL-Attribution-2.5 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 GPL-2 LGPL-3
 Icon themes for smplayer
-~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+~amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
 
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b2dfc8a99fb5..058a1b2c44be 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2012 05:06:59 +0000
+Thu, 05 Apr 2012 11:06:58 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b2dfc8a99fb5..058a1b2c44be 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2012 05:06:59 +0000
+Thu, 05 Apr 2012 11:06:58 +0000
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r1 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r1
index f8263a8ac3fe..fa0da6567620 100644
--- a/metadata/md5-cache/app-admin/logsurfer+-1.8-r1
+++ b/metadata/md5-cache/app-admin/logsurfer+-1.8-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst
 DESCRIPTION=Real Time Log Monitoring and Alerting
 EAPI=4
 HOMEPAGE=http://www.crypt.gen.nz/logsurfer/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://kerryt.orcon.net.nz/logsurfer-1.8.tar.gz http://www.crypt.gen.nz/logsurfer/logsurfer-1.8.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=82c94aa18ff2d7d01f6d6e700fd1e53c
+_md5_=76dcfc3d420d90982f4dc39d63c56118
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.10 b/metadata/md5-cache/app-emulation/virtualbox-4.1.10
index 0b47471818dd..c8f56c3d17cf 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.10
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.10/VirtualBox-4.1.10.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	3551398d6ede2b572568832730cc2a45	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	0d58394f40a89c8ec116c71510d7584b	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7499c5aa7965af419daba30660102904
+_md5_=a33d7c865fa0ef9dfedb5cf96ede466b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.6-r1 b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
similarity index 50%
rename from metadata/md5-cache/app-emulation/virtualbox-4.1.6-r1
rename to metadata/md5-cache/app-emulation/virtualbox-4.1.12
index 83cac2c1b472..06f7131656ad 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.6-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( >=virtual/jdk-1.5 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl media-libs/libpng pam? ( sys-libs/pam ) sys-libs/libcap doc? ( dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.6 ) dev-util/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( >=net-libs/gsoap-2.7.13 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
 EAPI=4
 HOMEPAGE=http://www.virtualbox.org/
 IUSE=+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.6 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.6 )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.6 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.1.12 ) extensions? ( ~app-emulation/virtualbox-extpack-oracle-4.1.12 )
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.1.12 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 sys-libs/zlib !headless? ( qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl? ( x11-libs/qt-opengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.7 ) java? ( virtual/jre:1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	3551398d6ede2b572568832730cc2a45	python	36d7e2b7aa4dce62364c72eec96610cf	qt4-r2	0d58394f40a89c8ec116c71510d7584b	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=516e39aebcbda6befe20cc728128c797
+_md5_=66160a5a8531b163574475699272b9b9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.6 b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.12
similarity index 77%
rename from metadata/md5-cache/app-emulation/virtualbox-additions-4.1.6
rename to metadata/md5-cache/app-emulation/virtualbox-additions-4.1.12
index ffd40fc1d753..3c996cd94175 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-4.1.12
@@ -7,6 +7,6 @@ LICENSE=PUEL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.6/VBoxGuestAdditions_4.1.6.iso
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VBoxGuestAdditions_4.1.12.iso
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f175c8fc24623d3c4a1446aa0d53ba57
+_md5_=64c36eb47712e87d3a14d25a9bc049e5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.12 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.12
new file mode 100644
index 000000000000..1577918566a6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.12 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12-77245-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12-77245-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.12/VirtualBoxSDK-4.1.12-77245.zip ) http://download.virtualbox.org/virtualbox/4.1.12/Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz
+_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	b5ca2ccadb60760889faa3bccba121d9	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	3551398d6ede2b572568832730cc2a45	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	70e15279e12d6f095c52a04309c5d0a2	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=815f0edcdb16873b68b0a74b3f8a8e58
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.6-r1 b/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.6-r1
deleted file mode 100644
index 587e870d1906..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-4.1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise as well as home use
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=+additions +chm headless python sdk vboxwebsrv rdesktop-vrdp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-4.1.6 !headless? ( x11-libs/libXcursor media-libs/libsdl[X] x11-libs/libXrender x11-libs/libXfixes media-libs/libpng x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-libs/libXft media-libs/freetype media-libs/fontconfig x11-libs/libXext dev-libs/glib chm? ( dev-libs/expat ) ) x11-libs/libXt dev-libs/libxml2 x11-libs/libXau x11-libs/libX11 x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 dev-lang/python:2.4 ) )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6-74727-Linux_amd64.run ) x86? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6-74727-Linux_x86.run ) sdk? ( http://download.virtualbox.org/virtualbox/4.1.6/VirtualBoxSDK-4.1.6-74713.zip ) http://download.virtualbox.org/virtualbox/4.1.6/Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.6-74713.tar.gz
-_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	3551398d6ede2b572568832730cc2a45	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	unpacker	70e15279e12d6f095c52a04309c5d0a2	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=eab8d2dcfdf6829bad3e5058546a3597
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.6 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.12
similarity index 57%
rename from metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.6
rename to metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.12
index aac8b956de7b..ff2654afa1e5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-4.1.12
@@ -4,9 +4,9 @@ EAPI=2
 HOMEPAGE=http://www.virtualbox.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=PUEL
-RDEPEND=~app-emulation/virtualbox-4.1.6
+RDEPEND=~app-emulation/virtualbox-4.1.12
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.6/Oracle_VM_VirtualBox_Extension_Pack-4.1.6.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.6.tar.gz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=097628de05f9010ccf923cc7230839c3
+_md5_=878374e6a5a6530261d0dad9cbc28f50
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.12 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.12
new file mode 100644
index 000000000000..acd5b62abf1b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.12 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
+EAPI=2
+HOMEPAGE=http://www.virtualbox.org/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.12 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
+_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4378209049501b08551c54959c79dbff
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.6-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.6-r1
deleted file mode 100644
index 07203f200fbf..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-4.1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Linux guests
-EAPI=2
-HOMEPAGE=http://www.virtualbox.org/
-IUSE=X kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-4.1.6 x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
-_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=41706b3222f091dcf09f7d4666bc00fd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.6 b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.12
similarity index 92%
rename from metadata/md5-cache/app-emulation/virtualbox-modules-4.1.6
rename to metadata/md5-cache/app-emulation/virtualbox-modules-4.1.12
index c042a91b0d7b..cc3c53797a7f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.6
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-4.1.12
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.6.tar.xz
+SRC_URI=http://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-4.1.12.tar.xz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7e2860ec9ee2b732e4ba5d2b9f4b867b
+_md5_=f356818040b7744478d433ceb38e1694
diff --git a/metadata/md5-cache/app-misc/gcstar-1.6.2 b/metadata/md5-cache/app-misc/gcstar-1.6.2
index 7de4d42197fb..35bef2b7cd9d 100644
--- a/metadata/md5-cache/app-misc/gcstar-1.6.2
+++ b/metadata/md5-cache/app-misc/gcstar-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Manage your collections of movies, games, books, music and more
 EAPI=4
 HOMEPAGE=http://www.gcstar.org/
 IUSE=cddb gnome mp3 spell stats tellico vorbis
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/gtk2-perl dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) gnome? ( dev-perl/gnome2-vfs-perl ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
 SLOT=0
 SRC_URI=http://download.gna.org/gcstar/gcstar-1.6.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b5ca2ccadb60760889faa3bccba121d9	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9a44ed81badabdc867451c7c10fa59ad
+_md5_=81a9dfbdf9c83ab7ae6ee50ec52abafe
diff --git a/metadata/md5-cache/app-office/passepartout-0.7.0 b/metadata/md5-cache/app-office/passepartout-0.7.0
index b58923a2ebc2..255be3f0470d 100644
--- a/metadata/md5-cache/app-office/passepartout-0.7.0
+++ b/metadata/md5-cache/app-office/passepartout-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=A DTP application for the X Window System
 EAPI=2
 HOMEPAGE=http://www.stacken.kth.se/project/pptout/
 IUSE=gnome debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-cpp/libxmlpp:2.6 >=dev-libs/libxml2-2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/freetype:2 virtual/fam gnome? ( gnome-base/libgnome gnome-base/gnome-vfs ) dev-libs/libxslt app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	b5ca2ccadb60760889faa3bccba121d9	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d8fd8ade79006ee36eb2f52a0774eb0c
+_md5_=6a9b862a413d781c4e5d7a71e14c8adf
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.4.3 b/metadata/md5-cache/app-vim/minibufexpl-6.4.3
index 1a5e8fcc2f9e..4cfd4a6bbaa9 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.4.3
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.4.3
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 DESCRIPTION=vim plugin: easily switch between buffers
 EAPI=4
 HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
-KEYWORDS=amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ~ppc x86
 LICENSE=as-is
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/tarball/6.4.3 -> minibufexpl-6.4.3.tar.gz
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	af7939f5d748a2ceeff320440e8905b1
-_md5_=473a846428f3863d4d4c11f2e97fbddb
+_md5_=7c5076586d1c4e7744dad6b51d1a97aa
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.6.3 b/metadata/md5-cache/dev-db/m17n-db-1.6.3
index 5190e31f9dae..367460426434 100644
--- a/metadata/md5-cache/dev-db/m17n-db-1.6.3
+++ b/metadata/md5-cache/dev-db/m17n-db-1.6.3
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Database for the m17n library
 EAPI=4
 HOMEPAGE=http://www.m17n.org/m17n-lib/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-db-1.6.3.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2beb27e93fb74f1dec0a947eef28638f
+_md5_=17482f33bbdf499bcf033a5adc97cc82
diff --git a/metadata/md5-cache/dev-db/pgadmin3-1.14.2 b/metadata/md5-cache/dev-db/pgadmin3-1.14.2
index 1c45dd7d0c3a..8200d28eeaf8 100644
--- a/metadata/md5-cache/dev-db/pgadmin3-1.14.2
+++ b/metadata/md5-cache/dev-db/pgadmin3-1.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=wxWidgets GUI for PostgreSQL.
 EAPI=4
 HOMEPAGE=http://www.pgadmin.org/
 IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=POSTGRESQL
 RDEPEND=x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/v1.14.2/src/pgadmin3-1.14.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=c2b815e3885e4bfe16ebc4b538931c95
+_md5_=5adc3dacfecea2c2e9bc2484598963cd
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index ffd35b90d767..f44e44dbf767 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Quick Database Manager
 EAPI=4
 HOMEPAGE=http://fallabs.com/qdbm/
 IUSE=cxx debug java perl ruby zlib elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.8 ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ba25257e94b3060515677be7ade04bf
+_md5_=62a810712ee6029266c97f2b6f4d3ddc
diff --git a/metadata/md5-cache/dev-perl/Any-Moose-0.180.0 b/metadata/md5-cache/dev-perl/Any-Moose-0.180.0
index 09dfe82f0889..667906c4cab9 100644
--- a/metadata/md5-cache/dev-perl/Any-Moose-0.180.0
+++ b/metadata/md5-cache/dev-perl/Any-Moose-0.180.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-perl/Mouse-0.40 dev-perl/Moose ) virtual/perl-version >=virtua
 DESCRIPTION=Use Moose or Mouse modules
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Any-Moose/
-KEYWORDS=alpha amd64 ~hppa ia64 ~ppc sparc ~x86 ~ppc-macos
+KEYWORDS=alpha amd64 ~hppa ia64 ~ppc sparc x86 ~ppc-macos
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-perl/Mouse-0.40 dev-perl/Moose ) virtual/perl-version dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SARTAK/Any-Moose-0.18.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ee5f492becab5ece96ed1218c9ca9433
+_md5_=6f19aadefe4da13339826e6d3d64c7af
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0 b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0
index baec87e1af4e..1871477d4f39 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Sub-Name dev-lang/perl[-build]
 DESCRIPTION=Automated accessor generation
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Class-Accessor/
-KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Sub-Name dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9490f8239c3ed3df12ee34de47688a9f
+_md5_=b6ab099e2e928a2b1fb891e14a13d4c4
diff --git a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.400.0 b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.400.0
index 789de44a9ad3..430f10d752b6 100644
--- a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.400.0
+++ b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.400.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/DBI dev-perl/FreezeThaw virtual/perl-Storable dev-lang/perl[-bui
 DESCRIPTION=Database-independent schema objects
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/DBIx-DBSchema/
-KEYWORDS=~alpha amd64 hppa ~ppc ~x86
+KEYWORDS=~alpha amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/DBI dev-perl/FreezeThaw virtual/perl-Storable dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.40.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1bfbff4dc3a6d3ea61911867a7c2d360
+_md5_=9cf211f50a2d0566fbf7830bb95e08b6
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.690.0 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.690.0
index 6fba3dce5f47..84c2cb5b09e3 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.690.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.690.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Socket6 virtual/perl-Module-Build dev-lang/perl[-build]
 DESCRIPTION=Work with IO sockets in ipv6
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-INET6/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Socket6 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.69.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5b5f860f50f1ec33495827271080094e
+_md5_=51e41b6cff8ff4340d27502bb9eb873e
diff --git a/metadata/md5-cache/dev-perl/Mail-Audit-2.227.0 b/metadata/md5-cache/dev-perl/Mail-Audit-2.227.0
index 8843040f15b1..29b0f57efc29 100644
--- a/metadata/md5-cache/dev-perl/Mail-Audit-2.227.0
+++ b/metadata/md5-cache/dev-perl/Mail-Audit-2.227.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/MIME-tools >=dev-perl/MailTools-1.15 virtual/perl-libnet dev-per
 DESCRIPTION=Mail sorting/delivery module for Perl.
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Mail-Audit/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/MIME-tools >=dev-perl/MailTools-1.15 virtual/perl-libnet dev-perl/File-Tempdir >=dev-perl/File-HomeDir-0.61 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Mail-Audit-2.227.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2a7ac4a4ac08f51c74d366eb6cc8f971
+_md5_=d1863c21f0e37db095a2162c74d18e06
diff --git a/metadata/md5-cache/dev-perl/Net-Amazon-0.610.0 b/metadata/md5-cache/dev-perl/Net-Amazon-0.610.0
index 409da324a7bb..51fefe241bea 100644
--- a/metadata/md5-cache/dev-perl/Net-Amazon-0.610.0
+++ b/metadata/md5-cache/dev-perl/Net-Amazon-0.610.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl >=dev-perl/XML-Simple-2.08 >=virtual/perl-Time-HiRes
 DESCRIPTION=Net::Amazon - Framework for accessing amazon.com via SOAP and XML/HTTP
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Net-Amazon/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Simple-2.08 >=virtual/perl-Time-HiRes-1.0 >=dev-perl/Log-Log4perl-0.3 virtual/perl-Digest-SHA dev-perl/URI dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOUMENOT/Net-Amazon-0.61.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f330ac057e63ba369b5ca28e36eae4cb
+_md5_=33f2a106f27296e50b8cc31d8b2fe9ce
diff --git a/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0 b/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0
index 3683ec30d84f..202c5d30b17b 100644
--- a/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0
+++ b/metadata/md5-cache/dev-perl/Net-FreeDB-0.80.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/CDDB-File-1.10.0 virtual/perl-libnet >=virtual/perl-File-Temp-
 DESCRIPTION=OOP interface to the FreeDB database
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Net-FreeDB/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/CDDB-File-1.10.0 virtual/perl-libnet >=virtual/perl-File-Temp-0.50.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROAM/Net-FreeDB-0.08.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ebf9ba671851c2e06868c23a000ebc05
+_md5_=fe5c2a975a78fb7277d0f603142bbb84
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.3.0 b/metadata/md5-cache/dev-perl/NetPacket-1.3.0
index 24d34a894e1e..b2fc66f7ff90 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.3.0
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl NetPacket - network packets assembly/disassembly
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/NetPacket/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.3.0.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3f1602429d6cea01434ff9e74aaf44b9
+_md5_=89fd5ef6f3002010713552690eaefbad
diff --git a/metadata/md5-cache/dev-perl/PAR-Dist-0.480.0 b/metadata/md5-cache/dev-perl/PAR-Dist-0.480.0
index d35a4e79e450..a1969f13b5d4 100644
--- a/metadata/md5-cache/dev-perl/PAR-Dist-0.480.0
+++ b/metadata/md5-cache/dev-perl/PAR-Dist-0.480.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev
 DESCRIPTION=Create and manipulate PAR distributions
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/PAR-Dist/
-KEYWORDS=amd64 hppa ~x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 hppa x86 ~x86-fbsd ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev-perl/yaml ) dev-perl/Archive-Zip dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/PAR-Dist-0.48.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=318bb29d0d1bb06a3a1cd5a0567f057f
+_md5_=994455f74a0cb2796dccb2ce13132ab5
diff --git a/metadata/md5-cache/dev-perl/locale-maketext-fuzzy-0.110.0 b/metadata/md5-cache/dev-perl/locale-maketext-fuzzy-0.110.0
index 81f73c241aa6..009fac57ac2a 100644
--- a/metadata/md5-cache/dev-perl/locale-maketext-fuzzy-0.110.0
+++ b/metadata/md5-cache/dev-perl/locale-maketext-fuzzy-0.110.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Maketext from already interpolated strings
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Locale-Maketext-Fuzzy/
-KEYWORDS=amd64 hppa ~ppc ~x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=CC0-1.0-Universal
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=592100fb47b68312a4fa7f8425e93d53
+_md5_=d2cc90a6a7381d28adb273018092faf3
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.98 b/metadata/md5-cache/dev-python/mecab-python-0.98
index 70f2d25e13a0..f78dabfa1400 100644
--- a/metadata/md5-cache/dev-python/mecab-python-0.98
+++ b/metadata/md5-cache/dev-python/mecab-python-0.98
@@ -3,10 +3,10 @@ DEPEND=>=app-text/mecab-0.98 =dev-lang/python-2*
 DESCRIPTION=Python binding for MeCab
 EAPI=3
 HOMEPAGE=http://mecab.sourceforge.net/
-KEYWORDS=amd64 ~ia64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc64 x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 RDEPEND=>=app-text/mecab-0.98 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/mecab/mecab-python-0.98.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=0477c971e075bdc784567c985a7a517f
+_md5_=0944be2b4b4ef93865548750fb31dd18
diff --git a/metadata/md5-cache/dev-python/pydns-3.0.1 b/metadata/md5-cache/dev-python/pydns-3.0.1
index a523ad357368..88f653da4a84 100644
--- a/metadata/md5-cache/dev-python/pydns-3.0.1
+++ b/metadata/md5-cache/dev-python/pydns-3.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Python module for DNS (Domain Name Service)
 EAPI=4
 HOMEPAGE=http://pydns.sourceforge.net/ http://pypi.python.org/pypi/pydns
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CNRI
 RDEPEND==dev-lang/python-3*
 SLOT=3
 SRC_URI=http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=b271117958ee1b61d3210ccab22d253b
+_md5_=f7271f6a84e08aee0f81e4557cb1d7b4
diff --git a/metadata/md5-cache/dev-ruby/arel-3.0.2-r1 b/metadata/md5-cache/dev-ruby/arel-3.0.2-r1
new file mode 100644
index 000000000000..5ff91ec70267
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/arel-3.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby18] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ree18] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_ree18] virtual/ruby-minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] virtual/ruby-minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Arel is a Relational Algebra for Ruby.
+EAPI=2
+HOMEPAGE=http://github.com/rails/arel
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+SLOT=3.0
+SRC_URI=mirror://rubygems/arel-3.0.2.gem
+_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=72e8ed8eadee1bf5914141005fad9b82
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.6.5 b/metadata/md5-cache/dev-scheme/gambit-4.6.5
new file mode 100644
index 000000000000..65d94b700b48
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/gambit-4.6.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm
+DEPEND=emacs? ( virtual/emacs )
+DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter.
+EAPI=4
+HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
+IUSE=emacs static
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=|| ( Apache-2.0 LGPL-2.1 )
+SLOT=0
+SRC_URI=http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-v4_6_5.tgz
+_eclasses_=elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5edfc519a22232e9b83e3e2d125e6f62
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1
new file mode 100644
index 000000000000..318bc1afa70b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.20-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.12 emacs? ( virtual/emacs ) dev-util/pkgconfig
+DESCRIPTION=Command line utilities to work with desktop menu entries
+EAPI=4
+HOMEPAGE=http://freedesktop.org/wiki/Software/desktop-file-utils
+IUSE=emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.12 emacs? ( virtual/emacs )
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.20.tar.xz
+_eclasses_=elisp-common	aa9676ce708f8aacf54ff9df8015963b	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=85a3809282acd1d047be9c516cca3ffd
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1 b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
index 77e1396c1844..77fc4eb2dc6f 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) java? ( virtual/jdk:1.6 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 DESCRIPTION=Gnome Database Access Library
 EAPI=4
 HOMEPAGE=http://www.gnome-db.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/
 SLOT=5
 SRC_URI=mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	b5ca2ccadb60760889faa3bccba121d9	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ec4e73e2a0b189bdbc64526b2ac65a0a
+_md5_=d0558e58e1c1c3ae06c413aa67f7b2ac
diff --git a/metadata/md5-cache/gnustep-apps/cenon-3.9.5 b/metadata/md5-cache/gnustep-apps/cenon-3.9.5
index 4fe262adee99..a778982f7b42 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-3.9.5
+++ b/metadata/md5-cache/gnustep-apps/cenon-3.9.5
@@ -4,10 +4,10 @@ DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
 EAPI=4
 HOMEPAGE=http://www.cenon.info/
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-3.9.5.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=98b5598fbf91c86a1857e96a4aafd6b6
+_md5_=0762a20b86c48907f3b1491955bf5aee
diff --git a/metadata/md5-cache/gnustep-apps/gmines-0.2 b/metadata/md5-cache/gnustep-apps/gmines-0.2
index 20edf98bedd2..91631abf5a33 100644
--- a/metadata/md5-cache/gnustep-apps/gmines-0.2
+++ b/metadata/md5-cache/gnustep-apps/gmines-0.2
@@ -4,10 +4,10 @@ DESCRIPTION=The well-known minesweeper game.
 EAPI=4
 HOMEPAGE=http://gap.nongnu.org/gmines/index.html
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fd6db928cd0427b2437d16beb3b04cd9
+_md5_=9cf07c45db753f9678a47d5a5389f149
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.2.16 b/metadata/md5-cache/gnustep-apps/gorm-1.2.16
index 18b6dc924a82..83c7d4f7ea82 100644
--- a/metadata/md5-cache/gnustep-apps/gorm-1.2.16
+++ b/metadata/md5-cache/gnustep-apps/gorm-1.2.16
@@ -4,10 +4,10 @@ DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
 EAPI=4
 HOMEPAGE=http://www.gnustep.org/experience/Gorm.html
 IUSE=debug doc
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-gui-0.18.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.16.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5d9908e0d00c532ae38c95b2bfc4a756
+_md5_=1d84a2ac7c030e9b467e00802b3fd456
diff --git a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0 b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
index 19fbee9e589d..6291b226068f 100644
--- a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
+++ b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=A workspace manager for GNUstep
 EAPI=3
 HOMEPAGE=http://www.gnustep.org/experience/GWorkspace.html
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b64337bd67be0ebd8374175bd3c09496
+_md5_=b27320e46f8e48b6e9662f927c9d4b56
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
index 199dbed29ead..a9dfbbf165f3 100644
--- a/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.42.2
@@ -4,10 +4,10 @@ DESCRIPTION=a simple calendar and agenda application
 EAPI=4
 HOMEPAGE=http://coyote.octets.fr/simpleagenda
 IUSE=dbus debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.42.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ff641ca7ac46937d2a2c0691491cbb74
+_md5_=3990abba10f954183ceebfa3a08a1add
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
index 65f41def612a..cdf7a4df7904 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-art-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=opengl xim debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3290157bd425fcfbb47e0a25a1e29d07
+_md5_=52b53d155b26744057ec01c7bea29971
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
index 66ad9f1f489f..e2a3bb68cf06 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-cairo-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cairo back-end component for the GNUstep GUI Library.
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=opengl xim debug doc
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d24e1eb39ae4596f3fe297dea6888f64
+_md5_=03cec0c19dd8b778b26bfa9e5677c319
diff --git a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
index 75f8da840247..87a58799919d 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-back-xlib-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=opengl xim debug doc
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.22* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.22.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0db1d98eb93a045d9037ff3b78e4d974
+_md5_=2aa7abdd4b724b4e71b99d5895267aca
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
index e37778899d44..eba8387af78f 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A library of general-purpose, non-graphical Objective C objects.
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=+icu +libffi ssl zeroconf debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 icu? ( >=dev-libs/icu-4.0 ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) ssl? ( net-libs/gnutls ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1 >=dev-libs/openssl-0.9.7 >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=17fba2a7b16e53f5e7d0dc6dc9f82ab1
+_md5_=d50a21add6f5e68609dc2b3cbcd363df
diff --git a/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0 b/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
index 50c315733ec2..521b40a0bb2b 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-gui-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library of GUI classes written in Obj-C
 EAPI=4
 HOMEPAGE=http://www.gnustep.org/
 IUSE=cups gif jpeg png speech debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.0 media-libs/audiofile >=media-libs/tiff-3 x11-libs/libXt cups? ( >=net-print/cups-1.1 ) gif? ( >=media-libs/giflib-4.1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2 ) speech? ( app-accessibility/flite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.22.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5f9e86c5f5d73e029d77b89a38234d68
+_md5_=9a0785e391d625e3fccb387f4161c7f7
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
index 7333536c8fea..ee0f0f213049 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNUstep Makefile Package
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=native-exceptions debug doc
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 >=sys-devel/gcc-3.3[objc]
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=70b053e7b48c7c1472d4342e847f75f0
+_md5_=8416cb7283c414288b9eea254f82d477
diff --git a/metadata/md5-cache/gnustep-base/gnustep-updater-0.2 b/metadata/md5-cache/gnustep-base/gnustep-updater-0.2
index 01fbff7df763..b9876cab2d56 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-updater-0.2
+++ b/metadata/md5-cache/gnustep-base/gnustep-updater-0.2
@@ -3,9 +3,9 @@ DEPEND=app-shells/bash
 DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
 EAPI=4
 HOMEPAGE=http://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.2.tar.bz2
-_md5_=19bd0e86906bba521d1af3e3edc696d7
+_md5_=ccfb93de75ab89007adfde7e4413251a
diff --git a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4 b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
index c3bc1ed78a3d..b16c925d0d9f 100644
--- a/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
+++ b/metadata/md5-cache/gnustep-libs/cenonlibrary-3.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Default library required to run Cenon
 EAPI=4
 HOMEPAGE=http://www.cenon.info/
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Cenon
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-3.9.4-1.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fddcf2d3a1570c4db64eb30d8ed51b2d
+_md5_=41b95688837720f84d7a27b9f70fb2b2
diff --git a/metadata/md5-cache/gnustep-libs/dbuskit-0.1 b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
index 747eade49c11..c057a8ac49a5 100644
--- a/metadata/md5-cache/gnustep-libs/dbuskit-0.1
+++ b/metadata/md5-cache/gnustep-libs/dbuskit-0.1
@@ -4,10 +4,10 @@ DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IP
 EAPI=4
 HOMEPAGE=http://www.gnustep.org
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b440d8cc76db0e56add163e9fa6b6944
+_md5_=2fb860d84ba3db7c9f515a6f47dd0f13
diff --git a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2 b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
index 19bdfa725b52..97431bd449d0 100644
--- a/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
+++ b/metadata/md5-cache/gnustep-libs/highlighterkit-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Syntax highlighter framework
 EAPI=4
 HOMEPAGE=http://wiki.gnustep.org/index.php/HighlighterKit
 IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=http://download.gna.org/gnustep-nonfsf/HighlighterKit-0.1.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnustep-2	8084c74922e0081b7eeea8408b9fd3d2	gnustep-base	a3ff8ba225ffccb43419fd84841dad54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=95ba88e176320b9a1e46777f08ca5972
+_md5_=73e0cb94fea6cfbe16f2023589b595df
diff --git a/metadata/md5-cache/media-gfx/sxiv-1.0 b/metadata/md5-cache/media-gfx/sxiv-1.0
index d5ea00e46685..f3ce83f2de86 100644
--- a/metadata/md5-cache/media-gfx/sxiv-1.0
+++ b/metadata/md5-cache/media-gfx/sxiv-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple (or small or suckless) X Image Viewer
 EAPI=4
 HOMEPAGE=https://github.com/muennich/sxiv/
 IUSE=savedconfig
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/downloads/muennich/sxiv/sxiv-1.0.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b4e659722e47e63a8693dd37d46a6baf
+_md5_=26a1148b1c6b390b6c93016fc9ec87a3
diff --git a/metadata/md5-cache/media-sound/seq24-0.9.2-r1 b/metadata/md5-cache/media-sound/seq24-0.9.2-r1
index 23cc1ca0c1a5..4f4032c51a94 100644
--- a/metadata/md5-cache/media-sound/seq24-0.9.2-r1
+++ b/metadata/md5-cache/media-sound/seq24-0.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Seq24 is a loop based MIDI sequencer with focus on live performances
 EAPI=4
 HOMEPAGE=https://edge.launchpad.net/seq24/
 IUSE=jack lash
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=dev-cpp/gtkmm-2.4:2.4 >=dev-libs/libsigc++-2.2:2 jack? ( >=media-sound/jack-audio-connection-kit-0.90 ) lash? ( >=media-sound/lash-0.5 )
 SLOT=0
 SRC_URI=http://edge.launchpad.net/seq24/trunk/0.9.2/+download/seq24-0.9.2.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e88bcc01f248ed7604380ea63705b8a5
+_md5_=12bf18f4f1082c4d33662bb6c9a885e5
diff --git a/metadata/md5-cache/media-video/smplayer-0.7.1 b/metadata/md5-cache/media-video/smplayer-0.7.1
index d1aab980e8b1..ad9cd7bf4057 100644
--- a/metadata/md5-cache/media-video/smplayer-0.7.1
+++ b/metadata/md5-cache/media-video/smplayer-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Great Qt4 GUI front-end for mplayer
 EAPI=4
 HOMEPAGE=http://smplayer.sourceforge.net/
 IUSE=debug linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_US linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hr linguas_hu linguas_it linguas_ja linguas_ka linguas_ko linguas_ku linguas_lt linguas_mk linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_sk linguas_sr linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW linguas_ar linguas_el linguas_ro linguas_ru linguas_sl linguas_uk linguas_vi
-KEYWORDS=~amd64 ~arm hppa ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm hppa x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4 dev-libs/quazip || ( media-video/mplayer[ass,png,X] media-video/mplayer2[ass,png,X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-0.7.1.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	0d58394f40a89c8ec116c71510d7584b	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fc160a8e07237b86484d6f59c4fae6d3
+_md5_=b7c18e2d13e1e38a1243b5c9436ee587
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.82 b/metadata/md5-cache/net-analyzer/mtr-0.82
index 167d65136c7e..99436995bd20 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.82
+++ b/metadata/md5-cache/net-analyzer/mtr-0.82
@@ -4,10 +4,10 @@ DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=4
 HOMEPAGE=http://www.bitwizard.nl/mtr/
 IUSE=gtk ipv6 suid
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.82.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8ce2ce769612b69291c251c3043725bd
+_md5_=7c2e154d6630b51991076b82bbca8af1
diff --git a/metadata/md5-cache/net-analyzer/ostinato-0.5 b/metadata/md5-cache/net-analyzer/ostinato-0.5
index ae5b8f0c4370..b3757b7749f2 100644
--- a/metadata/md5-cache/net-analyzer/ostinato-0.5
+++ b/metadata/md5-cache/net-analyzer/ostinato-0.5
@@ -3,10 +3,10 @@ DEPEND=dev-libs/protobuf net-libs/libpcap x11-libs/qt-core:4 x11-libs/qt-gui:4 x
 DESCRIPTION=A packet generator and analyzer
 EAPI=2
 HOMEPAGE=http://code.google.com/p/ostinato/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf net-libs/libpcap x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-script:4
 SLOT=0
 SRC_URI=http://ostinato.googlecode.com/files/ostinato-src-0.5.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	0d58394f40a89c8ec116c71510d7584b	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c665962437eeff0c4e084cd7fa0c878c
+_md5_=99988556c22cb58d7b1400857f51c80b
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.2 b/metadata/md5-cache/net-analyzer/sarg-2.3.2
index ad9836669e82..51458d23d6f2 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.3.2
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.2
@@ -3,10 +3,10 @@ DEPEND=media-libs/gd[png,truetype]
 DESCRIPTION=Squid Analysis Report Generator
 EAPI=4
 HOMEPAGE=http://sarg.sourceforge.net/sarg.php
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/gd[png,truetype]
 SLOT=0
 SRC_URI=mirror://sourceforge/sarg/sarg-2.3.2.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a8992367003e73bc47e8844940b1872c
+_md5_=3f606926e6d5ff21ebff2809597ab990
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-3.24 b/metadata/md5-cache/net-analyzer/sflowtool-3.24
index 46b436680d6f..0ac917455f1d 100644
--- a/metadata/md5-cache/net-analyzer/sflowtool-3.24
+++ b/metadata/md5-cache/net-analyzer/sflowtool-3.24
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-dev
 DESCRIPTION=sflowtool is a utility for collecting and processing sFlow data
 EAPI=4
 HOMEPAGE=http://www.inmon.com/technology/sflowTools.php
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=inmon-sflow
 SLOT=0
 SRC_URI=http://www.inmon.com/bin/sflowtool-3.24.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1f495ff00e509e56d176840a0c608d20
+_md5_=03857ccc3702a5277dc4872a3194ebff
diff --git a/metadata/md5-cache/net-irc/charybdis-3.3.0 b/metadata/md5-cache/net-irc/charybdis-3.3.0
index 5d93c63005bd..673e282d75f4 100644
--- a/metadata/md5-cache/net-irc/charybdis-3.3.0
+++ b/metadata/md5-cache/net-irc/charybdis-3.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=The atheme project's IRCd based on ratbox
 EAPI=4
 HOMEPAGE=http://atheme.org/project/charybdis http://www.stack.nl/~jilles/irc/#charybdis
 IUSE=debug +ipv6 largenet ssl zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.stack.nl/~jilles/irc/charybdis-3.3.0.tbz2 http://dev.gentoo.org/~binki/distfiles/net-irc/charybdis/charybdis-3.3.0-patches.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=65712617f52378c9394ca661dd037580
+_md5_=9f89857fcf7e32caca0b2ec7c43d3a17
diff --git a/metadata/md5-cache/net-irc/ircii-20111115 b/metadata/md5-cache/net-irc/ircii-20111115
index 76dd11f9fb85..3ace07678992 100644
--- a/metadata/md5-cache/net-irc/ircii-20111115
+++ b/metadata/md5-cache/net-irc/ircii-20111115
@@ -4,10 +4,10 @@ DESCRIPTION=An IRC and ICB client that runs under most UNIX platforms
 EAPI=4
 HOMEPAGE=http://eterna.com.au/ircii/
 IUSE=ipv6
-KEYWORDS=amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses virtual/libiconv !!net-irc/irc-client
 SLOT=0
 SRC_URI=ftp://ircii.warped.com/pub/ircII/ircii-20111115.tar.bz2 ftp://ircii.warped.com/pub/ircII/old/ircii-20111115.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fb3f74ef784e736d0028c62e08e05a4b
+_md5_=824df4be52a3afcd1abfbb96fa98eab0
diff --git a/metadata/md5-cache/net-irc/shadowircd-6.3.2.1 b/metadata/md5-cache/net-irc/shadowircd-6.3.2.1
index fda9d8bc1f97..a2412859d81e 100644
--- a/metadata/md5-cache/net-irc/shadowircd-6.3.2.1
+++ b/metadata/md5-cache/net-irc/shadowircd-6.3.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=An IRCd based on charybdis that adds several useful features
 EAPI=4
 HOMEPAGE=http://shadowircd.net
 IUSE=debug +ipv6 largenet ssl zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://shadowircd.net/downloads/shadowircd-6.3.2.1.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=fcbb13c41e42d3f4b3cb3342edcf8bbe
+_md5_=3a63d1eb52d7d3ed75e51bffa570fdd7
diff --git a/metadata/md5-cache/net-irc/weechat-0.3.7 b/metadata/md5-cache/net-irc/weechat-0.3.7
index eb1336f9dcf8..332c72b60f19 100644
--- a/metadata/md5-cache/net-irc/weechat-0.3.7
+++ b/metadata/md5-cache/net-irc/weechat-0.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=Portable and multi-interface IRC client.
 EAPI=3
 HOMEPAGE=http://weechat.org/
 IUSE=guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer +irc +crypt doc nls +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://weechat.org/files/src/weechat-0.3.7.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	d9f3f2f6cc1a1d6ad8e31702e44133e5	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a423187808f67142a5e8fa81eb0e4d2d
+_md5_=7e8899a3662783fb5c49bcc37e58c4cb
diff --git a/metadata/md5-cache/net-wireless/wireless-regdb-20110428-r1 b/metadata/md5-cache/net-wireless/wireless-regdb-20110428-r1
index 2a5f0b0b11d5..31f974dda717 100644
--- a/metadata/md5-cache/net-wireless/wireless-regdb-20110428-r1
+++ b/metadata/md5-cache/net-wireless/wireless-regdb-20110428-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Binary regulatory database for CRDA
 HOMEPAGE=http://wireless.kernel.org/en/developers/Regulatory
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
 LICENSE=as-is
 SLOT=0
 SRC_URI=http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-2011.04.28.tar.bz2
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=63c95abbb80dd07643259aacd6fe03ca
+_md5_=31ba2005ca384cd715f55602fdf07db4
diff --git a/metadata/md5-cache/perl-core/File-Path-2.08 b/metadata/md5-cache/perl-core/File-Path-2.08
index c9f7c58ae39c..1a7d722449a1 100644
--- a/metadata/md5-cache/perl-core/File-Path-2.08
+++ b/metadata/md5-cache/perl-core/File-Path-2.08
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
 DESCRIPTION=File path and name utilities
 HOMEPAGE=http://search.cpan.org/dist/File-Path/
-KEYWORDS=amd64 ~ia64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~sparc x86
 LICENSE=|| ( Artistic GPL-2 )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DL/DLAND/File-Path-2.08.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	01501a30505074cd0012cabbf5d99447	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8415f762501fa82cee7a3337f9e34547
+_md5_=b8200b0516c68422490dd0ea84161505
diff --git a/metadata/md5-cache/sys-apps/paxctl-0.7 b/metadata/md5-cache/sys-apps/paxctl-0.7
deleted file mode 100644
index 007fbd8aea89..000000000000
--- a/metadata/md5-cache/sys-apps/paxctl-0.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1
-DESCRIPTION=Manages various PaX related program header flags for Elf32, Elf64, binaries.
-HOMEPAGE=http://pax.grsecurity.net
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://pax.grsecurity.net/paxctl-0.7.tar.gz
-_eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c8a10355137c202287204a56c748df8f
diff --git a/metadata/md5-cache/sys-apps/paxctl-0.7-r1 b/metadata/md5-cache/sys-apps/paxctl-0.7-r1
index e03728b10074..cc0a2d61d075 100644
--- a/metadata/md5-cache/sys-apps/paxctl-0.7-r1
+++ b/metadata/md5-cache/sys-apps/paxctl-0.7-r1
@@ -3,9 +3,9 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1
 DESCRIPTION=Manages various PaX related program header flags for Elf32, Elf64, binaries.
 EAPI=4
 HOMEPAGE=http://pax.grsecurity.net
-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
 SLOT=0
 SRC_URI=http://pax.grsecurity.net/paxctl-0.7.tar.bz2
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=cd8ce677fab9dff514c79691742b232d
+_md5_=030f86f1b901105868d31da2b0464434
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-1.4.8 b/metadata/md5-cache/sys-fs/mtd-utils-1.4.8
index cb1f19df286d..3c233f158de5 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-1.4.8
+++ b/metadata/md5-cache/sys-fs/mtd-utils-1.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=3
 HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=xattr
-KEYWORDS=amd64 arm ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=amd64 arm ~mips ~ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16
 SLOT=0
 SRC_URI=http://git.infradead.org/mtd-utils.git/snapshot/v1.4.8.tar.gz -> mtd-utils-1.4.8.tar.gz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dda6920c7fe9fe97042c40dab8b24915
+_md5_=9dd37f1088bf965c1f5516da6970cddf
diff --git a/metadata/md5-cache/virtual/gnustep-back-0.22.0 b/metadata/md5-cache/virtual/gnustep-back-0.22.0
index 8e3e1f38cf42..af891190b9b9 100644
--- a/metadata/md5-cache/virtual/gnustep-back-0.22.0
+++ b/metadata/md5-cache/virtual/gnustep-back-0.22.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for back-end component for the GNUstep GUI Library
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 RDEPEND=|| ( ~gnustep-base/gnustep-back-cairo-0.22.0 ~gnustep-base/gnustep-back-art-0.22.0 ~gnustep-base/gnustep-back-xlib-0.22.0 )
 SLOT=0
-_md5_=80f1679cfaf39b893fc1d167410b365e
+_md5_=958da950288bdb282a289e74cf6d7751
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.08 b/metadata/md5-cache/virtual/perl-File-Path-2.08
index a04f58195c20..0b92aee87c69 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.08
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.08
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
-KEYWORDS=amd64 ~ia64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~sparc x86
 RDEPEND=~perl-core/File-Path-2.08
 SLOT=0
-_md5_=add1bf83dae00a135db9b482eda185f2
+_md5_=73507f31c006979662e97694cd4b4971
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-0.12 b/metadata/md5-cache/www-apache/mod_xsendfile-0.12
index 5f69b5272763..7d6f28bd7817 100644
--- a/metadata/md5-cache/www-apache/mod_xsendfile-0.12
+++ b/metadata/md5-cache/www-apache/mod_xsendfile-0.12
@@ -3,10 +3,10 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=Apache2 module that processes X-SENDFILE headers registered by the original output handler
 EAPI=4
 HOMEPAGE=https://tn123.org/mod_xsendfile/
-KEYWORDS=~amd64 ~sparc x86 ~amd64-linux
+KEYWORDS=amd64 ~sparc x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://tn123.org/mod_xsendfile/mod_xsendfile-0.12.tar.gz
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	depend.apache	a471783c63e68987a2b20eb46f9edf68	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=2e504e3f46e0b440fdbe64fa7011d349
+_md5_=a7ce11f4a55652aa7b220d22be8d82c7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.12
similarity index 90%
rename from metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1
rename to metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.12
index a0181cc679de..5774070c13c4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-virtualbox-4.1.12
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-base/xorg-server[-minimal] x11-libs/libXcomposite kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.1.6/VirtualBox-4.1.6.tar.bz2
+SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	linux-mod	cba6b1240fca7886fe5c7297106aea80	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ed7b5dd9421debf681fe4ef8b63fb81f
+_md5_=76015c54d412883d7980805210e0faff
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.1 b/metadata/md5-cache/x11-libs/goocanvas-2.0.1
index b9decc816b30..5b3090e18c4b 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-2.0.1
+++ b/metadata/md5-cache/x11-libs/goocanvas-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Canvas widget for GTK+ using the cairo 2D library for drawing
 EAPI=4
 HOMEPAGE=http://live.gnome.org/GooCanvas
 IUSE=doc examples +introspection python
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=dev-libs/glib-2.28.0:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) python? ( >=dev-python/pygobject-2.28 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.1.tar.xz
 _eclasses_=eutils	6891f6f484e3b44a0a15e1b0c0fc9a14	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	b5ca2ccadb60760889faa3bccba121d9	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=68122c2ee9f1e18a86a6e6ca20e45d33
+_md5_=3cfadbb4a4d29e9666201d73ceca2440
diff --git a/metadata/md5-cache/x11-themes/smplayer-themes-20120131 b/metadata/md5-cache/x11-themes/smplayer-themes-20120131
index 1ee2b83acf21..7377321967cc 100644
--- a/metadata/md5-cache/x11-themes/smplayer-themes-20120131
+++ b/metadata/md5-cache/x11-themes/smplayer-themes-20120131
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Icon themes for smplayer
 EAPI=4
 HOMEPAGE=http://smplayer.sourceforge.net/
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=CCPL-Attribution-2.5 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 GPL-2 LGPL-3
 RDEPEND=media-video/smplayer
 SLOT=0
 SRC_URI=mirror://sourceforge/smplayer/smplayer-themes-20120131.tar.gz
-_md5_=fc1d8583efbb644305c2e9868cbf34f6
+_md5_=598736c6b39426fffc8d7386f9f02b34
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a78d65201380..724acc448e77 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2012 05:07:01 +0000
+Thu, 05 Apr 2012 11:07:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2a696f6d4dd7..db16cffc162e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr  5 05:06:59 UTC 2012
+Thu Apr  5 11:06:58 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9fa9c85a8eef..fc7943dfd2c5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2012 05:30:01 +0000
+Thu, 05 Apr 2012 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1b8f8b84515a..bef917c880d5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1333602301 Thu Apr  5 05:05:01 2012 UTC
+1333623901 Thu Apr  5 11:05:01 2012 UTC
diff --git a/net-analyzer/mtr/mtr-0.82.ebuild b/net-analyzer/mtr/mtr-0.82.ebuild
index a9d918ae0980..e93afc3bf1b5 100644
--- a/net-analyzer/mtr/mtr-0.82.ebuild
+++ b/net-analyzer/mtr/mtr-0.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.82.ebuild,v 1.8 2012/03/31 15:05:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.82.ebuild,v 1.9 2012/04/05 05:55:05 jdhore Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 suid"
 
 RDEPEND="
diff --git a/net-analyzer/ostinato/ostinato-0.5.ebuild b/net-analyzer/ostinato/ostinato-0.5.ebuild
index a4c2a9567663..d4259fa8fe68 100644
--- a/net-analyzer/ostinato/ostinato-0.5.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.5.ebuild,v 1.2 2012/03/28 07:29:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.5.ebuild,v 1.3 2012/04/05 05:02:24 jdhore Exp $
 
 EAPI=2
 inherit qt4-r2
@@ -11,7 +11,7 @@ SRC_URI="http://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/protobuf
diff --git a/net-analyzer/sarg/sarg-2.3.2.ebuild b/net-analyzer/sarg/sarg-2.3.2.ebuild
index ad61ae6fc057..b6a75ae4143a 100644
--- a/net-analyzer/sarg/sarg-2.3.2.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.2.ebuild,v 1.2 2012/03/28 07:40:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.2.ebuild,v 1.3 2012/04/05 05:10:33 jdhore Exp $
 
 EAPI="4"
 inherit eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/net-analyzer/sflowtool/sflowtool-3.24.ebuild b/net-analyzer/sflowtool/sflowtool-3.24.ebuild
index f707984d550b..2dffb95a1562 100644
--- a/net-analyzer/sflowtool/sflowtool-3.24.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.24.ebuild,v 1.1 2012/02/15 16:35:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.24.ebuild,v 1.2 2012/04/05 05:36:50 jdhore Exp $
 
 EAPI=4
 inherit autotools flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
 
 LICENSE="inmon-sflow"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/net-irc/charybdis/charybdis-3.3.0.ebuild b/net-irc/charybdis/charybdis-3.3.0.ebuild
index 4950693e42fc..fdc8d9a77e0c 100644
--- a/net-irc/charybdis/charybdis-3.3.0.ebuild
+++ b/net-irc/charybdis/charybdis-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.3.0.ebuild,v 1.2 2012/04/04 03:17:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-3.3.0.ebuild,v 1.3 2012/04/05 10:18:19 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.stack.nl/~jilles/irc/${P}.tbz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +ipv6 largenet ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-irc/ircii/ircii-20111115.ebuild b/net-irc/ircii/ircii-20111115.ebuild
index 1604d50d046a..e9ea13c721b3 100644
--- a/net-irc/ircii/ircii-20111115.ebuild
+++ b/net-irc/ircii/ircii-20111115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20111115.ebuild,v 1.4 2012/03/28 07:44:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20111115.ebuild,v 1.5 2012/04/05 05:31:04 jdhore Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://eterna.com.au/ircii/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="ipv6"
 
 DEPEND="sys-libs/ncurses
diff --git a/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild b/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild
index 88c197b6f0f0..6e591b46e9d3 100644
--- a/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild
+++ b/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild,v 1.3 2012/04/04 03:18:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/shadowircd/shadowircd-6.3.2.1.ebuild,v 1.4 2012/04/05 10:17:24 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://shadowircd.net/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +ipv6 largenet ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-irc/weechat/weechat-0.3.7.ebuild b/net-irc/weechat/weechat-0.3.7.ebuild
index a921edc74435..7933c7b020a5 100644
--- a/net-irc/weechat/weechat-0.3.7.ebuild
+++ b/net-irc/weechat/weechat-0.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.7.ebuild,v 1.5 2012/03/31 15:24:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.7.ebuild,v 1.6 2012/04/05 09:27:17 ago Exp $
 
 EAPI=3
 
@@ -24,7 +24,7 @@ SLOT="0"
 if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux"
+	KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 NETWORKS="+irc"
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild
index 9e2986b67deb..7f38bbe042b8 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild,v 1.2 2012/03/28 07:43:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild,v 1.3 2012/04/05 07:39:57 jdhore Exp $
 
 inherit multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/perl-core/File-Path/File-Path-2.08.ebuild b/perl-core/File-Path/File-Path-2.08.ebuild
index 97edfd665ade..3da48e7141ed 100644
--- a/perl-core/File-Path/File-Path-2.08.ebuild
+++ b/perl-core/File-Path/File-Path-2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Path/File-Path-2.08.ebuild,v 1.2 2012/01/07 12:17:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Path/File-Path-2.08.ebuild,v 1.3 2012/04/05 08:42:49 jdhore Exp $
 
 MODULE_AUTHOR="DLAND"
 
@@ -12,4 +12,4 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~sparc x86"
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index 17b3054941e6..8ff8dcf892c4 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,4 +1,3 @@
 DIST paxctl-0.4.tar.gz 7592 RMD160 5dfe8720f66367c04773a28955345ff1969937f7 SHA1 cfca05dad0664d2f65c5da02e04d0a6e91ec0ac0 SHA256 c5c7b6b3974f3022eb23115b1900c1a6f4fe909300cf3cdfe2af9d08621c6dec
 DIST paxctl-0.5.tar.gz 7587 RMD160 1abdf467a1b4a30a2ec6f522bcbc607b0a76ff90 SHA1 8f8f61fb6a4305b5145600b0664908db81f372d7 SHA256 d26e33179b31bb9fc3cbe5eb708ec29db4c4eba68600a89ac302856946a0d1d0
 DIST paxctl-0.7.tar.bz2 7642 RMD160 b36318f931ff5b3c7a9d8864008982391aad1950 SHA1 c640f62b07d73e576c6040c3d20cf743fe4d4966 SHA256 f7077784ca5695bf74061e6f66b86db855e0dcaa1fc94e6251f6ecd0b879cdc8
-DIST paxctl-0.7.tar.gz 7907 RMD160 d9fd28f32ea03b606186fb46f7bd5136b616167d SHA1 2e5da2d9181489ccb97bf0a250eab916a592335d SHA256 cee6c7da6a5bfb6b5e4fb2158c57f273b656c9231590bc5efb697207a969600c
diff --git a/sys-apps/paxctl/paxctl-0.7-r1.ebuild b/sys-apps/paxctl/paxctl-0.7-r1.ebuild
index 729b825d3679..e63cf85396d6 100644
--- a/sys-apps/paxctl/paxctl-0.7-r1.ebuild
+++ b/sys-apps/paxctl/paxctl-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.7-r1.ebuild,v 1.2 2012/04/04 20:49:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.7-r1.ebuild,v 1.3 2012/04/05 09:35:14 ago Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit toolchain-funcs
 DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries."
 SRC_URI="http://pax.grsecurity.net/${P}.tar.bz2"
 HOMEPAGE="http://pax.grsecurity.net"
-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=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.7.ebuild b/sys-apps/paxctl/paxctl-0.7.ebuild
deleted file mode 100644
index 91c18d372c11..000000000000
--- a/sys-apps/paxctl/paxctl-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.7.ebuild,v 1.2 2012/04/03 21:54:41 ago Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries."
-SRC_URI="http://pax.grsecurity.net/paxctl-${PV}.tar.gz"
-HOMEPAGE="http://pax.grsecurity.net"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-devel/binutils-2.14.90.0.8-r1"
-RDEPEND=""
-
-src_compile() {
-	tc-export CC
-	emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	einstall DESTDIR="${D}"
-	dodoc README ChangeLog
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
index fc0fc42781f8..9bc7d9e1b84c 100644
--- a/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild,v 1.3 2012/03/30 18:08:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild,v 1.4 2012/04/05 05:45:29 jdhore Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ else
 		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
 		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
 	fi
-	KEYWORDS="amd64 arm ~mips ~ppc ~x86 ~x86-linux"
+	KEYWORDS="amd64 arm ~mips ~ppc x86 ~x86-linux"
 fi
 
 DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
diff --git a/virtual/gnustep-back/gnustep-back-0.22.0.ebuild b/virtual/gnustep-back/gnustep-back-0.22.0.ebuild
index cac69b6825b5..0c3f2e168c86 100644
--- a/virtual/gnustep-back/gnustep-back-0.22.0.ebuild
+++ b/virtual/gnustep-back/gnustep-back-0.22.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gnustep-back/gnustep-back-0.22.0.ebuild,v 1.1 2012/02/08 14:55:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/gnustep-back/gnustep-back-0.22.0.ebuild,v 1.2 2012/04/05 09:31:51 ago Exp $
 
 DESCRIPTION="Virtual for back-end component for the GNUstep GUI Library"
 HOMEPAGE=""
 SRC_URI=""
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 RDEPEND="|| (
 		~gnustep-base/gnustep-back-cairo-${PV}
diff --git a/virtual/perl-File-Path/perl-File-Path-2.08.ebuild b/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
index 9763253f7689..97b4920f5c98 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.08.ebuild,v 1.3 2012/01/07 12:18:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Path/perl-File-Path-2.08.ebuild,v 1.4 2012/04/05 08:42:16 jdhore Exp $
 
 DESCRIPTION="Virtual for File-Path"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~sparc x86"
 IUSE=""
 
 RDEPEND="~perl-core/File-Path-${PV}"
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild
index 4708440c6e8c..0c2845245516 100644
--- a/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild
+++ b/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild,v 1.2 2012/04/02 19:40:22 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_xsendfile/mod_xsendfile-0.12.ebuild,v 1.3 2012/04/05 09:25:18 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="https://tn123.org/mod_xsendfile/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="${DEPEND}"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index b655ead73fef..27073d119e3e 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,4 @@
 DIST VirtualBox-4.1.10.tar.bz2 73325320 RMD160 b5eedd1235db74bfaa4e061193528696058923e7 SHA1 bb95253fd574648298bd56f13586f5a510a55863 SHA256 47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
+DIST VirtualBox-4.1.12.tar.bz2 73250628 RMD160 a3ee3e4dac21d969f5314c7269ca9ef9fa7d80a7 SHA1 4cda0678fa44ff53af87dbcd9375a43720c69d3f SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02
 DIST VirtualBox-4.1.4.tar.bz2 73837275 RMD160 475a68dc6beebdb588688743b3652bbb9ab3f507 SHA1 6ec0dd31844da91c9773611a6fb553eef575e899 SHA256 aa368de95f9dd2020394f9e8f145908c236c0899d24bb27436ed2f670725cefb
-DIST VirtualBox-4.1.6.tar.bz2 73793713 RMD160 1bf368464ac0d431ac799e4710835f3426a9a5f6 SHA1 19a801444102a10d2b62ab35daacb7ddc415bab0 SHA256 554137cb33a806bf0dd74dc0de0c3008dd9bb20d483cdcebaf8a929720c0ab7e
 DIST VirtualBox-4.1.8.tar.bz2 73822230 RMD160 f8ae296406fe370eded166d0772be7e4558ecc3a SHA1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 SHA256 ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
similarity index 89%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
index 81e518a8405c..fee2ff7dd23a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild,v 1.2 2012/01/19 14:24:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:45:44 polynomial-c Exp $
 
 EAPI=2
 
-inherit eutils linux-mod multilib python versionator
+inherit eutils linux-mod multilib python versionator toolchain-funcs
 
 MY_P=VirtualBox-${PV}
 DESCRIPTION="VirtualBox video driver"
@@ -42,7 +42,7 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
 
-S="${WORKDIR}/${MY_P}_OSE"
+S="${WORKDIR}/${MY_P}"
 
 QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
 
@@ -80,6 +80,11 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
 			"${FILESDIR}/${PN}-4-makeself-check.patch" \
 			"${FILESDIR}/${PN}-4-mkisofs-check.patch"
+
+		# Patch to link with lazy on hardened #394757
+		if gcc-specs-now ; then
+			epatch "${FILESDIR}/${PN}-link-lazy.patch"
+		fi
 }
 
 src_configure() {
@@ -119,8 +124,11 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+		# xorg-server-1.12.x
+		if has_version ">=x11-base/xorg-server-1.12" ; then
+				newins vboxvideo_drv_112.so vboxvideo_drv.so
 		# xorg-server-1.11.x
-		if has_version ">=x11-base/xorg-server-1.11" ; then
+		elif has_version ">=x11-base/xorg-server-1.11" ; then
 				newins vboxvideo_drv_111.so vboxvideo_drv.so
 		# xorg-server-1.10.x
 		elif has_version ">=x11-base/xorg-server-1.10" ; then
diff --git a/x11-libs/goocanvas/goocanvas-2.0.1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
index 0952547dd5ed..defee23d7329 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.1.ebuild,v 1.4 2012/03/28 06:57:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.1.ebuild,v 1.5 2012/04/05 07:17:31 jdhore Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://live.gnome.org/GooCanvas"
 
 LICENSE="GPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="doc examples +introspection python"
 
 # python only enables python specific binding override
diff --git a/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild b/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild
index 6eb37c913c0d..b1009f0e2efc 100644
--- a/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild
+++ b/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild,v 1.2 2012/04/04 02:06:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/smplayer-themes/smplayer-themes-20120131.ebuild,v 1.3 2012/04/05 09:01:57 jdhore Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/smplayer/${P}.tar.gz"
 
 LICENSE="CCPL-Attribution-2.5 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 GPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""