diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index 70fca07b1819..939d97e56b48 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4.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/editor-wrapper/editor-wrapper-4.ebuild,v 1.9 2012/04/27 15:27:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.10 2012/05/28 14:10:15 grobian Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
@@ -18,6 +18,12 @@ S="${WORKDIR}"
 src_prepare() {
 	sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
 	sed -e 's/@VAR@/PAGER/g'  "${FILESDIR}/${P}.sh" >pager  || die
+	if use prefix ; then
+		sed -i \
+			-e "s:#!/bin/sh:#!/usr/bin/env sh:" \
+			-e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
+			editor pager || die
+	fi
 }
 
 src_install() {
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild
index a79df2877150..31b44d1b2ba7 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.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/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild,v 1.8 2012/04/17 19:43:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.5.ebuild,v 1.9 2012/05/28 13:49:53 armin76 Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ IUSE=""
 
 # Drop the prefix keywords since equery is currently broken on prefix Bug 406495
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 # Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
 # Note: dev-lang/python dependencies are so emerge will print a blocker if any
diff --git a/app-text/libwps/files/libwps-0.2.6-debug.patch b/app-text/libwps/files/libwps-0.2.6-debug.patch
new file mode 100644
index 000000000000..d085d8f8fe27
--- /dev/null
+++ b/app-text/libwps/files/libwps-0.2.6-debug.patch
@@ -0,0 +1,13 @@
+diff -urN libwps-0.2.6.old//src/lib/libwps_internal.h libwps-0.2.6/src/lib/libwps_internal.h
+--- libwps-0.2.6.old//src/lib/libwps_internal.h	2012-05-28 13:59:43.855727293 +0200
++++ libwps-0.2.6/src/lib/libwps_internal.h	2012-05-28 14:00:16.373727679 +0200
+@@ -25,6 +25,9 @@
+ #include <libwpd-stream/libwpd-stream.h>
+ #include <libwpd/libwpd.h>
+ #include <string>
++#ifdef DEBUG
++#include <stdio.h>
++#endif
+ 
+ #if defined(_MSC_VER) || defined(__DJGPP__)
+ typedef signed char int8_t;
diff --git a/app-text/libwps/libwps-0.2.6.ebuild b/app-text/libwps/libwps-0.2.6.ebuild
index 0d86c16cb192..a5182dd65abe 100644
--- a/app-text/libwps/libwps-0.2.6.ebuild
+++ b/app-text/libwps/libwps-0.2.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.6.ebuild,v 1.3 2012/05/23 08:53:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.6.ebuild,v 1.4 2012/05/28 12:01:45 scarabeus Exp $
 
 EAPI=4
 
+inherit base
+
 DESCRIPTION="Microsoft Works file word processor format import filter library"
 HOMEPAGE="http://libwps.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-debug.patch"
+)
+
 src_configure() {
 	econf \
 		--disable-werror \
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
index 67252fb12f7e..45786ab11190 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20120109.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/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.8 2012/04/26 16:44:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20120109.ebuild,v 1.9 2012/05/28 14:24:58 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
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 c7810dc8beba..03a601610e38 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.8 2012/04/17 21:39:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.3.ebuild,v 1.9 2012/05/28 13:52:44 armin76 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/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
index 8087555d15b4..c596a054425b 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.8 2012/05/17 16:32:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.9 2012/05/28 13:58:16 armin76 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cxx debug java perl ruby zlib"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index cc0302bc95b3..5f8ccadffbf3 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,4 +1,5 @@
 DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
 DIST jffi-1.0.0.tar.gz 1627422 RMD160 0b20a343239b8480e1b6ee787288862b02a4f575 SHA1 fa7d9c3ca58afea36e9ef643f882c828e7ce96d0 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e
 DIST jffi-1.0.11.tar.gz 1899655 RMD160 7780cc45e4c777d5d70814bc3a25bbd96bb9146e SHA1 744fa907573b37801c9a4085f83cdc8b1ed2f2c6 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a
+DIST jffi-1.2.2.tar.gz 1759433 RMD160 58b3ba123b9578952ada20dff9510f1e6091faec SHA1 3a79e197c9a9cf7df95b80e2d38c3bd27ca21799 SHA256 c4afe6e3c67f600f9f838c8526a711c5c7859d3d05f7ccb6e7926ef5e484edbd
 DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f6ea466ce2 SHA1 b58cd19600acf6ea8a2adf04b1f1d72b7f84bce5 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a
diff --git a/dev-java/jffi/files/jffi-1.2.2_no-werror.patch b/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
new file mode 100644
index 000000000000..25b7e4f8ec00
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.2_no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
++WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
diff --git a/dev-java/jffi/jffi-1.2.2.ebuild b/dev-java/jffi/jffi-1.2.2.ebuild
new file mode 100644
index 000000000000..d7aea9ae3302
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.2.ebuild,v 1.1 2012/05/28 10:06:09 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+	# generate Version.java
+	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+		package com.kenai.jffi;
+		public final class Version {
+			private Version() {}
+			public static final int MAJOR = $(get_version_component_range 1);
+			public static final int MINOR = $(get_version_component_range 2);
+			public static final int MICRO = $(get_version_component_range 3);
+		}
+	EOF
+
+	java-pkg-2_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javah -d build/jni -classpath target/classes \
+		com.kenai.jffi.Foreign \
+		com.kenai.jffi.ObjectBuffer \
+		com.kenai.jffi.Version \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(get_version_component_range 1-2)
+		USE_SYSTEM_LIBFFI=1
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	cat <<-EOF > boot.properties
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index a54718c9656c..d9a166d6e615 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1 +1,2 @@
 DIST jnr-constants-0.8.2.tar.gz 110511 RMD160 0782daf04bba7284012b68418dd2f93791eba3d5 SHA1 2c6925b670d6723b1bbfc98081e6d1eae102ccbe SHA256 924b242877a8472e5828a5ae5f9d5a1f0c0981b7629cd68600d76c9536f2f323
+DIST jnr-constants-0.8.3.tar.gz 110622 RMD160 b9fd8ea9d552cf76a361e2c55b5e1971ef7cb881 SHA1 f7ec88ed681fd8c67c8ab6475f3b93bc33448b58 SHA256 e4dec305fa7c703dd9a693f9d417d7a16cec8b690c122078fb3518b0f4c258c8
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild
new file mode 100644
index 000000000000..985a01eeb38c
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild,v 1.1 2012/05/28 14:24:19 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 6dd1371906f6..32587cebb6fc 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,2 +1,3 @@
 DIST jnr-ffi-0.5.10.tar.gz 559174 RMD160 9c7794644b7f22b84859f847a2e13e359123799b SHA1 55b0af8b65353373a799fbad7152e98676739d20 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a
 DIST jnr-ffi-0.6.0.tar.gz 97712 RMD160 cb0ed527d24b055d211bf34371d2f105b2eb0ca5 SHA1 8ca1fc9ceed63eec6a3a656cc9e2633c9d88f3d8 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a
+DIST jnr-ffi-0.7.4.tar.gz 130458 RMD160 4a9827286b080de80f04cbef510626e4eb765e58 SHA1 a771f9155d633b473c02b6a48b5ee611f56b9923 SHA256 8c17175a5aaaf5fa2ceea255606a745f864b0f81411a75b6a94141dbe50c0a3c
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
index 44d27d53bf97..db5d42ea908e 100644
--- a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.6.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-java/jnr-ffi/jnr-ffi-0.6.0.ebuild,v 1.1 2012/01/12 11:27:05 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild,v 1.3 2012/05/28 14:52:53 johu Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="0.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 # Fail, upstream pom has ignore test failures enabled.
 RESTRICT="test"
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.4.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.4.ebuild
new file mode 100644
index 000000000000..6786ad712001
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-0.7.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.4.ebuild,v 1.1 2012/05/28 12:37:01 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jffi:1.2
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:4"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
+
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index e4532da2eb09..089a2ee1adde 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,3 +1,4 @@
 DIST jnr-posix-1.1.4.tar.gz 195235 RMD160 ff676df8f8192ce8fdc9743b29c5318ff1fb9439 SHA1 fd7e262510196b7d54eea1d843cd688f76907ce8 SHA256 efac5b9239a2d89036d26e647b55a3dac52eb0383d133ca44914de8c35d9006f
 DIST jnr-posix-1.1.8.tar.gz 206617 RMD160 a668159c4f51276280961443a087036c5e2256fe SHA1 d54f8dd3d681d7df115c355189e830a39fa9dbea SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1
 DIST jnr-posix-2.0.0.tar.gz 54286 RMD160 919671a430b52988b95cc563cfc6f15ce8182dfb SHA1 668a039b2da45b5b3ef12ab8d300e59484792a58 SHA256 e7121253092afd81adf2a28225ee92b5adb8bcb36e3d9aa159b5861fb8b27400
+DIST jnr-posix-2.1.tar.gz 59192 RMD160 70ba7c6b2ca56d0d07a1387519a2361baa9cf43e SHA1 7f043d7641c773761ba42df6e8a107472f5a0767 SHA256 f7d89fa5066f9bac80ec8a6b8c8f9e99f66fa2fe898a54ff4459ce8e1190a10c
diff --git a/dev-java/jnr-posix/jnr-posix-2.1.ebuild b/dev-java/jnr-posix/jnr-posix-2.1.ebuild
new file mode 100644
index 000000000000..e44c31b62d23
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.1.ebuild,v 1.1 2012/05/28 15:18:57 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.7"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/posix/FileStatTest.java || die
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild
index b0e5572326e6..6ce1d5afa1c7 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-7.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/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild,v 1.1 2012/04/26 21:45:41 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-apisupport/netbeans-apisupport-7.1.2.ebuild,v 1.2 2012/05/28 12:26:38 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -13,7 +13,7 @@ SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild
index b6a5844b3168..21d6785326af 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-7.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/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild,v 1.1 2012/04/26 21:46:01 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-cnd/netbeans-cnd-7.1.2.ebuild,v 1.2 2012/05/28 12:27:08 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -17,7 +17,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
 	http://hg.netbeans.org/binaries/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild
index 40f449e418dc..ab9d5db14c8e 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-7.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/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild,v 1.1 2012/04/26 21:46:21 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-dlight/netbeans-dlight-7.1.2.ebuild,v 1.2 2012/05/28 12:27:34 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild
index 5d31f2b97ce0..3283e8ba869a 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-7.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/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild,v 1.1 2012/04/26 21:46:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-enterprise/netbeans-enterprise-7.1.2.ebuild,v 1.2 2012/05/28 12:28:18 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -48,7 +48,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
 	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild
index 33c7a9e8b4cf..333125b76710 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.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/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild,v 1.1 2012/04/26 21:47:00 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.1.2.ebuild,v 1.2 2012/05/28 12:28:45 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -13,7 +13,7 @@ SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild
index 96a799c11fb4..7748f73f40af 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-7.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/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild,v 1.1 2012/04/26 21:47:20 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-groovy/netbeans-groovy-7.1.2.ebuild,v 1.2 2012/05/28 12:29:12 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild
index 16d6d8d371ca..ce9243e4c0c0 100644
--- a/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-7.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/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild,v 1.1 2012/04/26 21:47:39 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-harness/netbeans-harness-7.1.2.ebuild,v 1.2 2012/05/28 12:29:38 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -15,7 +15,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
 	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild
index 6f10049f9201..590cb0336a23 100644
--- a/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-7.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/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild,v 1.1 2012/04/26 21:47:59 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/netbeans-ide-7.1.2.ebuild,v 1.2 2012/05/28 12:30:30 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -76,7 +76,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
 	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
index 8a34dff8491e..f30cd74fa24e 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.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/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild,v 1.1 2012/05/27 16:10:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild,v 1.2 2012/05/28 12:32:56 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -33,7 +33,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
 	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild
index 5d710e374e16..ecadad65d43c 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-7.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/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild,v 1.1 2012/04/26 21:48:18 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javacard/netbeans-javacard-7.1.2.ebuild,v 1.2 2012/05/28 12:31:02 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -16,7 +16,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
 	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild
index aad4763f3a64..e483e4ab84ae 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-7.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/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild,v 1.2 2012/04/30 07:15:09 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javadoc/netbeans-javadoc-7.1.2.ebuild,v 1.3 2012/05/28 12:31:41 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild
index c4b092613e0e..5d8117dfce3d 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-7.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/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild,v 1.1 2012/04/26 21:48:58 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-javafx/netbeans-javafx-7.1.2.ebuild,v 1.2 2012/05/28 12:32:08 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -15,7 +15,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
 	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild
index 8ddc30bed896..0b7338b82630 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-7.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/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild,v 1.1 2012/04/26 21:49:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-mobility/netbeans-mobility-7.1.2.ebuild,v 1.2 2012/05/28 12:33:29 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -19,7 +19,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
 	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild
index e2d5fd8cd734..d5b1d5ef4e5d 100644
--- a/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-7.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/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild,v 1.1 2012/04/26 21:49:58 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/netbeans-nb-7.1.2.ebuild,v 1.2 2012/05/28 12:33:57 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -14,7 +14,7 @@ SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="keychain"
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild b/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild
index 7d364f678b46..2d1dfabc9d14 100644
--- a/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-7.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/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild,v 1.1 2012/04/26 21:50:18 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-php/netbeans-php-7.1.2.ebuild,v 1.2 2012/05/28 12:34:24 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -16,7 +16,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip
 	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild
index 0219078edfba..5a19f152f547 100644
--- a/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-7.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/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.1 2012/04/26 21:50:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.2.ebuild,v 1.2 2012/05/28 12:34:50 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -18,7 +18,7 @@ SRC_URI="${SOURCE_URL}
 	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
 	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild
index 187206b1e93f..a0e1b555f6ca 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-7.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/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild,v 1.1 2012/04/26 21:50:57 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-profiler/netbeans-profiler-7.1.2.ebuild,v 1.2 2012/05/28 12:35:18 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -13,7 +13,7 @@ SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild
index 454a22114d9a..527bb273e5c8 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.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/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild,v 1.1 2012/04/26 21:51:17 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.1.2.ebuild,v 1.2 2012/05/28 12:35:44 ago Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -13,7 +13,7 @@ SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index 0ae2ef3a1887..d34306851d1a 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.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-java/xerces/xerces-2.11.0.ebuild,v 1.1 2012/05/26 11:19:58 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.3 2012/05/28 14:34:47 johu Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # they are missing from the upstream tarball"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 09925bb98177..bbda20ddd513 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.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-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.1 2012/05/25 19:55:23 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.3 2012/05/28 14:33:53 johu Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.4"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.ebuild
index 02905020be4e..3d5fd46f80ac 100644
--- a/dev-libs/nspr/nspr-4.9.ebuild
+++ b/dev-libs/nspr/nspr-4.9.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-libs/nspr/nspr-4.9.ebuild,v 1.8 2012/05/26 17:22:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.9 2012/05/28 14:26:12 armin76 Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_prepare() {
diff --git a/dev-libs/nss/nss-3.13.4.ebuild b/dev-libs/nss/nss-3.13.4.ebuild
index 6d1d7bb4722c..e2c203742d55 100644
--- a/dev-libs/nss/nss-3.13.4.ebuild
+++ b/dev-libs/nss/nss-3.13.4.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-libs/nss/nss-3.13.4.ebuild,v 1.6 2012/05/26 17:08:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.4.ebuild,v 1.7 2012/05/28 14:49:25 armin76 Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.28.03-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.28.03-r1.ebuild
index 6b47a3abcde3..c88c84237b2b 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.28.03-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.28.03-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-libs/xmlrpc-c/xmlrpc-c-1.28.03-r1.ebuild,v 1.7 2012/04/05 21:20:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.28.03-r1.ebuild,v 1.8 2012/05/28 13:48:38 armin76 Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads tools"
 
 REQUIRED_USE="test? ( static-libs abyss curl cxx )"
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 1508a5a0030f..0627c1193019 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1 +1,2 @@
 DIST oasis-0.3.0~rc5.tar.gz 294647 RMD160 cd6057f9b8d7c4c8fc1ecdaccc6d469faad96531 SHA1 a41c75341bab01dba6214617a1a8d64a33af1c34 SHA256 1e3eb1056276cb40b1e90d3b46e74c1bdc42f3f876047ab122d441b45dd391de
+DIST oasis-0.3.0~rc6.tar.gz 294996 RMD160 267e400c1d087d655add4e288178db35251fde66 SHA1 0d9eda43d7274523e8b03174f5104951190c586f SHA256 d077717ced28e318020e1a2dda7839f81f0f71c121929786e4e0162554a20ef4
diff --git a/dev-ml/oasis/oasis-0.3.0_rc6.ebuild b/dev-ml/oasis/oasis-0.3.0_rc6.ebuild
new file mode 100644
index 000000000000..64cb9def756d
--- /dev/null
+++ b/dev-ml/oasis/oasis-0.3.0_rc6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/oasis-0.3.0_rc6.ebuild,v 1.1 2012/05/28 12:40:43 aballier Exp $
+
+EAPI=3
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="OASIS is a tool to integrate a configure, build and install system in OCaml project"
+HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/880/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-ml/ocaml-data-notation-0.0.3"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlify
+	dev-ml/ocamlmod
+	test? (
+		>=dev-ml/ocaml-fileutils-0.4.2
+		>=dev-ml/ounit-1.1.0
+		>=dev-ml/ocaml-expect-0.0.2
+		dev-ml/extlib
+	)"
+
+STRIP_MASK="*/bin/*"
+S="${WORKDIR}/${MY_P}"
+DOCS=( "README.txt" "TODO.txt" "AUTHORS.txt" "CHANGES.txt" )
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild
index 5c09e560fca6..3a95c9af02c8 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.500.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/BerkeleyDB/BerkeleyDB-0.500.0.ebuild,v 1.6 2012/04/17 21:52:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BerkeleyDB/BerkeleyDB-0.500.0.ebuild,v 1.7 2012/05/28 14:05:08 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module eutils db-use
 DESCRIPTION="This module provides Berkeley DB interface for Perl."
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # Install DB_File if you want older support. BerkleyDB no longer
diff --git a/dev-perl/Cairo/Cairo-1.90.0.ebuild b/dev-perl/Cairo/Cairo-1.90.0.ebuild
index 7be61d7296e2..c99b8fcf976f 100644
--- a/dev-perl/Cairo/Cairo-1.90.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.90.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/Cairo/Cairo-1.90.0.ebuild,v 1.6 2012/04/17 21:56:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Cairo/Cairo-1.90.0.ebuild,v 1.7 2012/05/28 14:12:34 armin76 Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
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 c4cdc46b18b8..45909e10a16f 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.7 2012/04/17 21:53:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.340.0.ebuild,v 1.8 2012/05/28 14:09:29 armin76 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/DateTime-Format-Strptime/DateTime-Format-Strptime-1.510.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.510.0.ebuild
new file mode 100644
index 000000000000..fe0a31da0a78
--- /dev/null
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.510.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.510.0.ebuild,v 1.1 2012/05/28 12:36:27 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.51
+inherit perl-module
+
+DESCRIPTION="Parse and Format DateTimes using Strptime"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/DateTime-0.44
+	>=dev-perl/DateTime-Locale-0.45
+	>=dev-perl/DateTime-TimeZone-0.79
+	>=dev-perl/Params-Validate-0.91"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 5e8ba5d214c1..e446d766408b 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Format-Strptime-1.5000.tar.gz 27707 RMD160 70ec474a8b57b7b36bf99a6378fd56fa2be3eff2 SHA1 8040a3e3e89340e5e240e3ef7cf1871cc1e4e238 SHA256 1ef191ac4adff361e873c88e27a432b03398815248e36a9e514ee71e17cea554
+DIST DateTime-Format-Strptime-1.51.tar.gz 26632 RMD160 89424b4a73226f269023c20d04b61827feecb2ea SHA1 e859aa9e4192623a628ffa5fbffdd82932e44986 SHA256 9c499ff101fc54516a10d0b737ed31ba016fd3ede8fe4798eaf25841e3d56267
diff --git a/dev-perl/File-Remove/File-Remove-1.510.0.ebuild b/dev-perl/File-Remove/File-Remove-1.510.0.ebuild
index 2e336950fe49..720d3b4940a1 100644
--- a/dev-perl/File-Remove/File-Remove-1.510.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.510.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/File-Remove/File-Remove-1.510.0.ebuild,v 1.10 2012/05/06 17:51:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-1.510.0.ebuild,v 1.11 2012/05/28 14:08:41 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-File-Spec-0.84"
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 48d53d8614b4..5a29595038c8 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.8 2012/04/17 21:55:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.690.0.ebuild,v 1.9 2012/05/28 14:10:34 armin76 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/Math-Random-MT/Manifest b/dev-perl/Math-Random-MT/Manifest
index 7f3496d57b39..68c15c778b9c 100644
--- a/dev-perl/Math-Random-MT/Manifest
+++ b/dev-perl/Math-Random-MT/Manifest
@@ -1 +1,2 @@
 DIST Math-Random-MT-1.13.tar.gz 9589 RMD160 e4779fb05847e5dad82411513dfeac14a3ee034a SHA1 5089b67a12c35bc7447166168736802973d18740 SHA256 988c38d962529a266ba5699734f91a08e29eafd5bfee1819beebe8c08e90deef
+DIST Math-Random-MT-1.14.tar.gz 10480 RMD160 123057e90e29e4a277a0b25a9026884d17f02c94 SHA1 0aafe41f4641881066efcc4efa2bed51790cdb1b SHA256 aef7190bdf8920805ca4c81dd638383b18de80a15f038b78577fb0e8b4efc23f
diff --git a/dev-perl/Math-Random-MT/Math-Random-MT-1.140.0.ebuild b/dev-perl/Math-Random-MT/Math-Random-MT-1.140.0.ebuild
new file mode 100644
index 000000000000..5cf550e718fa
--- /dev/null
+++ b/dev-perl/Math-Random-MT/Math-Random-MT-1.140.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-Random-MT/Math-Random-MT-1.140.0.ebuild,v 1.1 2012/05/28 11:12:23 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FANGLY
+MODULE_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="The Mersenne Twister PRNG"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SRC_TEST=do
diff --git a/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild
index a9b72182cb6d..433705add398 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.50.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/Sub-Name/Sub-Name-0.50.0.ebuild,v 1.7 2012/04/17 21:07:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild,v 1.8 2012/05/28 14:08:09 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild
index e8b2109d7292..51ba25e0d005 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.410.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/XML-Parser/XML-Parser-2.410.0.ebuild,v 1.11 2012/05/13 15:15:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild,v 1.12 2012/05/28 14:11:50 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module multilib
 DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/expat-1.95.1-r1"
diff --git a/dev-python/imaging/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild
index 7e4a0c1a4b73..c7757057ec3e 100644
--- a/dev-python/imaging/imaging-1.1.7-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.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/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.10 2012/04/17 21:57:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.11 2012/05/28 14:14:07 armin76 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples lcms scanner tk X"
 
 DEPEND="virtual/jpeg
diff --git a/dev-python/sphinx/sphinx-1.1.2.ebuild b/dev-python/sphinx/sphinx-1.1.2.ebuild
index 475ff87a88b3..ca9505ef4a96 100644
--- a/dev-python/sphinx/sphinx-1.1.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.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/dev-python/sphinx/sphinx-1.1.2.ebuild,v 1.10 2012/04/17 21:59:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.2.ebuild,v 1.11 2012/05/28 14:15:36 armin76 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc latex"
 
 DEPEND=">=dev-python/docutils-0.7
diff --git a/dev-python/starcluster/Manifest b/dev-python/starcluster/Manifest
new file mode 100644
index 000000000000..d68905d648ee
--- /dev/null
+++ b/dev-python/starcluster/Manifest
@@ -0,0 +1 @@
+DIST StarCluster-0.93.3.tar.gz 2334885 SHA256 fcda894be33ba309b1c7a94d6c28f1674c3f05ec756133138a39db2138d080d0 SHA512 f81cfc528a00f45f6e720645f44666947f1c51dd3453ac5d78b201d6c3a3cd9f6d97cb7a2802eaf04603d9a19810045ca6071722c9af884ba7e407ffc99078ea WHIRLPOOL b6bfde98f3b660211c5e08965cc6ee31fc9038ec4039ef5aa12ab9c5d474f60f66c1745fb93cce7e05cb361cff6091f60714168ffca81e4033f2fecc5d9d448f
diff --git a/dev-python/starcluster/metadata.xml b/dev-python/starcluster/metadata.xml
new file mode 100644
index 000000000000..c28fdc4c7f92
--- /dev/null
+++ b/dev-python/starcluster/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>python</herd>
+    <maintainer><email>tampakrap@gentoo.org</email></maintainer>
+    <maintainer>
+        <email>johneed@hotmail.com,della5@iinet.com.au</email>
+        <name>Ian Delaney aka idella4 proxy maintainer</name>
+    </maintainer>
+    <maintainer>
+        <email>jtriley@mit.edu</email>
+        <name>Justin Riley</name>
+    </maintainer>
+    <use>
+        <flag name="epydoc">Enable build of apidocs in html using epydoc</flag>
+    </use>
+</pkgmetadata>
diff --git a/dev-python/starcluster/starcluster-0.93.3.ebuild b/dev-python/starcluster/starcluster-0.93.3.ebuild
new file mode 100644
index 000000000000..7980b6d827a2
--- /dev/null
+++ b/dev-python/starcluster/starcluster-0.93.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3.ebuild,v 1.1 2012/05/28 12:54:05 tampakrap Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils bash-completion-r1
+MY_PN="StarCluster"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Utility for creating / managing general purpose computing clusters"
+HOMEPAGE="http://web.mit.edu/star/cluster"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc bash-completion epydoc"
+
+RDEPEND=">=dev-python/ssh-1.7.13
+	>=dev-python/boto-2.3.0
+	>=dev-python/jinja-2.6
+	>=dev-python/decorator-3.1.1
+	>=dev-python/pyasn1-0.0.13_beta
+	>=dev-python/workerpool-0.9.2"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx
+	dev-python/epydoc
+	dev-python/matplotlib )
+	dev-python/setuptools"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs/sphinx html
+
+	mkdocs() {
+		local exit_status=0
+		local msg="build with epydoc failed"
+		pushd docs/epydoc/
+		PATH=$PATH:./ PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" ./build.sh || exit_status=1
+		[[ $exit_status != 0 ]] && eerror "$msg"
+		popd sets
+		return $exit_status
+	}
+	use epydoc && python_execute_function -f mkdocs
+}
+
+src_install() {
+	distutils_src_install
+
+	dobashcomp completion/${PN}-completion.sh ${PN}
+
+	use doc && dohtml -r docs/sphinx/_build/html/
+	if use epydoc; then
+		docompress -x usr/share/doc/${P}/apidocs/api-objects.txt
+		insinto usr/share/doc/${P}/
+		doins -r docs/apidocs/
+	fi
+}
+
+src_test() {
+	distutils_src_test -v ${PN}/tests
+}
diff --git a/dev-python/workerpool/Manifest b/dev-python/workerpool/Manifest
new file mode 100644
index 000000000000..a81e39408992
--- /dev/null
+++ b/dev-python/workerpool/Manifest
@@ -0,0 +1 @@
+DIST workerpool-0.9.2.tar.gz 7747 SHA256 ab2eaf05e236140c62c7411d13ecc4ddedc365966282719a35afc53043c00f82 SHA512 d5ce36ff48b297adb40baf40a53823cc8b6e39b0c7eb880541dffb5ea1d0849e50c344e63f1ac3089d51fc1fe6e73ff2a26df03f9d68f24980222fe3ef7f01c5 WHIRLPOOL 093221fb442abe017591fa79b85abbd1824b63ec89aaf62eb87cb50975dd5164cd3a1ef36c51336e2dcb97aef3fdd18695691e73bfaaa168077172bcc5a49db3
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
new file mode 100644
index 000000000000..1d59d7ebfd4b
--- /dev/null
+++ b/dev-python/workerpool/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>python</herd>
+    <maintainer><email>tampakrap@gentoo.org</email></maintainer>
+    <maintainer>
+        <email>johneed@hotmail.com,della5@iinet.com.au</email>
+        <name>Ian Delaney aka idella4 proxy maintainer</name>
+    </maintainer>
+    <maintainer>
+        <email>jtriley@mit.edu</email>
+        <name>Justin Riley</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/workerpool/workerpool-0.9.2.ebuild b/dev-python/workerpool/workerpool-0.9.2.ebuild
new file mode 100644
index 000000000000..e5bc4066964f
--- /dev/null
+++ b/dev-python/workerpool/workerpool-0.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2.ebuild,v 1.1 2012/05/28 12:50:14 tampakrap Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+DISTUTILS_SRC_TEST=nosetests
+PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+inherit distutils
+
+DESCRIPTION="Module for distributing jobs to a pool of worker threads."
+HOMEPAGE="http://github.com/shazow/workerpool"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test examples"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+src_test() {
+	distutils_src_test -v test
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		docompress -x usr/share/doc/${P}/samples
+		insinto usr/share/doc/${P}/
+		doins -r samples
+	fi
+}
diff --git a/dev-python/xlutils/xlutils-1.5.2.ebuild b/dev-python/xlutils/xlutils-1.5.2.ebuild
index b9d597211d43..1527254bfbc8 100644
--- a/dev-python/xlutils/xlutils-1.5.2.ebuild
+++ b/dev-python/xlutils/xlutils-1.5.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-python/xlutils/xlutils-1.5.2.ebuild,v 1.1 2012/05/20 14:53:23 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlutils/xlutils-1.5.2.ebuild,v 1.2 2012/05/28 11:24:33 tampakrap Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -23,7 +23,7 @@ SLOT="0"
 DOCS=( xlutils/readme.txt xlutils/docs/*.txt )
 
 RDEPEND=">=dev-python/xlwt-0.7.3
-	>=dev-python/xlrd-0.7.3"
+	>=dev-python/xlrd-0.7.7"
 DEPEND="${RDEPEND}
 	test? ( dev-python/errorhandler
 	dev-python/mock
diff --git a/dev-ruby/facets/Manifest b/dev-ruby/facets/Manifest
deleted file mode 100644
index 86199acaa6c3..000000000000
--- a/dev-ruby/facets/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST facets-1.4.5.gem 971264 RMD160 9ce13b80b3e60c77e362548d9fef698510eabe7b SHA1 3f299af9c9c1c57177780d63b4ba1a33bab1a1ac SHA256 15b4f2fdb3088b3587b10ba7feb011659faf7e8696c07234897be5a66be3c3e5
-DIST facets-2.8.4.gem 254976 RMD160 2eb1315d640488cb13eb75d93e211bd300e32c13 SHA1 6ee28fd0e5793def389d9162fbac1cf28989e653 SHA256 4c87b88e57926697b69e42156e9e2841ae1997a4abb02a0128be9550dad39706
diff --git a/dev-ruby/facets/facets-1.4.5.ebuild b/dev-ruby/facets/facets-1.4.5.ebuild
deleted file mode 100644
index d81f068f5d55..000000000000
--- a/dev-ruby/facets/facets-1.4.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facets/facets-1.4.5.ebuild,v 1.7 2012/05/01 18:24:13 armin76 Exp $
-
-inherit ruby gems
-
-IUSE=""
-
-# upstream switched to a strange naming scheme
-# MY_P=$PN-${PV:0:4}"."${PV:4:2}"."${PV:6:2}
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="Facets is an extension library adding extra functionality to Ruby"
-HOMEPAGE="http://facets.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=dev-lang/ruby-1.8.5"
diff --git a/dev-ruby/facets/facets-2.8.4-r1.ebuild b/dev-ruby/facets/facets-2.8.4-r1.ebuild
deleted file mode 100644
index 2d39c7c512f5..000000000000
--- a/dev-ruby/facets/facets-2.8.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facets/facets-2.8.4-r1.ebuild,v 1.6 2012/05/01 18:24:14 armin76 Exp $
-
-EAPI=2
-# ree18 -> test failure on hash ordering
-# jruby -> many failures and jruby crash
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS HISTORY.rdoc NOTES README.rdoc demo/hook.rdoc demo/scenario_require.rdoc"
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/core lib/more"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Facets is an extension library adding extra functionality to Ruby"
-HOMEPAGE="http://facets.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}/${P}-fix-tests.patch"
-
-	mkdir -p doc/rdoc || die "Unable to make directory for documentation."
-}
diff --git a/dev-ruby/facets/files/facets-2.8.4-fix-tests.patch b/dev-ruby/facets/files/facets-2.8.4-fix-tests.patch
deleted file mode 100644
index 26df0a1025bd..000000000000
--- a/dev-ruby/facets/files/facets-2.8.4-fix-tests.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- test/core/unboundmethod/test_arguments.rb.~1~	2011-01-23 12:39:57.721680315 +0100
-+++ test/core/unboundmethod/test_arguments.rb	2011-01-23 13:03:36.583697764 +0100
-@@ -1,4 +1,5 @@
- require 'facets/unboundmethod/arguments'
-+require 'test/unit'
- 
- class Test_UnboundMethod_Arguments  < Test::Unit::TestCase
- 
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
index 40931b1c13a4..ffdf47d101c7 100644
--- a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
+++ b/dev-tex/dvi2tty/dvi2tty-5.3.4.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-tex/dvi2tty/dvi2tty-5.3.4.ebuild,v 1.9 2012/05/09 16:38:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild,v 1.10 2012/05/28 13:59:09 armin76 Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.mesa.nl/pub/dvi2tty/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index fa197ccaf951..de2ebac8f57a 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.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-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild,v 1.4 2012/05/27 15:16:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild,v 1.5 2012/05/28 09:59:24 blueness Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/dev-util/intltool/intltool-0.50.2.ebuild b/dev-util/intltool/intltool-0.50.2.ebuild
index 78bec7092131..7a2635f6752e 100644
--- a/dev-util/intltool/intltool-0.50.2.ebuild
+++ b/dev-util/intltool/intltool-0.50.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-util/intltool/intltool-0.50.2.ebuild,v 1.10 2012/05/13 15:15:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.50.2.ebuild,v 1.11 2012/05/28 13:57:08 armin76 Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://edge.launchpad.net/intltool/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.1
diff --git a/dev-util/netbeans/netbeans-7.1.2.ebuild b/dev-util/netbeans/netbeans-7.1.2.ebuild
index 8430e6130734..637daa064fe5 100644
--- a/dev-util/netbeans/netbeans-7.1.2.ebuild
+++ b/dev-util/netbeans/netbeans-7.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/dev-util/netbeans/netbeans-7.1.2.ebuild,v 1.1 2012/04/26 21:51:37 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-7.1.2.ebuild,v 1.2 2012/05/28 12:37:09 ago Exp $
 
 EAPI="4"
 inherit eutils java-pkg-2 java-ant-2
@@ -46,7 +46,7 @@ SRC_URI="linguas_af? ( ${ALL_URLS} )
 	linguas_zh_TW? ( ${ALL_URLS} )
 "
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE_NETBEANS_MODULES="
 	+netbeans_modules_apisupport
 	netbeans_modules_cnd
diff --git a/games-engines/stratagus/files/stratagus-2.2.6-debug.patch b/games-engines/stratagus/files/stratagus-2.2.6-debug.patch
new file mode 100644
index 000000000000..7ffe2e308612
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.2.6-debug.patch
@@ -0,0 +1,19 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May 20 17:02:54 UTC 2012
+Subject: build-system
+
+do not rename the target if debug is enabled
+
+--- stratagus_2.2.6.orig/CMakeLists.txt
++++ stratagus_2.2.6.orig/CMakeLists.txt
+@@ -729,10 +729,6 @@
+ add_executable(stratagus WIN32 ${stratagus_SRCS} ${stratagus_HDRS})
+ target_link_libraries(stratagus ${stratagus_LIBS})
+ 
+-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-	set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
+-endif()
+-
+ if(WIN32 AND MINGW AND ENABLE_STATIC)
+ 	set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -Wl,--stack,10485760")
+ endif()
diff --git a/games-engines/stratagus/stratagus-2.2.6.ebuild b/games-engines/stratagus/stratagus-2.2.6-r1.ebuild
similarity index 59%
rename from games-engines/stratagus/stratagus-2.2.6.ebuild
rename to games-engines/stratagus/stratagus-2.2.6-r1.ebuild
index 3b1688d077d9..5281b9df67a0 100644
--- a/games-engines/stratagus/stratagus-2.2.6.ebuild
+++ b/games-engines/stratagus/stratagus-2.2.6-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/games-engines/stratagus/stratagus-2.2.6.ebuild,v 1.1 2012/05/27 20:24:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.6-r1.ebuild,v 1.1 2012/05/28 11:54:46 hasufell Exp $
 
 EAPI=2
 inherit cmake-utils eutils games
@@ -14,38 +14,46 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 debug doc mikmod mng theora vorbis"
 
-RDEPEND="x11-libs/libX11
-	virtual/opengl
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
 	>=dev-lang/lua-5
 	dev-lua/toluapp
 	media-libs/libpng:0
+	virtual/opengl
+	x11-libs/libX11
 	media-libs/libsdl[audio,opengl,video]
 	bzip2? ( app-arch/bzip2 )
 	mikmod? ( media-libs/libmikmod )
 	mng? ( media-libs/libmng )
-	theora? ( media-libs/libtheora media-libs/libvorbis )
-	vorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+# on EAPI=4 we would set
+# REQUIRED_USE=theora? ( vorbis )
 
 S=${WORKDIR}/${PN}_${PV}.orig
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-debug.patch
 }
 
 src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
 	local mycmakeargs=(
 		-DBINDIR="${GAMES_BINDIR}"
 		-DSBINDIR="${GAMES_BINDIR}"
-		$(cmake-utils_use_with bzip2)
-		$(cmake-utils_use_with debug)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_with mikmod)
-		$(cmake-utils_use_with mng)
-		$(cmake-utils_use_with theora)
-		$(cmake-utils_use_with vorbis oggvorbis)
+		$(cmake-utils_use_with bzip2 BZIP2)
+		$(cmake-utils_use_enable doc DOC)
+		$(cmake-utils_use_with mikmod MIKMOD)
+		$(cmake-utils_use_with mng MNG)
+		$(cmake-utils_use_with vorbis OGGVORBIS)
+		$(usex vorbis "$(cmake-utils_use_with theora THEORA)" "-DWITH_THEORA=OFF")
 		-DENABLE_DEV=ON
 	)
 
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch
new file mode 100644
index 000000000000..5c5982fe730d
--- /dev/null
+++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch
@@ -0,0 +1,11 @@
+--- makefile.old	2012-05-28 14:02:44.787705444 +0200
++++ makefile	2012-05-28 14:03:44.520524011 +0200
+@@ -458,7 +458,7 @@
+ 	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ $(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
+-	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
++	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
+ 
+ #
+ # An install rule.
diff --git a/games-roguelike/tome/files/tome-2.3.5-overflow.patch b/games-roguelike/tome/files/tome-2.3.5-overflow.patch
deleted file mode 100644
index 399fdd1536b0..000000000000
--- a/games-roguelike/tome/files/tome-2.3.5-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../lib/edit/p_info.txt.old	2010-03-20 20:40:53.000000000 +0100
-+++ ../lib/edit/p_info.txt	2010-03-20 20:41:05.000000000 +0100
-@@ -1559,8 +1559,8 @@
- S:O:70:12:25d3
- 
- # Used for corruptions that can change your subrace
--S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-+S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-+S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- S:S:0:0:0:0:0:0:0:100
- S:K:0:0:0:0:0:0:0:0
- S:P:0:0:0
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
index 0ed37952acde..ec84d1f648ff 100644
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ b/games-roguelike/tome/tome-2.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.6 2011/03/01 07:25:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.7 2012/05/28 12:23:39 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -31,7 +31,10 @@ S=${WORKDIR}/tome-${MY_PV}-src/src
 src_prepare() {
 	mv makefile.std makefile
 	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
-		"${FILESDIR}"/${P}-overflow.patch
+		"${FILESDIR}"/${P}-noX.patch
+	sed -i \
+		-e "s:xx:x:" \
+		../lib/edit/p_info.txt
 	sed -i \
 		-e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \
 		|| die "sed failed"
diff --git a/games-strategy/wargus/wargus-2.2.6.ebuild b/games-strategy/wargus/wargus-2.2.6-r1.ebuild
similarity index 91%
rename from games-strategy/wargus/wargus-2.2.6.ebuild
rename to games-strategy/wargus/wargus-2.2.6-r1.ebuild
index f35ee731d5dc..58486454e992 100644
--- a/games-strategy/wargus/wargus-2.2.6.ebuild
+++ b/games-strategy/wargus/wargus-2.2.6-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/games-strategy/wargus/wargus-2.2.6.ebuild,v 1.3 2012/05/27 23:01:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.6-r1.ebuild,v 1.1 2012/05/28 13:18:06 hasufell Exp $
 
 EAPI=2
 inherit eutils cdrom cmake-utils gnome2-utils games
@@ -20,6 +20,7 @@ RDEPEND="=games-engines/stratagus-${PV}*[theora]
 	sys-libs/zlib
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
+	media-sound/cdparanoia
 	media-sound/timidity++
 	media-video/ffmpeg2theora
 	virtual/pkgconfig"
@@ -55,7 +56,7 @@ src_install() {
 
 	local dir=${GAMES_DATADIR}/stratagus/${PN}
 
-	"${D}"/usr/games/bin/wartool -m -v "${CDROM_ROOT}"/data "${D}/${dir}" \
+	"${D}"/usr/games/bin/wartool -m -v -r "${CDROM_ROOT}"/data "${D}/${dir}" \
 		|| die "Failed to extract data"
 
 	prepgamesdirs
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild
index d5981cdcc09c..7de9a643c712 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.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/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.1 2012/05/19 09:27:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.2 2012/05/28 12:34:25 blueness Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 306d7ae94b41..b1f96b52adc2 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,7 +1,7 @@
 DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
 DIST enigmail-1.4.1.tar.gz 1344516 RMD160 f235e266acd390992f128a20f73288c2ecc3c5a5 SHA1 5c629a5d06e23c5bebb86c840f44f04f0732dbda SHA256 100bc7f9ac6bca03e4507df25c5b29d6a39d0904c46301cc7def3676779d720b
 DIST firefox-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-DIST firefox-12.0-patches-0.3.tar.xz 12500 RMD160 b6bd3ea865eb3a1286efbbbebdce7b08354c981e SHA1 c9c079aab10bb5c5374d91e24f5ff0fdb6278bca SHA256 a84ff93ccfac5051b915e81d2d3f6f75b72ee49000bf6bf38540e83cafe299cf
+DIST firefox-12.0-patches-0.4.tar.xz 12820 RMD160 08c54d0a3365a615ead75559d0ac382604c83a3c SHA1 f74d4343b67cc59b29bb2bccb08139a757094d48 SHA256 1481e85400de6860f373149f7d0eebd5b8ae5179ed7d8fcbeef0d81115e0f781
 DIST thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256 22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
 DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
 DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
@@ -109,6 +109,7 @@ DIST thunderbird-10.0.4esr-vi.xpi 435913 RMD160 84e10687b728e582fcdcb65791529ca3
 DIST thunderbird-10.0.4esr-zh-CN.xpi 431235 RMD160 f7a605f564ac8db210c09837814e52a017cac89a SHA1 43eca0afb5d649040cd5ecd4b051fb21cd6b4bea SHA256 cb3ca5e6e7f272bf40b3190969bed0b744a0d7dbee400468071e97552b656c86
 DIST thunderbird-10.0.4esr-zh-TW.xpi 431827 RMD160 d07835286c8b7e49c83f65e120555f297e46fc70 SHA1 2a442f0443441b0699e97af892ca15d7a119e1a0 SHA256 596081c0e046faa6056b8844fd42deadeaa6ba156efb25918b055d2b8b9e4fb7
 DIST thunderbird-10.0.4esr.source.tar.bz2 98131707 RMD160 292a99a23041a924dd15ab5fd62dced33f581012 SHA1 058392812a59c41ce50f2e3196954aa75bf42bf1 SHA256 f3657ece13c72646cdead2969deee1c16f152c08c90d350070301182ec8c1c4b
+DIST thunderbird-12.0-patches-0.1.tar.xz 3948 RMD160 337df328b144c59a416cc30ceb38e534022891ec SHA1 56d9ffb8585660190411f2ffa9f86a953c51b705 SHA256 d07c866ad84f6b4a46374e980da42ff54f93efdc6beadd1a268cc54cc37d6d5e
 DIST thunderbird-12.0.1-ar.xpi 442461 RMD160 8ac9e0863c8873fb58ddbab14b720791fc0951fb SHA1 7acf8a2ff4788bfa02f649e57ed0df9f4a1276c0 SHA256 31081e9d5a44b5be3bbd29b3a5cd940f3ba15d2d25b38aba92b5f6795c28f31b
 DIST thunderbird-12.0.1-ast.xpi 362871 RMD160 f8b66c4a47c917b2073f6871e0c5094df82c996e SHA1 9a44313cbf5c2484c015de440b85864b70014d6f SHA256 929a14589922359ddf09654263a29c6a767c3ddb946d436aa923be901d29cf29
 DIST thunderbird-12.0.1-be.xpi 398391 RMD160 c168bbc491e8a8442b1583c8c8100585eeb7bf18 SHA1 fb19a8af6ee2f172177acedf35c0d9246e17a897 SHA256 f0ead6fab2a9132cd03336700ec198a012ca9c467db3948d2a9009972c9b18f2
diff --git a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
index 3117de54884b..4d775f913018 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1-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/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.3 2012/05/24 22:06:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.4 2012/05/28 14:41:25 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -35,8 +35,8 @@ SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm"
 
-PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-12.0-patches-0.3"
+PATCH="thunderbird-12.0-patches-0.1"
+PATCHFF="firefox-12.0-patches-0.4"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
diff --git a/media-gfx/gimp/gimp-2.6.12.ebuild b/media-gfx/gimp/gimp-2.6.12.ebuild
index 89fdb197d3f0..5c6ced56d785 100644
--- a/media-gfx/gimp/gimp-2.6.12.ebuild
+++ b/media-gfx/gimp/gimp-2.6.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/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.10 2012/05/18 22:32:00 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.11 2012/05/28 14:17:33 armin76 Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
 
diff --git a/media-libs/gmtk/gmtk-1.0.6.ebuild b/media-libs/gmtk/gmtk-1.0.6.ebuild
index 312566d435ca..24d95ce2d749 100644
--- a/media-libs/gmtk/gmtk-1.0.6.ebuild
+++ b/media-libs/gmtk/gmtk-1.0.6.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-libs/gmtk/gmtk-1.0.6.ebuild,v 1.2 2012/05/05 08:02:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gmtk/gmtk-1.0.6.ebuild,v 1.3 2012/05/28 12:23:36 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa +dconf pulseaudio"
 
 COMMON_DEPEND=">=dev-libs/glib-2.26
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2ed91f7ef28b..40118f06eb8b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,6 +4,8 @@ DIST MesaLib-7.11.tar.bz2 6559702 RMD160 1637654c0f8e9e581753057f439f41bfdf7d763
 DIST MesaLib-7.9.2.tar.bz2 5648858 RMD160 d6665c1eb1035b9bebc743401355c39aaffcdf5c SHA1 973d27e49654b7bd1ed0d3c4c986d26d25ccabed SHA256 6b54c96ba0673c3f088bf9a56c2d64a6e54831a1065dedf0ac234d7cd5151253
 DIST MesaLib-8.0.1.tar.bz2 5694019 RMD160 958e610862bef2bcca6f9b8bb85a4d65a2eedb9c SHA1 1f7f37872b64b7b092677b594ec7bf90eb1586f2 SHA256 593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7
 DIST MesaLib-8.0.2.tar.bz2 5705573 RMD160 a7c4e396d82c890eed462fd45b433812f3fad045 SHA1 bbb55d81294425137ee66c7389fbb474a43c9ab9 SHA256 8f4d1e70e058a65143e618a9daaf45f00fac04ae9464b35a8d9eeeef3fa5e2a5
+DIST MesaLib-8.0.3.tar.bz2 5737289 RMD160 3d9d6dfbe42bc3ce1d3df491ca4e353108abec4b SHA1 768bdb2fe133bbcccd3323b79484d0d17bc0d05d SHA256 96812c59b0923314914185a2b064eb5245f1228a319c4db94835ce1c84da407f
 DIST MesaLib-8.0.tar.bz2 5687424 RMD160 c25d4dd038c56185ac2fbcb06bbb62acaf90b936 SHA1 fc07c2224189e6445ea078a4eb2193398a260daa SHA256 a69adfe4fdda792ed145f7610075b8003961f080e5c515f1dfd326e172aa8543
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 RMD160 acc52b4f05b82a98e7994dc005699630270de360 SHA1 f38c616eeacbeebe597ed4bc98b84a41caa18108 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 RMD160 45196d33a7e2f6d3766ddf9cf5e5ab1b5becff18 SHA1 51e567e8549477160ddceaa2a618dd6dfe3656e1 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b
+DIST mesa-8.0.3-gentoo-patches-02.tar.bz2 1858 RMD160 21b0ba905b8b212d96b5de5d43bb98f02d30715d SHA1 5c748d57e0d6fab12b558e6ccfddede422db1732 SHA256 554e2f49ff4e33b4eb64c50d010f3be4ae302ab01af2794feff2ea73c0eb7104
diff --git a/media-libs/mesa/mesa-8.0.3.ebuild b/media-libs/mesa/mesa-8.0.3.ebuild
new file mode 100644
index 000000000000..21c03dc8bb98
--- /dev/null
+++ b/media-libs/mesa/mesa-8.0.3.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-8.0.3.ebuild,v 1.2 2012/05/28 12:43:01 chithanh Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-02.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+# Most of the code is MIT/X11.
+# ralloc is LGPL-3
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT LGPL-3 SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD"
+
+REQUIRED_USE="
+	d3d?    ( gallium )
+	g3dvl?  ( gallium )
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	g3dvl? ( || ( vdpau xvmc ) )
+	vdpau? ( g3dvl )
+	xa?    ( gallium )
+	xvmc?  ( g3dvl )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium )
+	video_cards_r600?   ( gallium )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.32"
+# not a runtime dependency of this package, but dependency of packages which
+# depend on this package, bug #342393
+EXTERNAL_DEPEND="
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15
+"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="${EXTERNAL_DEPEND}
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	>=app-admin/eselect-opengl-1.2.5
+	dev-libs/expat
+	gbm? ( sys-fs/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8
+	d3d? ( app-emulation/wine )
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( dev-libs/wayland )
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 )
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? ( >=sys-devel/llvm-2.9 )
+	=dev-lang/python-2*
+	dev-libs/libxml2[python]
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	x11-misc/makedepend
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth the shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# Think about: ggi, fbcon, no-X configs
+
+pkg_setup() {
+	# workaround toc-issue wrt #386545
+	use ppc64 && append-flags -mminimal-toc
+}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	# relax the requirement that r300 must have llvm, bug 380303
+	epatch "${FILESDIR}"/${PN}-8.0-dont-require-llvm-for-r300.patch
+
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+	fi
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+
+	# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="
+			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
+			$(use_enable gallium gallium-egl)
+		"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d d3d1x)
+			$(use_enable g3dvl gallium-g3dvl)
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		if ! use video_cards_i915; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	econf \
+		--enable-dri \
+		--enable-glx \
+		$(use_enable !bindist texture-float) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !pic asm) \
+		$(use_enable shared-dricore) \
+		$(use_enable shared-glapi) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Save the glsl-compiler for later use
+	if ! tc-is-cross-compiler; then
+		dobin "${S}"/src/glsl/glsl_compiler
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.0.1" eselect-mesa.conf
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}"
+					fi
+				fi
+			done
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
new file mode 100644
index 000000000000..b4f85e8752a4
--- /dev/null
+++ b/media-sound/beets/Manifest
@@ -0,0 +1 @@
+DIST beets-1.0b14.tar.gz 500373 RMD160 1d4e9de5f7f8f11f9101c12da2d2469bbc4b2e4c SHA1 6cd4a3eff6fd5f7d340a5dc9ff57647bd23f4720 SHA256 7bb71cdc2e3b6a523fab5d650776643d31b638ff97ad3c36ac34b2e4f92dde5c
diff --git a/media-sound/beets/beets-1.0_beta14.ebuild b/media-sound/beets/beets-1.0_beta14.ebuild
new file mode 100644
index 000000000000..dac8654963ec
--- /dev/null
+++ b/media-sound/beets/beets-1.0_beta14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14.ebuild,v 1.2 2012/05/28 12:51:32 sochotnicky Exp $
+
+EAPI="4"
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils python
+
+MY_PV=${PV/_beta/b}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks."
+SRC_URI="http://beets.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://beets.radbox.org/"
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="MIT"
+IUSE=""
+
+DEPEND="dev-python/munkres
+		dev-python/python-musicbrainz-ngs
+		dev-python/unidecode
+		media-libs/mutagen"
+
+RDEPEND="${DEPEND}"
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
new file mode 100644
index 000000000000..8bfa2cee0a6e
--- /dev/null
+++ b/media-sound/beets/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sochotnicky@gentoo.org</email>
+		<name>Stanislav Ochotnicky</name>
+	</maintainer>
+	<longdescription lang="en">
+The purpose of beets is to get your music collection right once and for all. It catalogs your collection, automatically improving its metadata as it goes using the MusicBrainz database. (It also downloads cover art for albums it imports.) Then it provides a bouquet of tools for manipulating and accessing your music.
+
+Because beets is designed as a library, it can do almost anything you can imagine for your music collection. Via plugins, beets becomes a panacea:
+  * Embed and extract album art from files’ tags.
+  * Listen to your library with a music player that speaks the MPD protocol and works with a staggering variety of interfaces.
+  * Fetch lyrics for all your songs from databases on the Web.
+  * Manage your MusicBrainz music collection.
+  * Analyze music files’ metadata from the command line.
+  * Clean up crufty tags left behind by other, less-awesome tools.
+  * Browse your music library graphically through a Web browser and play it in any browser that supports HTML5 Audio.
+
+If beets doesn’t do what you want yet, writing your own plugin is shockingly simple if you know a little Python.		
+	</longdescription>
+</pkgmetadata>
+
diff --git a/media-sound/mpc/mpc-0.22.ebuild b/media-sound/mpc/mpc-0.22.ebuild
index 977be5dad050..cbc9d356c8b6 100644
--- a/media-sound/mpc/mpc-0.22.ebuild
+++ b/media-sound/mpc/mpc-0.22.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/mpc/mpc-0.22.ebuild,v 1.3 2012/05/27 14:48:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.22.ebuild,v 1.5 2012/05/28 15:14:24 johu Exp $
 
 EAPI=4
 inherit bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/ncmpc/ncmpc-0.20.ebuild b/media-sound/ncmpc/ncmpc-0.20.ebuild
index 69c891aa3b13..1ffeb9aed8e7 100644
--- a/media-sound/ncmpc/ncmpc-0.20.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.20.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/ncmpc/ncmpc-0.20.ebuild,v 1.3 2012/05/27 14:48:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.20.ebuild,v 1.4 2012/05/28 12:20:54 jer Exp $
 
 EAPI=4
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.6.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.6.ebuild
index f1b91e8c4214..320a66742695 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.6.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.6.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/gnome-mplayer/gnome-mplayer-1.0.6.ebuild,v 1.2 2012/05/05 08:58:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.6.ebuild,v 1.3 2012/05/28 12:24:11 ago Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="alsa +dbus +dconf gnome ipod libnotify musicbrainz pulseaudio"
 
 COMMON_DEPEND=">=dev-libs/glib-2.26
diff --git a/media-video/smplayer/smplayer-0.8.0.ebuild b/media-video/smplayer/smplayer-0.8.0.ebuild
index f28b43880312..e409f98d666d 100644
--- a/media-video/smplayer/smplayer-0.8.0.ebuild
+++ b/media-video/smplayer/smplayer-0.8.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-video/smplayer/smplayer-0.8.0.ebuild,v 1.1 2012/04/08 23:01:26 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.0.ebuild,v 1.3 2012/05/28 14:02:31 johu 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-misc/editor-wrapper-4 b/metadata/cache/app-misc/editor-wrapper-4
index f6e87bc80688..6eda6695e289 100644
--- a/metadata/cache/app-misc/editor-wrapper-4
+++ b/metadata/cache/app-misc/editor-wrapper-4
@@ -6,7 +6,7 @@
 http://www.gentoo.org/
 MIT
 Wrapper scripts that will execute EDITOR or PAGER
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-portage/gentoolkit-0.3.0.5 b/metadata/cache/app-portage/gentoolkit-0.3.0.5
index d660ea50a587..2672317abb32 100644
--- a/metadata/cache/app-portage/gentoolkit-0.3.0.5
+++ b/metadata/cache/app-portage/gentoolkit-0.3.0.5
@@ -6,7 +6,7 @@ mirror://gentoo/gentoolkit-0.3.0.5.tar.gz
 http://www.gentoo.org/proj/en/portage/tools/index.xml
 GPL-2
 Collection of administration scripts for Gentoo
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 distutils eutils multilib python toolchain-funcs user
 
 
diff --git a/metadata/cache/app-text/libwps-0.2.6 b/metadata/cache/app-text/libwps-0.2.6
index 0dbec55231ad..3fd974438fbf 100644
--- a/metadata/cache/app-text/libwps-0.2.6
+++ b/metadata/cache/app-text/libwps-0.2.6
@@ -7,14 +7,14 @@ http://libwps.sourceforge.net/
 LGPL-2.1
 Microsoft Works file word processor format import filter library
 amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-
+base eutils multilib toolchain-funcs user
 doc debug static-libs
 
 
 
 4
 
-configure install
+compile configure install prepare unpack
 
 
 
diff --git a/metadata/cache/app-vim/gentoo-syntax-20120109 b/metadata/cache/app-vim/gentoo-syntax-20120109
index aa318c611e00..63a31e5cabea 100644
--- a/metadata/cache/app-vim/gentoo-syntax-20120109
+++ b/metadata/cache/app-vim/gentoo-syntax-20120109
@@ -6,7 +6,7 @@ mirror://gentoo/gentoo-syntax-20120109.tar.bz2
 http://www.gentoo.org/
 vim
 vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files syntax highlighting, filetype and indent settings
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 vim-doc vim-plugin
 ignore-glep31
 
diff --git a/metadata/cache/dev-db/m17n-db-1.6.3 b/metadata/cache/dev-db/m17n-db-1.6.3
index 59fd8bb8a74d..3a40cca8f659 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/qdbm-1.8.78-r1 b/metadata/cache/dev-db/qdbm-1.8.78-r1
index c957d1dfb701..fc5c5f8d210e 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 ~amd64-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~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-java/jffi-1.2.2 b/metadata/cache/dev-java/jffi-1.2.2
new file mode 100644
index 000000000000..fc9296142873
--- /dev/null
+++ b/metadata/cache/dev-java/jffi-1.2.2
@@ -0,0 +1,22 @@
+virtual/libffi >=virtual/jdk-1.5 virtual/pkgconfig test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+1.2
+https://github.com/jnr/jffi/tarball/1.2.2 -> jffi-1.2.2.tar.gz
+
+http://github.com/jnr/jffi
+|| ( Apache-2.0 LGPL-3 )
+An optimized Java interface to libffi
+~amd64 ~ppc ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user vcs-snapshot versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-constants-0.8.3 b/metadata/cache/dev-java/jnr-constants-0.8.3
new file mode 100644
index 000000000000..214c586d35f2
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-constants-0.8.3
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+https://github.com/jnr/jnr-constants/tarball/0.8.3 -> jnr-constants-0.8.3.tar.gz
+
+https://github.com/jnr/jnr-constants
+|| ( Apache-2.0 LGPL-3 )
+A set of platform constants (e.g. errno values)
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user vcs-snapshot versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-ffi-0.6.0 b/metadata/cache/dev-java/jnr-ffi-0.6.0
index 70ea71ac0f34..a6b43a17e3c5 100644
--- a/metadata/cache/dev-java/jnr-ffi-0.6.0
+++ b/metadata/cache/dev-java/jnr-ffi-0.6.0
@@ -6,7 +6,7 @@ test
 http://github.com/jnr
 || ( Apache-2.0 LGPL-3 )
 An abstracted interface to invoking native functions from java
-~amd64 ~x86
+amd64 x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/jnr-ffi-0.7.4 b/metadata/cache/dev-java/jnr-ffi-0.7.4
new file mode 100644
index 000000000000..ba3fa99e2b0e
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-ffi-0.7.4
@@ -0,0 +1,22 @@
+dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0.7
+https://github.com/jnr/jnr-ffi/tarball/0.7.4 -> jnr-ffi-0.7.4.tar.gz
+
+https://github.com/jnr/jnr-ffi
+|| ( Apache-2.0 LGPL-3 )
+An abstracted interface to invoking native functions from java
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user vcs-snapshot versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/jnr-posix-2.1 b/metadata/cache/dev-java/jnr-posix-2.1
new file mode 100644
index 000000000000..8c78628990ba
--- /dev/null
+++ b/metadata/cache/dev-java/jnr-posix-2.1
@@ -0,0 +1,22 @@
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+2.1
+https://github.com/jnr/jnr-posix/tarball/2.1 -> jnr-posix-2.1.tar.gz
+
+https://github.com/jnr/jnr-posix
+|| ( CPL-1.0 GPL-2 LGPL-2.1 )
+Lightweight cross-platform POSIX emulation layer for Java
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user vcs-snapshot versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-apisupport-7.1.2 b/metadata/cache/dev-java/netbeans-apisupport-7.1.2
index 8d59d310ba43..38e28ee762e8 100644
--- a/metadata/cache/dev-java/netbeans-apisupport-7.1.2
+++ b/metadata/cache/dev-java/netbeans-apisupport-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/apisupport
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans API Support Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-cnd-7.1.2 b/metadata/cache/dev-java/netbeans-cnd-7.1.2
index cb4d7566e4da..ab4e3a878390 100644
--- a/metadata/cache/dev-java/netbeans-cnd-7.1.2
+++ b/metadata/cache/dev-java/netbeans-cnd-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/cnd
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans CND Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-dlight-7.1.2 b/metadata/cache/dev-java/netbeans-dlight-7.1.2
index 73b96ba96b33..6f280f2de28d 100644
--- a/metadata/cache/dev-java/netbeans-dlight-7.1.2
+++ b/metadata/cache/dev-java/netbeans-dlight-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans D-Light Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-enterprise-7.1.2 b/metadata/cache/dev-java/netbeans-enterprise-7.1.2
index 7d5b9352cc02..7b02d5ecd591 100644
--- a/metadata/cache/dev-java/netbeans-enterprise-7.1.2
+++ b/metadata/cache/dev-java/netbeans-enterprise-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Enterprise cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-ergonomics-7.1.2 b/metadata/cache/dev-java/netbeans-ergonomics-7.1.2
index e1281fbf63f1..3079bd6d35c1 100644
--- a/metadata/cache/dev-java/netbeans-ergonomics-7.1.2
+++ b/metadata/cache/dev-java/netbeans-ergonomics-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Ergonomics Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-groovy-7.1.2 b/metadata/cache/dev-java/netbeans-groovy-7.1.2
index 2c018f48a329..5c8d2b877665 100644
--- a/metadata/cache/dev-java/netbeans-groovy-7.1.2
+++ b/metadata/cache/dev-java/netbeans-groovy-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/groovy
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Groovy Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-harness-7.1.2 b/metadata/cache/dev-java/netbeans-harness-7.1.2
index c380143c9311..6ea0ab549d9f 100644
--- a/metadata/cache/dev-java/netbeans-harness-7.1.2
+++ b/metadata/cache/dev-java/netbeans-harness-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/features/platform/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Harness
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-ide-7.1.2 b/metadata/cache/dev-java/netbeans-ide-7.1.2
index 3290114bb16b..48f3e910718d 100644
--- a/metadata/cache/dev-java/netbeans-ide-7.1.2
+++ b/metadata/cache/dev-java/netbeans-ide-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/ide
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans IDE Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-java-7.1.2-r1 b/metadata/cache/dev-java/netbeans-java-7.1.2-r1
index 86f1cd7a185a..ef1b49a61680 100644
--- a/metadata/cache/dev-java/netbeans-java-7.1.2-r1
+++ b/metadata/cache/dev-java/netbeans-java-7.1.2-r1
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/java
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Java Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-javacard-7.1.2 b/metadata/cache/dev-java/netbeans-javacard-7.1.2
index 5b2685d8d5ef..292fea216e49 100644
--- a/metadata/cache/dev-java/netbeans-javacard-7.1.2
+++ b/metadata/cache/dev-java/netbeans-javacard-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/javacard
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans JavaCard Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-javadoc-7.1.2 b/metadata/cache/dev-java/netbeans-javadoc-7.1.2
index 0892689e6d99..9e10d9073cd3 100644
--- a/metadata/cache/dev-java/netbeans-javadoc-7.1.2
+++ b/metadata/cache/dev-java/netbeans-javadoc-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans JavaDocs
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-javafx-7.1.2 b/metadata/cache/dev-java/netbeans-javafx-7.1.2
index d14e2ff13fb9..7788530c3396 100644
--- a/metadata/cache/dev-java/netbeans-javafx-7.1.2
+++ b/metadata/cache/dev-java/netbeans-javafx-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/javafx
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans JavaFX Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-mobility-7.1.2 b/metadata/cache/dev-java/netbeans-mobility-7.1.2
index 9faff2284e29..94e203c91912 100644
--- a/metadata/cache/dev-java/netbeans-mobility-7.1.2
+++ b/metadata/cache/dev-java/netbeans-mobility-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/features/platform/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Mobility Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-nb-7.1.2 b/metadata/cache/dev-java/netbeans-nb-7.1.2
index 8e2e7ffbf7bb..383f037859fb 100644
--- a/metadata/cache/dev-java/netbeans-nb-7.1.2
+++ b/metadata/cache/dev-java/netbeans-nb-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans IDE Branding
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 keychain elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-php-7.1.2 b/metadata/cache/dev-java/netbeans-php-7.1.2
index 884fb98ad135..4dfc00e1c6d4 100644
--- a/metadata/cache/dev-java/netbeans-php-7.1.2
+++ b/metadata/cache/dev-java/netbeans-php-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/php
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans PHP Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-platform-7.1.2 b/metadata/cache/dev-java/netbeans-platform-7.1.2
index d50c77111acc..51906c717864 100644
--- a/metadata/cache/dev-java/netbeans-platform-7.1.2
+++ b/metadata/cache/dev-java/netbeans-platform-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/features/platform/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Platform
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-profiler-7.1.2 b/metadata/cache/dev-java/netbeans-profiler-7.1.2
index 648e22237587..901c4ee54d26 100644
--- a/metadata/cache/dev-java/netbeans-profiler-7.1.2
+++ b/metadata/cache/dev-java/netbeans-profiler-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/projects/profiler
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Profiler Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/netbeans-websvccommon-7.1.2 b/metadata/cache/dev-java/netbeans-websvccommon-7.1.2
index 1c102fe4af13..c4278b332f96 100644
--- a/metadata/cache/dev-java/netbeans-websvccommon-7.1.2
+++ b/metadata/cache/dev-java/netbeans-websvccommon-7.1.2
@@ -6,7 +6,7 @@ http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-2012041
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans Web Services Common Cluster
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/xerces-2.11.0 b/metadata/cache/dev-java/xerces-2.11.0
index 1cdf4f1ba2df..d30019ef9cd9 100644
--- a/metadata/cache/dev-java/xerces-2.11.0
+++ b/metadata/cache/dev-java/xerces-2.11.0
@@ -6,7 +6,7 @@ test
 http://xml.apache.org/xerces2-j/index.html
 Apache-2.0
 The next generation of high performance, fully compliant XML parsers in the Apache Xerces family
-~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 elibc_FreeBSD doc examples source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-java/xml-commons-external-1.4.01 b/metadata/cache/dev-java/xml-commons-external-1.4.01
index 9ad499cf5ff7..f63f46321789 100644
--- a/metadata/cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/cache/dev-java/xml-commons-external-1.4.01
@@ -6,7 +6,7 @@ https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
 http://xml.apache.org/commons/
 Apache-2.0
 An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP.
-~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 doc source elibc_FreeBSD doc source elibc_FreeBSD
 
diff --git a/metadata/cache/dev-libs/nspr-4.9 b/metadata/cache/dev-libs/nspr-4.9
index 8f17dd73de5c..a51ae4f88e2a 100644
--- a/metadata/cache/dev-libs/nspr-4.9
+++ b/metadata/cache/dev-libs/nspr-4.9
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
 http://www.mozilla.org/projects/nspr/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Netscape Portable Runtime
-alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user versionator
 debug
 
diff --git a/metadata/cache/dev-libs/nss-3.13.4 b/metadata/cache/dev-libs/nss-3.13.4
index f49f818f3856..dbf2f6389622 100644
--- a/metadata/cache/dev-libs/nss-3.13.4
+++ b/metadata/cache/dev-libs/nss-3.13.4
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_4_RTM/src/n
 http://www.mozilla.org/projects/security/pki/nss/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Mozilla's Network Security Services library that implements PKI support
-alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils flag-o-matic multilib toolchain-funcs user
 utils
 
diff --git a/metadata/cache/dev-libs/xmlrpc-c-1.28.03-r1 b/metadata/cache/dev-libs/xmlrpc-c-1.28.03-r1
index 44e444412029..d8bf41ee2597 100644
--- a/metadata/cache/dev-libs/xmlrpc-c-1.28.03-r1
+++ b/metadata/cache/dev-libs/xmlrpc-c-1.28.03-r1
@@ -6,7 +6,7 @@ mirror://gentoo/xmlrpc-c-1.28.03.tar.gz
 http://xmlrpc-c.sourceforge.net/
 BSD
 A lightweigt RPC library based on XML and HTTP
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 abyss +cgi +curl +cxx +libxml2 static-libs threads tools
 test? ( static-libs abyss curl cxx )
diff --git a/metadata/cache/dev-ml/oasis-0.3.0_rc6 b/metadata/cache/dev-ml/oasis-0.3.0_rc6
new file mode 100644
index 000000000000..ad9c40259447
--- /dev/null
+++ b/metadata/cache/dev-ml/oasis-0.3.0_rc6
@@ -0,0 +1,22 @@
+>=dev-ml/ocaml-data-notation-0.0.3 dev-ml/ocamlify dev-ml/ocamlmod test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-1.1.0 >=dev-ml/ocaml-expect-0.0.2 dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
+>=dev-ml/ocaml-data-notation-0.0.3 >=dev-lang/ocaml-3.12[ocamlopt?]
+0
+http://forge.ocamlcore.org/frs/download.php/880/oasis-0.3.0~rc6.tar.gz
+
+http://oasis.forge.ocamlcore.org/index.php
+LGPL-2.1-linking-exception
+OASIS is a tool to integrate a configure, build and install system in OCaml project
+~amd64
+base eutils findlib multilib oasis toolchain-funcs user
++ocamlopt debug doc test
+
+
+
+3
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/BerkeleyDB-0.500.0 b/metadata/cache/dev-perl/BerkeleyDB-0.500.0
index 623ad28bc206..12fb88be5759 100644
--- a/metadata/cache/dev-perl/BerkeleyDB-0.500.0
+++ b/metadata/cache/dev-perl/BerkeleyDB-0.500.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.50.tar.gz
 http://search.cpan.org/dist/BerkeleyDB/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 This module provides Berkeley DB interface for Perl.
-~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+alpha amd64 hppa ia64 ppc ppc64 sparc x86
 base db-use eutils multilib perl-module toolchain-funcs user versionator
 test
 
diff --git a/metadata/cache/dev-perl/Cairo-1.90.0 b/metadata/cache/dev-perl/Cairo-1.90.0
index f24aee2f1bed..e6ec1f13f9e3 100644
--- a/metadata/cache/dev-perl/Cairo-1.90.0
+++ b/metadata/cache/dev-perl/Cairo-1.90.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.090.tar.gz
 http://search.cpan.org/dist/Cairo/
 LGPL-2.1
 Perl interface to the cairo library
-~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Class-Accessor-0.340.0 b/metadata/cache/dev-perl/Class-Accessor-0.340.0
index fd537e7fa835..2b77137fc8df 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/DateTime-Format-Strptime-1.510.0 b/metadata/cache/dev-perl/DateTime-Format-Strptime-1.510.0
new file mode 100644
index 000000000000..543b09d677d8
--- /dev/null
+++ b/metadata/cache/dev-perl/DateTime-Format-Strptime-1.510.0
@@ -0,0 +1,22 @@
+>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 >=virtual/perl-ExtUtils-MakeMaker-6.31 dev-lang/perl[-build]
+>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.51.tar.gz
+
+http://search.cpan.org/dist/DateTime-Format-Strptime/
+Artistic-2
+Parse and Format DateTimes using Strptime
+~amd64 ~x86 ~x64-macos ~x86-solaris
+base eutils multilib perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/File-Remove-1.510.0 b/metadata/cache/dev-perl/File-Remove-1.510.0
index 76764c517a7a..f4c4061ae65f 100644
--- a/metadata/cache/dev-perl/File-Remove-1.510.0
+++ b/metadata/cache/dev-perl/File-Remove-1.510.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.51.tar.gz
 http://search.cpan.org/dist/File-Remove/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Remove files and directories
-~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 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 3eb3ef88ea8d..19fc6166fee7 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/Math-Random-MT-1.140.0 b/metadata/cache/dev-perl/Math-Random-MT-1.140.0
new file mode 100644
index 000000000000..348a2c9b2817
--- /dev/null
+++ b/metadata/cache/dev-perl/Math-Random-MT-1.140.0
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.14.tar.gz
+
+http://search.cpan.org/dist/Math-Random-MT/
+BSD
+The Mersenne Twister PRNG
+~amd64 ~x86
+base eutils multilib perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Sub-Name-0.50.0 b/metadata/cache/dev-perl/Sub-Name-0.50.0
index 80b6578024db..cf82e73dc927 100644
--- a/metadata/cache/dev-perl/Sub-Name-0.50.0
+++ b/metadata/cache/dev-perl/Sub-Name-0.50.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz
 http://search.cpan.org/dist/Sub-Name/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 (Re)name a sub
-~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/XML-Parser-2.410.0 b/metadata/cache/dev-perl/XML-Parser-2.410.0
index 17a0cfcc5f3d..93d0c172a3de 100644
--- a/metadata/cache/dev-perl/XML-Parser-2.410.0
+++ b/metadata/cache/dev-perl/XML-Parser-2.410.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz
 http://search.cpan.org/dist/XML-Parser/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 A Perl extension interface to James Clark's XML parser, expat
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-python/imaging-1.1.7-r1 b/metadata/cache/dev-python/imaging-1.1.7-r1
index 38266866eb76..0c417f6f7f6a 100644
--- a/metadata/cache/dev-python/imaging-1.1.7-r1
+++ b/metadata/cache/dev-python/imaging-1.1.7-r1
@@ -6,7 +6,7 @@ http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
 http://www.pythonware.com/products/pil/index.htm
 as-is
 Python Imaging Library (PIL)
-~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 distutils eutils multilib python toolchain-funcs user
 doc examples lcms scanner tk X
 
diff --git a/metadata/cache/dev-python/sphinx-1.1.2 b/metadata/cache/dev-python/sphinx-1.1.2
index 28acaefa0eba..757b61570064 100644
--- a/metadata/cache/dev-python/sphinx-1.1.2
+++ b/metadata/cache/dev-python/sphinx-1.1.2
@@ -6,7 +6,7 @@ mirror://pypi/S/Sphinx/Sphinx-1.1.2.tar.gz
 http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 BSD
 Python documentation generator
-~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 distutils multilib python toolchain-funcs
 doc latex test
 
diff --git a/metadata/cache/dev-python/starcluster-0.93.3 b/metadata/cache/dev-python/starcluster-0.93.3
new file mode 100644
index 000000000000..42501ded94f9
--- /dev/null
+++ b/metadata/cache/dev-python/starcluster-0.93.3
@@ -0,0 +1,22 @@
+>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta >=dev-python/workerpool-0.9.2 doc? ( dev-python/sphinx dev-python/epydoc dev-python/matplotlib ) dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
+>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta >=dev-python/workerpool-0.9.2 =dev-lang/python-2*
+0
+mirror://pypi/s/StarCluster/StarCluster-0.93.3.tar.gz
+
+http://web.mit.edu/star/cluster
+LGPL-3
+Utility for creating / managing general purpose computing clusters
+~amd64 ~x86
+bash-completion-r1 distutils multilib python toolchain-funcs
+doc bash-completion epydoc test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/workerpool-0.9.2 b/metadata/cache/dev-python/workerpool-0.9.2
new file mode 100644
index 000000000000..6aab092c9833
--- /dev/null
+++ b/metadata/cache/dev-python/workerpool-0.9.2
@@ -0,0 +1,22 @@
+dev-python/setuptools dev-lang/python test? ( dev-python/nose )
+dev-lang/python
+0
+mirror://pypi/w//workerpool-0.9.2.tar.gz
+
+http://github.com/shazow/workerpool
+MIT
+Module for distributing jobs to a pool of worker threads.
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+test examples test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/xlutils-1.5.2 b/metadata/cache/dev-python/xlutils-1.5.2
index a64ebdf64ddd..7ea0ac44f589 100644
--- a/metadata/cache/dev-python/xlutils-1.5.2
+++ b/metadata/cache/dev-python/xlutils-1.5.2
@@ -1,5 +1,5 @@
->=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.3 test? ( dev-python/errorhandler dev-python/mock >=dev-python/testfixtures-1.6.1 ) =dev-lang/python-2* test? ( dev-python/pytest )
->=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.3 =dev-lang/python-2*
+>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.7 test? ( dev-python/errorhandler dev-python/mock >=dev-python/testfixtures-1.6.1 ) =dev-lang/python-2* test? ( dev-python/pytest )
+>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.7 =dev-lang/python-2*
 0
 mirror://pypi/x/xlutils/xlutils-1.5.2.tar.gz
 
diff --git a/metadata/cache/dev-ruby/facets-1.4.5 b/metadata/cache/dev-ruby/facets-1.4.5
deleted file mode 100644
index 38a3fab43b48..000000000000
--- a/metadata/cache/dev-ruby/facets-1.4.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ruby-1.8.5 =dev-lang/ruby-1.8* =dev-lang/ruby-1.8* >=dev-ruby/rubygems-1.3.1 <=dev-ruby/rubygems-1.3.7-r1 !<dev-ruby/rdoc-2
->=dev-lang/ruby-1.8.5 =dev-lang/ruby-1.8* =dev-lang/ruby-1.8* >=dev-ruby/rubygems-1.3.1 <=dev-ruby/rubygems-1.3.7-r1 !<dev-ruby/rdoc-2
-0
-mirror://rubygems/facets-1.4.5.gem
-
-http://facets.rubyforge.org/
-Ruby
-Facets is an extension library adding extra functionality to Ruby
-amd64 ppc64 x86
-eutils gems multilib ruby toolchain-funcs user
-doc
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/facets-2.8.4-r1 b/metadata/cache/dev-ruby/facets-2.8.4-r1
deleted file mode 100644
index b4d262ec4f6d..000000000000
--- a/metadata/cache/dev-ruby/facets-2.8.4-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-0
-mirror://rubygems/facets-2.8.4.gem
-
-http://facets.rubyforge.org/
-Ruby
-Facets is an extension library adding extra functionality to Ruby
-amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 doc test test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-tex/dvi2tty-5.3.4 b/metadata/cache/dev-tex/dvi2tty-5.3.4
index 777bdadb1f30..c0ce7c9adb84 100644
--- a/metadata/cache/dev-tex/dvi2tty-5.3.4
+++ b/metadata/cache/dev-tex/dvi2tty-5.3.4
@@ -6,7 +6,7 @@ ftp://ftp.mesa.nl/pub/dvi2tty/dvi2tty-5.3.4.tgz
 http://www.ctan.org/tex-archive/dviware/
 GPL-2
 Preview dvi-files on text-only devices
-~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-util/fix-la-relink-command-0.1.1 b/metadata/cache/dev-util/fix-la-relink-command-0.1.1
index 1a398d9b565a..5147accb17aa 100644
--- a/metadata/cache/dev-util/fix-la-relink-command-0.1.1
+++ b/metadata/cache/dev-util/fix-la-relink-command-0.1.1
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-c
 http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Helps prevent .la files from relinking to libraries outside a build tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 
 
 
diff --git a/metadata/cache/dev-util/intltool-0.50.2 b/metadata/cache/dev-util/intltool-0.50.2
index 3ba79ee3d928..87b7dbad4756 100644
--- a/metadata/cache/dev-util/intltool-0.50.2
+++ b/metadata/cache/dev-util/intltool-0.50.2
@@ -6,7 +6,7 @@ http://edge.launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz
 http://edge.launchpad.net/intltool/
 GPL-2
 Internationalization Tool Collection
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/dev-util/netbeans-7.1.2 b/metadata/cache/dev-util/netbeans-7.1.2
index f9163325915b..26848b4f86fa 100644
--- a/metadata/cache/dev-util/netbeans-7.1.2
+++ b/metadata/cache/dev-util/netbeans-7.1.2
@@ -6,7 +6,7 @@ linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans
 http://netbeans.org/
 || ( CDDL GPL-2-with-linking-exception )
 Netbeans IDE
-~amd64 ~x86
+amd64 ~x86
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
 doc +netbeans_modules_apisupport netbeans_modules_cnd netbeans_modules_dlight netbeans_modules_enterprise netbeans_modules_ergonomics netbeans_modules_groovy +netbeans_modules_java netbeans_modules_javacard +netbeans_modules_javafx netbeans_modules_mobility netbeans_modules_php +netbeans_modules_profiler +netbeans_modules_websvccommon linguas_af linguas_ar linguas_bg linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_gl linguas_hi_IN linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_si linguas_sq linguas_sr linguas_sv linguas_ta_IN linguas_tl linguas_tr linguas_vi linguas_zh_CN linguas_zh_TW elibc_FreeBSD elibc_FreeBSD
 
diff --git a/metadata/cache/games-engines/stratagus-2.2.6 b/metadata/cache/games-engines/stratagus-2.2.6
deleted file mode 100644
index cda2fb1d93e9..000000000000
--- a/metadata/cache/games-engines/stratagus-2.2.6
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis )
-0
-http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
-
-http://stratagus.sourceforge.net/
-GPL-2
-A realtime strategy game engine
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
-bzip2 debug doc mikmod mng theora vorbis
-
-
-
-2
-
-compile configure install postinst preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/games-engines/stratagus-2.2.6-r1 b/metadata/cache/games-engines/stratagus-2.2.6-r1
new file mode 100644
index 000000000000..9c5f6a039430
--- /dev/null
+++ b/metadata/cache/games-engines/stratagus-2.2.6-r1
@@ -0,0 +1,22 @@
+dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libvorbis theora? ( media-libs/libtheora ) ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libvorbis theora? ( media-libs/libtheora ) )
+0
+http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
+
+http://stratagus.sourceforge.net/
+GPL-2
+A realtime strategy game engine
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
+bzip2 debug doc mikmod mng theora vorbis
+
+
+
+2
+
+compile configure install postinst preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/wargus-2.2.6 b/metadata/cache/games-strategy/wargus-2.2.6-r1
similarity index 71%
rename from metadata/cache/games-strategy/wargus-2.2.6
rename to metadata/cache/games-strategy/wargus-2.2.6-r1
index bb99f9a3b379..51c96888f98d 100644
--- a/metadata/cache/games-strategy/wargus-2.2.6
+++ b/metadata/cache/games-strategy/wargus-2.2.6-r1
@@ -1,4 +1,4 @@
-=games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+=games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/cdparanoia media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 =games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2
 0
 http://launchpad.net/wargus/trunk/2.2.6/+download/wargus_2.2.6.orig.tar.gz
diff --git a/metadata/cache/gnome-base/gsettings-desktop-schemas-3.4.2 b/metadata/cache/gnome-base/gsettings-desktop-schemas-3.4.2
index 13ba130f682b..bc30160038d7 100644
--- a/metadata/cache/gnome-base/gsettings-desktop-schemas-3.4.2
+++ b/metadata/cache/gnome-base/gsettings-desktop-schemas-3.4.2
@@ -6,7 +6,7 @@ mirror://gnome/sources/gsettings-desktop-schemas/3.4/gsettings-desktop-schemas-3
 http://www.gnome.org/
 GPL-2
 Collection of GSettings schemas for GNOME desktop
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 +introspection
 
diff --git a/metadata/cache/mail-client/thunderbird-12.0.1-r1 b/metadata/cache/mail-client/thunderbird-12.0.1-r1
index 26407feed1ec..ed11221f91fd 100644
--- a/metadata/cache/mail-client/thunderbird-12.0.1-r1
+++ b/metadata/cache/mail-client/thunderbird-12.0.1-r1
@@ -1,7 +1,7 @@
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) virtual/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 virtual/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
-linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ar.xpi -> thunderbird-12.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ast.xpi -> thunderbird-12.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/be.xpi -> thunderbird-12.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bg.xpi -> thunderbird-12.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-12.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/br.xpi -> thunderbird-12.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ca.xpi -> thunderbird-12.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/cs.xpi -> thunderbird-12.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/da.xpi -> thunderbird-12.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/de.xpi -> thunderbird-12.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/el.xpi -> thunderbird-12.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-12.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-12.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-12.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/et.xpi -> thunderbird-12.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/eu.xpi -> thunderbird-12.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fi.xpi -> thunderbird-12.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fr.xpi -> thunderbird-12.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-12.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-12.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gd.xpi -> thunderbird-12.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gl.xpi -> thunderbird-12.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/he.xpi -> thunderbird-12.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/hu.xpi -> thunderbird-12.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/id.xpi -> thunderbird-12.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/is.xpi -> thunderbird-12.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/it.xpi -> thunderbird-12.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ja.xpi -> thunderbird-12.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ko.xpi -> thunderbird-12.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/lt.xpi -> thunderbird-12.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-12.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nl.xpi -> thunderbird-12.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-12.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-12.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pl.xpi -> thunderbird-12.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-12.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-12.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/rm.xpi -> thunderbird-12.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ro.xpi -> thunderbird-12.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ru.xpi -> thunderbird-12.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/si.xpi -> thunderbird-12.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sk.xpi -> thunderbird-12.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sl.xpi -> thunderbird-12.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sq.xpi -> thunderbird-12.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sr.xpi -> thunderbird-12.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-12.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-12.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/tr.xpi -> thunderbird-12.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/uk.xpi -> thunderbird-12.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/vi.xpi -> thunderbird-12.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-12.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-12.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/12.0.1/source/thunderbird-12.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.3.tar.xz
+linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ar.xpi -> thunderbird-12.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ast.xpi -> thunderbird-12.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/be.xpi -> thunderbird-12.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bg.xpi -> thunderbird-12.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-12.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/br.xpi -> thunderbird-12.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ca.xpi -> thunderbird-12.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/cs.xpi -> thunderbird-12.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/da.xpi -> thunderbird-12.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/de.xpi -> thunderbird-12.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/el.xpi -> thunderbird-12.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-12.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-12.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-12.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/et.xpi -> thunderbird-12.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/eu.xpi -> thunderbird-12.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fi.xpi -> thunderbird-12.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fr.xpi -> thunderbird-12.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-12.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-12.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gd.xpi -> thunderbird-12.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gl.xpi -> thunderbird-12.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/he.xpi -> thunderbird-12.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/hu.xpi -> thunderbird-12.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/id.xpi -> thunderbird-12.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/is.xpi -> thunderbird-12.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/it.xpi -> thunderbird-12.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ja.xpi -> thunderbird-12.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ko.xpi -> thunderbird-12.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/lt.xpi -> thunderbird-12.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-12.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nl.xpi -> thunderbird-12.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-12.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-12.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pl.xpi -> thunderbird-12.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-12.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-12.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/rm.xpi -> thunderbird-12.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ro.xpi -> thunderbird-12.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ru.xpi -> thunderbird-12.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/si.xpi -> thunderbird-12.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sk.xpi -> thunderbird-12.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sl.xpi -> thunderbird-12.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sq.xpi -> thunderbird-12.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sr.xpi -> thunderbird-12.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-12.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-12.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/tr.xpi -> thunderbird-12.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/uk.xpi -> thunderbird-12.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/vi.xpi -> thunderbird-12.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-12.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-12.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/12.0.1/source/thunderbird-12.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.4.tar.xz
 
 http://www.mozilla.com/en-US/thunderbird/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
diff --git a/metadata/cache/media-gfx/gimp-2.6.12 b/metadata/cache/media-gfx/gimp-2.6.12
index add1fa33603a..7d740d5ce555 100644
--- a/metadata/cache/media-gfx/gimp-2.6.12
+++ b/metadata/cache/media-gfx/gimp-2.6.12
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~jlec/distfiles/gimp-2.6.11-underlinking.patch.xz mirror:/
 http://www.gimp.org/
 GPL-2
 GNU Image Manipulation Program
-~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+alpha amd64 hppa ia64 ppc ppc64 sparc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf debug
 
diff --git a/metadata/cache/media-libs/gmtk-1.0.6 b/metadata/cache/media-libs/gmtk-1.0.6
index 6f467c922ee7..5c5dcba0cdc0 100644
--- a/metadata/cache/media-libs/gmtk-1.0.6
+++ b/metadata/cache/media-libs/gmtk-1.0.6
@@ -6,7 +6,7 @@ http://gmtk.googlecode.com/files/gmtk-1.0.6.tar.gz
 http://code.google.com/p/gmtk/
 GPL-2
 GTK+ widget and function libraries for gnome-mplayer
-~alpha ~amd64 ~ppc ~ppc64 ~x86
+~alpha amd64 ~ppc ~ppc64 ~x86
 
 alsa +dconf pulseaudio
 
diff --git a/metadata/cache/media-libs/mesa-8.0.3 b/metadata/cache/media-libs/mesa-8.0.3
new file mode 100644
index 000000000000..16e3cc52723f
--- /dev/null
+++ b/metadata/cache/media-libs/mesa-8.0.3
@@ -0,0 +1,22 @@
+>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] virtual/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] )
+0
+ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/mesa-8.0.3-gentoo-patches-02.tar.bz2
+
+http://mesa3d.sourceforge.net/
+MIT LGPL-3 SGI-B-2.0
+OpenGL-like graphic library for Linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+autotools base eutils flag-o-matic libtool multilib python toolchain-funcs user
+video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
+d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
+
+
+4
+
+compile configure install postinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/beets-1.0_beta14 b/metadata/cache/media-sound/beets-1.0_beta14
new file mode 100644
index 000000000000..2f70333ce4f5
--- /dev/null
+++ b/metadata/cache/media-sound/beets-1.0_beta14
@@ -0,0 +1,22 @@
+dev-python/munkres dev-python/python-musicbrainz-ngs dev-python/unidecode media-libs/mutagen dev-lang/python
+dev-python/munkres dev-python/python-musicbrainz-ngs dev-python/unidecode media-libs/mutagen dev-lang/python
+0
+http://beets.googlecode.com/files/beets-1.0b14.tar.gz
+
+http://beets.radbox.org/
+MIT
+A media library management system for obsessive-compulsive music geeks.
+~amd64
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-sound/mpc-0.22 b/metadata/cache/media-sound/mpc-0.22
index b71b940c8bfe..e2b111c098ea 100644
--- a/metadata/cache/media-sound/mpc-0.22
+++ b/metadata/cache/media-sound/mpc-0.22
@@ -6,7 +6,7 @@ mirror://sourceforge/musicpd/mpc-0.22.tar.bz2
 http://www.musicpd.org
 GPL-2
 A commandline client for Music Player Daemon (media-sound/mpd)
-amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
 bash-completion-r1
 iconv
 
diff --git a/metadata/cache/media-sound/ncmpc-0.20 b/metadata/cache/media-sound/ncmpc-0.20
index 4b97acb38a43..128e71de7078 100644
--- a/metadata/cache/media-sound/ncmpc-0.20
+++ b/metadata/cache/media-sound/ncmpc-0.20
@@ -6,7 +6,7 @@ http://downloads.sourceforge.net/musicpd/ncmpc-0.20.tar.bz2
 http://mpd.wikia.com/wiki/Client:Ncmpc
 GPL-2
 A ncurses client for the Music Player Daemon (MPD)
-amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 multilib toolchain-funcs
 artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
 
diff --git a/metadata/cache/media-video/gnome-mplayer-1.0.6 b/metadata/cache/media-video/gnome-mplayer-1.0.6
index 63412741fc62..0f6055181da8 100644
--- a/metadata/cache/media-video/gnome-mplayer-1.0.6
+++ b/metadata/cache/media-video/gnome-mplayer-1.0.6
@@ -6,7 +6,7 @@ http://gnome-mplayer.googlecode.com/files/gnome-mplayer-1.0.6.tar.gz
 http://code.google.com/p/gnome-mplayer/
 GPL-2
 A GTK+ interface to MPlayer
-~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+~alpha amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 fdo-mime gnome2-utils
 alsa +dbus +dconf gnome ipod libnotify musicbrainz pulseaudio
 
diff --git a/metadata/cache/media-video/smplayer-0.8.0 b/metadata/cache/media-video/smplayer-0.8.0
index 51b4eed64545..6923cda3440d 100644
--- a/metadata/cache/media-video/smplayer-0.8.0
+++ b/metadata/cache/media-video/smplayer-0.8.0
@@ -6,7 +6,7 @@ mirror://sourceforge/smplayer/smplayer-0.8.0.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-ftp/pure-ftpd-1.0.35 b/metadata/cache/net-ftp/pure-ftpd-1.0.35
index 458884440a89..e2c128f3a891 100644
--- a/metadata/cache/net-ftp/pure-ftpd-1.0.35
+++ b/metadata/cache/net-ftp/pure-ftpd-1.0.35
@@ -6,7 +6,7 @@ ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.bz2 http://do
 http://www.pureftpd.org/
 BSD
 Fast, production-quality, standard-conformant FTP server.
-~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 confutils eutils flag-o-matic multilib toolchain-funcs user
 anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
 
diff --git a/metadata/cache/net-ftp/vsftpd-2.3.5 b/metadata/cache/net-ftp/vsftpd-2.3.5
index 5724c9789c00..b02a13086e0c 100644
--- a/metadata/cache/net-ftp/vsftpd-2.3.5
+++ b/metadata/cache/net-ftp/vsftpd-2.3.5
@@ -6,7 +6,7 @@ http://security.appspot.com/downloads/vsftpd-2.3.5.tar.gz
 http://vsftpd.beasts.org/
 GPL-2
 Very Secure FTP Daemon written with speed, size and security in mind
-amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 caps pam tcpd ssl selinux xinetd
 
diff --git a/metadata/cache/net-im/amsn-0.98.9 b/metadata/cache/net-im/amsn-0.98.9
index 851b800707cd..7170c1b33fa3 100644
--- a/metadata/cache/net-im/amsn-0.98.9
+++ b/metadata/cache/net-im/amsn-0.98.9
@@ -14,7 +14,7 @@ debug
 
 4
 
-configure install postinst postrm preinst prepare
+compile configure install postinst postrm preinst prepare
 
 
 
diff --git a/metadata/cache/net-misc/mikutter-0.1.0.642 b/metadata/cache/net-misc/mikutter-0.1.1.780
similarity index 93%
rename from metadata/cache/net-misc/mikutter-0.1.0.642
rename to metadata/cache/net-misc/mikutter-0.1.1.780
index 225313103bc4..5bfdd0d2455b 100644
--- a/metadata/cache/net-misc/mikutter-0.1.0.642
+++ b/metadata/cache/net-misc/mikutter-0.1.1.780
@@ -1,7 +1,7 @@
 test? ( ruby_targets_ruby19? ( dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 0
-http://mikutter.hachune.net/bin/mikutter.0.1.0.642.tar.gz
+http://mikutter.hachune.net/bin/mikutter.0.1.1.780.tar.gz
 
 http://mikutter.hachune.net/
 GPL-3
diff --git a/metadata/cache/perl-core/Pod-Simple-3.220.0 b/metadata/cache/perl-core/Pod-Simple-3.220.0
new file mode 100644
index 000000000000..5c5a1b8073aa
--- /dev/null
+++ b/metadata/cache/perl-core/Pod-Simple-3.220.0
@@ -0,0 +1,22 @@
+>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl[-build]
+>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.22.tar.gz
+
+http://search.cpan.org/dist/Pod-Simple/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+Framework for parsing Pod
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+alternatives base eutils multilib perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-boot/unetbootin-575 b/metadata/cache/sys-boot/unetbootin-575
index 957577b9f39d..704c0cdbdc94 100644
--- a/metadata/cache/sys-boot/unetbootin-575
+++ b/metadata/cache/sys-boot/unetbootin-575
@@ -6,7 +6,7 @@ mirror://sourceforge/unetbootin/unetbootin-source-575.tar.gz
 http://unetbootin.sourceforge.net/
 GPL-2
 Universal Netboot Installer creates Live USB systems for various OS distributions.
-~amd64 ~x86
+amd64 x86
 base eutils multilib qt4-r2 toolchain-funcs user
 linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/sys-fs/fatsort-0.9.16.254 b/metadata/cache/sys-fs/fatsort-0.9.16.254
new file mode 100644
index 000000000000..ef8eed599364
--- /dev/null
+++ b/metadata/cache/sys-fs/fatsort-0.9.16.254
@@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/fatsort/fatsort-0.9.16.254.tar.gz
+
+http://fatsort.sourceforge.net/
+GPL-2
+Sorts files on FAT16/32 partitions, ideal for basic audio players.
+~amd64 ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/mm-sources-3.0 b/metadata/cache/sys-kernel/mm-sources-3.0
deleted file mode 100644
index 318c37fe4158..000000000000
--- a/metadata/cache/sys-kernel/mm-sources-3.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-util/quilt !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-dev-util/quilt !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-0
-mirror://kernel/linux/kernel/v3.0/linux-3.0.tar.bz2 http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz -> broken-out-3.0.tar.gz
-binchecks strip
-http://userweb.kernel.org/~akpm/mmotm/
-GPL-2
-Andrew Morton's -mmotm quilt patchset
-~amd64 ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-symlink build
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/mm-sources-3.1_rc3 b/metadata/cache/sys-kernel/mm-sources-3.1_rc3
deleted file mode 100644
index 81d164d84bb0..000000000000
--- a/metadata/cache/sys-kernel/mm-sources-3.1_rc3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-util/quilt !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-dev-util/quilt !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-0
-mirror://kernel/linux/kernel/v3.x/testing/patch-3.1-rc3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz -> broken-out-3.1_rc3.tar.gz
-binchecks strip
-http://userweb.kernel.org/~akpm/mmotm/
-GPL-2
-Andrew Morton's -mmotm quilt patchset
-~amd64 ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-symlink build
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/libcxx-0.0_p20120523 b/metadata/cache/sys-libs/libcxx-0.0_p20120528
similarity index 58%
rename from metadata/cache/sys-libs/libcxx-0.0_p20120523
rename to metadata/cache/sys-libs/libcxx-0.0_p20120528
index a647c8e425b9..1bf030556455 100644
--- a/metadata/cache/sys-libs/libcxx-0.0_p20120523
+++ b/metadata/cache/sys-libs/libcxx-0.0_p20120528
@@ -1,7 +1,7 @@
-sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-
+sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+sys-libs/libcxxrt
 0
-mirror://gentoo/libcxx-0.0_p20120523.tar.xz
+mirror://gentoo/libcxx-0.0_p20120528.tar.xz
 
 http://libcxx.llvm.org/
 || ( UoI-NCSA MIT )
diff --git a/metadata/cache/sys-libs/libcxx-9999 b/metadata/cache/sys-libs/libcxx-9999
index 1c391eeacfd5..f6f268a547fa 100644
--- a/metadata/cache/sys-libs/libcxx-9999
+++ b/metadata/cache/sys-libs/libcxx-9999
@@ -1,5 +1,5 @@
-sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/subversion net-misc/rsync
-
+sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/subversion net-misc/rsync
+sys-libs/libcxxrt
 0
 
 
diff --git a/metadata/cache/sys-libs/libcxxrt-0.0_p20120528 b/metadata/cache/sys-libs/libcxxrt-0.0_p20120528
new file mode 100644
index 000000000000..5583215ac7a6
--- /dev/null
+++ b/metadata/cache/sys-libs/libcxxrt-0.0_p20120528
@@ -0,0 +1,22 @@
+app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+
+0
+mirror://gentoo/libcxxrt-0.0_p20120528.tar.xz
+
+https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
+BSD-2
+C++ Runtime from PathScale, FreeBSD and NetBSD.
+~amd64
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/libcxxrt-9999 b/metadata/cache/sys-libs/libcxxrt-9999
new file mode 100644
index 000000000000..6714a4fc96eb
--- /dev/null
+++ b/metadata/cache/sys-libs/libcxxrt-9999
@@ -0,0 +1,22 @@
+>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+
+0
+
+
+https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
+BSD-2
+C++ Runtime from PathScale, FreeBSD and NetBSD.
+
+base cmake-utils eutils flag-o-matic git-2 multilib toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/virtual/perl-Pod-Simple-3.220.0 b/metadata/cache/virtual/perl-Pod-Simple-3.220.0
new file mode 100644
index 000000000000..7a33e60a1a65
--- /dev/null
+++ b/metadata/cache/virtual/perl-Pod-Simple-3.220.0
@@ -0,0 +1,22 @@
+
+~perl-core/Pod-Simple-3.220.0
+0
+
+
+
+
+Virtual for Pod-Simple
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+
+
+
+
+
+
+
+-
+
+
+
+
+
diff --git a/metadata/cache/www-client/firefox-12.0-r1 b/metadata/cache/www-client/firefox-12.0-r1
index ab3991d6e002..5135778afcf8 100644
--- a/metadata/cache/www-client/firefox-12.0-r1
+++ b/metadata/cache/www-client/firefox-12.0-r1
@@ -1,7 +1,7 @@
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) virtual/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 virtual/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
-linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/af.xpi -> firefox-12.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ak.xpi -> firefox-12.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ar.xpi -> firefox-12.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/as.xpi -> firefox-12.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ast.xpi -> firefox-12.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/be.xpi -> firefox-12.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bg.xpi -> firefox-12.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-BD.xpi -> firefox-12.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-IN.xpi -> firefox-12.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/br.xpi -> firefox-12.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bs.xpi -> firefox-12.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ca.xpi -> firefox-12.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cs.xpi -> firefox-12.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/csb.xpi -> firefox-12.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cy.xpi -> firefox-12.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/da.xpi -> firefox-12.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/de.xpi -> firefox-12.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/el.xpi -> firefox-12.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-GB.xpi -> firefox-12.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-ZA.xpi -> firefox-12.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eo.xpi -> firefox-12.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-AR.xpi -> firefox-12.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-CL.xpi -> firefox-12.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-ES.xpi -> firefox-12.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-MX.xpi -> firefox-12.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/et.xpi -> firefox-12.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eu.xpi -> firefox-12.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fa.xpi -> firefox-12.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fi.xpi -> firefox-12.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fr.xpi -> firefox-12.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fy-NL.xpi -> firefox-12.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ga-IE.xpi -> firefox-12.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gd.xpi -> firefox-12.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gl.xpi -> firefox-12.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gu-IN.xpi -> firefox-12.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/he.xpi -> firefox-12.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hi-IN.xpi -> firefox-12.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hr.xpi -> firefox-12.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hu.xpi -> firefox-12.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hy-AM.xpi -> firefox-12.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/id.xpi -> firefox-12.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/is.xpi -> firefox-12.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/it.xpi -> firefox-12.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ja.xpi -> firefox-12.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kk.xpi -> firefox-12.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kn.xpi -> firefox-12.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ko.xpi -> firefox-12.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ku.xpi -> firefox-12.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lg.xpi -> firefox-12.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lt.xpi -> firefox-12.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lv.xpi -> firefox-12.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mai.xpi -> firefox-12.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mk.xpi -> firefox-12.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ml.xpi -> firefox-12.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mr.xpi -> firefox-12.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nb-NO.xpi -> firefox-12.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nl.xpi -> firefox-12.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nn-NO.xpi -> firefox-12.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nso.xpi -> firefox-12.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/or.xpi -> firefox-12.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pa-IN.xpi -> firefox-12.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pl.xpi -> firefox-12.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-BR.xpi -> firefox-12.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-PT.xpi -> firefox-12.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/rm.xpi -> firefox-12.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ro.xpi -> firefox-12.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ru.xpi -> firefox-12.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/si.xpi -> firefox-12.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sk.xpi -> firefox-12.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sl.xpi -> firefox-12.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/son.xpi -> firefox-12.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sq.xpi -> firefox-12.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sr.xpi -> firefox-12.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sv-SE.xpi -> firefox-12.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta.xpi -> firefox-12.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta-LK.xpi -> firefox-12.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/te.xpi -> firefox-12.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/th.xpi -> firefox-12.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/tr.xpi -> firefox-12.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/uk.xpi -> firefox-12.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/vi.xpi -> firefox-12.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-CN.xpi -> firefox-12.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-TW.xpi -> firefox-12.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zu.xpi -> firefox-12.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.3.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//12.0/source/firefox-12.0.source.tar.bz2
+linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/af.xpi -> firefox-12.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ak.xpi -> firefox-12.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ar.xpi -> firefox-12.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/as.xpi -> firefox-12.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ast.xpi -> firefox-12.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/be.xpi -> firefox-12.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bg.xpi -> firefox-12.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-BD.xpi -> firefox-12.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-IN.xpi -> firefox-12.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/br.xpi -> firefox-12.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bs.xpi -> firefox-12.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ca.xpi -> firefox-12.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cs.xpi -> firefox-12.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/csb.xpi -> firefox-12.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cy.xpi -> firefox-12.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/da.xpi -> firefox-12.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/de.xpi -> firefox-12.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/el.xpi -> firefox-12.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-GB.xpi -> firefox-12.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-ZA.xpi -> firefox-12.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eo.xpi -> firefox-12.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-AR.xpi -> firefox-12.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-CL.xpi -> firefox-12.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-ES.xpi -> firefox-12.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-MX.xpi -> firefox-12.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/et.xpi -> firefox-12.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eu.xpi -> firefox-12.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fa.xpi -> firefox-12.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fi.xpi -> firefox-12.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fr.xpi -> firefox-12.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fy-NL.xpi -> firefox-12.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ga-IE.xpi -> firefox-12.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gd.xpi -> firefox-12.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gl.xpi -> firefox-12.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gu-IN.xpi -> firefox-12.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/he.xpi -> firefox-12.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hi-IN.xpi -> firefox-12.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hr.xpi -> firefox-12.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hu.xpi -> firefox-12.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hy-AM.xpi -> firefox-12.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/id.xpi -> firefox-12.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/is.xpi -> firefox-12.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/it.xpi -> firefox-12.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ja.xpi -> firefox-12.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kk.xpi -> firefox-12.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kn.xpi -> firefox-12.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ko.xpi -> firefox-12.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ku.xpi -> firefox-12.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lg.xpi -> firefox-12.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lt.xpi -> firefox-12.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lv.xpi -> firefox-12.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mai.xpi -> firefox-12.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mk.xpi -> firefox-12.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ml.xpi -> firefox-12.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mr.xpi -> firefox-12.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nb-NO.xpi -> firefox-12.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nl.xpi -> firefox-12.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nn-NO.xpi -> firefox-12.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nso.xpi -> firefox-12.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/or.xpi -> firefox-12.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pa-IN.xpi -> firefox-12.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pl.xpi -> firefox-12.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-BR.xpi -> firefox-12.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-PT.xpi -> firefox-12.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/rm.xpi -> firefox-12.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ro.xpi -> firefox-12.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ru.xpi -> firefox-12.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/si.xpi -> firefox-12.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sk.xpi -> firefox-12.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sl.xpi -> firefox-12.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/son.xpi -> firefox-12.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sq.xpi -> firefox-12.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sr.xpi -> firefox-12.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sv-SE.xpi -> firefox-12.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta.xpi -> firefox-12.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta-LK.xpi -> firefox-12.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/te.xpi -> firefox-12.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/th.xpi -> firefox-12.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/tr.xpi -> firefox-12.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/uk.xpi -> firefox-12.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/vi.xpi -> firefox-12.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-CN.xpi -> firefox-12.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-TW.xpi -> firefox-12.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zu.xpi -> firefox-12.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//12.0/source/firefox-12.0.source.tar.bz2
 
 http://www.mozilla.com/firefox
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
diff --git a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.6 b/metadata/cache/www-plugins/gecko-mediaplayer-1.0.6
index b4db49c15234..78fed98f6f2f 100644
--- a/metadata/cache/www-plugins/gecko-mediaplayer-1.0.6
+++ b/metadata/cache/www-plugins/gecko-mediaplayer-1.0.6
@@ -6,7 +6,7 @@ http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-1.0.6.tar.gz
 http://code.google.com/p/gecko-mediaplayer/
 GPL-2
 A browser plugin that uses GNOME MPlayer
-~amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 ~x86
 eutils multilib nsplugins toolchain-funcs user
 +curl
 
diff --git a/metadata/cache/x11-apps/xsetmode-1.0.0 b/metadata/cache/x11-apps/xsetmode-1.0.0
deleted file mode 100644
index 3cfea0703e99..000000000000
--- a/metadata/cache/x11-apps/xsetmode-1.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXi x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-x11-libs/libXi x11-libs/libX11 !<=x11-base/xorg-x11-6.9
-0
-http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2
-
-http://xorg.freedesktop.org/
-MIT
-set the mode for an X Input device
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user x-modular
-debug
-
-
-
-
-
-compile install postinst postrm preinst unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-apps/xsetpointer-1.0.1 b/metadata/cache/x11-apps/xsetpointer-1.0.1
deleted file mode 100644
index fc30857b439c..000000000000
--- a/metadata/cache/x11-apps/xsetpointer-1.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXi x11-libs/libX11 >=x11-proto/inputproto-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-x11-libs/libXi x11-libs/libX11 !<=x11-base/xorg-x11-6.9
-0
-http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.1.tar.bz2
-
-http://xorg.freedesktop.org/
-MIT
-set an X Input device as the main pointer
-alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user x-modular
-debug
-
-
-
-
-
-compile install postinst postrm preinst unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-base/xorg-x11-7.4-r1 b/metadata/cache/x11-base/xorg-x11-7.4-r1
deleted file mode 100644
index dee05ac49352..000000000000
--- a/metadata/cache/x11-base/xorg-x11-7.4-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetmode x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetmode x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-0
-
-
-http://xorg.freedesktop.org
-as-is
-An X11 implementation maintained by the X.Org Foundation (meta package)
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-postinst preinst
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/goocanvas-2.0.1 b/metadata/cache/x11-libs/goocanvas-2.0.1
index 61bc8c8fe228..940d246eb273 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-libs/libGLw-8.0.0 b/metadata/cache/x11-libs/libGLw-8.0.0
new file mode 100644
index 000000000000..08d3a9e4b93b
--- /dev/null
+++ b/metadata/cache/x11-libs/libGLw-8.0.0
@@ -0,0 +1,22 @@
+!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl virtual/pkgconfig
+!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl
+0
+ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
+
+http://mesa3d.sourceforge.net/
+MIT
+Mesa GLw library
+~amd64 ~x86 ~amd64-linux ~x86-linux
+autotools autotools-utils eutils libtool multilib toolchain-funcs user
++motif static-libs
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/x11-terms/gnome-terminal-3.4.1.1 b/metadata/cache/x11-terms/gnome-terminal-3.4.1.1
index 3b0ab3520ebc..51f831ea34e1 100644
--- a/metadata/cache/x11-terms/gnome-terminal-3.4.1.1
+++ b/metadata/cache/x11-terms/gnome-terminal-3.4.1.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-terminal/3.4/gnome-terminal-3.4.1.1.tar.xz
 http://www.gnome.org/
 GPL-3
 The Gnome Terminal
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 70528620fac6..63c92b2b4364 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 28 May 2012 09:37:38 +0000
+Mon, 28 May 2012 15:37:29 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 70528620fac6..63c92b2b4364 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 28 May 2012 09:37:38 +0000
+Mon, 28 May 2012 15:37:29 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index c9a86ce4f188..b4a21f4f9cfb 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.929 2012/05/24 19:50:44 xmw Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.931 2012/05/28 11:41:17 dilfridge Exp $
 
 -->
 <herds>
@@ -451,10 +451,6 @@
     <email>scarabeus@gentoo.org</email>
     <name>Tomas Chvatal</name>
   </maintainer>
-  <maintainer>
-    <email>tampakrap@gentoo.org</email>
-    <name>Theo Chatzimichos</name>
-  </maintainer>
   <maintainer>
     <email>thev00d00@gentoo.org</email>
     <name>Ian Whyman</name>
@@ -464,10 +460,6 @@
   <name>qt</name>
   <email>qt@gentoo.org</email>
   <description>Qt and related packages</description>
-  <maintainer>
-    <email>tampakrap@gentoo.org</email>
-    <name>Theo Chatzimichos</name>
-  </maintainer>
   <maintainer>
     <email>wired@gentoo.org</email>
     <name>Alex Alexander</name>
diff --git a/metadata/md5-cache/app-misc/editor-wrapper-4 b/metadata/md5-cache/app-misc/editor-wrapper-4
index ed105a9a3bd9..db29fb540069 100644
--- a/metadata/md5-cache/app-misc/editor-wrapper-4
+++ b/metadata/md5-cache/app-misc/editor-wrapper-4
@@ -2,7 +2,7 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Wrapper scripts that will execute EDITOR or PAGER
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
-_md5_=e4d6ca24f2bee4d7fbc55e9399ec1554
+_md5_=47e27a4f341e336efc7db366e1f5f477
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5
index 7baa3e17c4c9..15dd7cca7746 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.5
@@ -3,10 +3,10 @@ DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
 DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep dev-lang/python[xml] dev-lang/python
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-0.3.0.5.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a2450aed67486511009ef37400697307
+_md5_=9f303100c3119f7b7acd5e7354253588
diff --git a/metadata/md5-cache/app-text/libwps-0.2.6 b/metadata/md5-cache/app-text/libwps-0.2.6
index 8984277aab81..ac5c5b6c09d9 100644
--- a/metadata/md5-cache/app-text/libwps-0.2.6
+++ b/metadata/md5-cache/app-text/libwps-0.2.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=app-text/libwpd:0.9 dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Microsoft Works file word processor format import filter library
 EAPI=4
@@ -9,4 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-text/libwpd:0.9 dev-libs/boost
 SLOT=0
 SRC_URI=mirror://sourceforge/libwps/libwps-0.2.6.tar.xz
-_md5_=be4aae156fe20ab7a5b5b0151066eedc
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=d9eba9e95bd82b22e56d0196cff26146
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20120109 b/metadata/md5-cache/app-vim/gentoo-syntax-20120109
index 29d544afd0b6..cd5d8cb4e153 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20120109
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20120109
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 IUSE=ignore-glep31
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-syntax-20120109.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	af7939f5d748a2ceeff320440e8905b1
-_md5_=2cb1f32223ae2da0fec2c195a8a7cdd1
+_md5_=f092256c6792272e8d334b629ed5cf1a
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 335995f117c2..c58351c8c482 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	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a4f0f85b5740320f838a49761af1589d
+_md5_=00d15f9dc7657c279a43beac7ad8ac52
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 77fc050c3388..017c5f222737 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~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	39af24987a4a7a34dccf2ef9cc6af3f7	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cb9bfb78365c629b3177100919dc8071
+_md5_=b22cb56ca7a08690711d1cac986bfe54
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.2 b/metadata/md5-cache/dev-java/jffi-1.2.2
new file mode 100644
index 000000000000..31f2e3d4e9b2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jffi-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=virtual/libffi >=virtual/jdk-1.5 virtual/pkgconfig test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=An optimized Java interface to libffi
+EAPI=4
+HOMEPAGE=http://github.com/jnr/jffi
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Apache-2.0 LGPL-3 )
+RDEPEND=virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=1.2
+SRC_URI=https://github.com/jnr/jffi/tarball/1.2.2 -> jffi-1.2.2.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=a5d31f30c142a661cab96983375fafb6
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.3 b/metadata/md5-cache/dev-java/jnr-constants-0.8.3
new file mode 100644
index 000000000000..d19a286a1c88
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=A set of platform constants (e.g. errno values)
+EAPI=4
+HOMEPAGE=https://github.com/jnr/jnr-constants
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 LGPL-3 )
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.3 -> jnr-constants-0.8.3.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=221555931d8d2b5819335fe7b1627e37
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0 b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
index b88b424342ae..7fcacf730893 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=An abstracted interface to invoking native functions from java
 EAPI=4
 HOMEPAGE=http://github.com/jnr
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0.6
 SRC_URI=http://github.com/jnr/jnr-ffi/tarball/0.6.0 -> jnr-ffi-0.6.0.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cfe92044a2a932dbd11963eb5c9ad173
+_md5_=30489cf0529e816eebd329fedb4b4ad3
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.4 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.4
new file mode 100644
index 000000000000..eef82c32ea17
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=An abstracted interface to invoking native functions from java
+EAPI=4
+HOMEPAGE=https://github.com/jnr/jnr-ffi
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 LGPL-3 )
+RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0.7
+SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.4 -> jnr-ffi-0.7.4.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ccf4ca8533efe6a623c2b01416c083fd
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.1 b/metadata/md5-cache/dev-java/jnr-posix-2.1
new file mode 100644
index 000000000000..e95c32df4ce1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
+EAPI=4
+HOMEPAGE=https://github.com/jnr/jnr-posix
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
+RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=2.1
+SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.1 -> jnr-posix-2.1.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	vcs-snapshot	da01f8084931ab770fd9ddf7e537a262	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=205d95c23eef38c86ca55b7daf6741d3
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
index 407e10036025..c1b4763050fa 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans API Support Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/apisupport
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0522ad4a415dfa5a4ce5b35ffec50632
+_md5_=0be0f26caa920db3961d9a538981e803
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2 b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
index 306de1e6d28f..76c17763388e 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans CND Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/cnd
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=de927784e564cec62619017286055a0c
+_md5_=df3b779bb016fa660ec3406d7dca3f98
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2 b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
index 72aecf78fb99..abf06a1565c0 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans D-Light Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=68b89f2b059ec21fe24d65b88a2245c1
+_md5_=a1b7a7fb5bddd538e8f3baf602363916
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
index e5891de8ff9c..f309a27bf35f 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Enterprise cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-profiler-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/commons-fileupload:0 dev-java/glassfish-deployment-api:1.2 dev-java/jakarta-jstl:0 dev-java/antlr:0[java] dev-java/asm:3 dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 dev-java/jettison:0 dev-java/jsr311-api:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=85445ebb197c2d3641023fa8fc8581c6
+_md5_=bc16306c321b3e35cbdaa0028dcac93e
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
index ac4d15e1bec6..e800a2f01092 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Ergonomics Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7340d6287ef1aa72628e8a7d2d48ae42
+_md5_=f52ba789537859506d707b30d6b60c28
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2 b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
index 6c3729c6ca18..d5cd2c21b28a 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Groovy Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/groovy
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f3aab575a98aac2bcb0b0a069ec340cd
+_md5_=c20d570109cf88adf8e37eef858e1949
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.1.2 b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
index 3ac86298e8ac..a42b0c64bb00 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Harness
 EAPI=4
 HOMEPAGE=http://netbeans.org/features/platform/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=340ca0a8470a4b3d3ceade2ad64f8b56
+_md5_=559bdea97fffee7adf4f41af15ad75cf
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.1.2 b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
index 47f4694964ff..374065af2ab5 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans IDE Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/ide
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.0 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 dev-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=865a822f7e2dc139456c9b1bd4edc670
+_md5_=1a4b8476e0cb2b9b42d86b098e6b1b02
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1 b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
index 63f62dbbef8b..62601cf7a8c6 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Java Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/java
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7da0b61da467418a34c9fd4dc1c501cb
+_md5_=258371b9d9e9545988351a5090136828
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
index 47a3626aae39..0b2218148d0a 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans JavaCard Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/javacard
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=92a4e064cdc75abd692d4f15098b779f
+_md5_=607d0679f7c69810478bae134bee0628
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
index 920d8f127ac0..6004507dec2c 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans JavaDocs
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1c81d4a4d90280f51ba258676f83fb14
+_md5_=b5b41a043308f6cfbf9203f977f376bc
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2 b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
index ffbca0f8a7d6..ee1be6132c9a 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans JavaFX Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/javafx
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f8ab827cb36fa2725d797c90ebdedec1
+_md5_=ff3619e56de488c67ea8f23fb012c83f
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2 b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
index 1df9626f45d3..4ccaf9a2b009 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Mobility Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/features/platform/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.1.2 ~dev-java/netbeans-enterprise-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fb1bf34c0a26c760fa8bc2ac25ec4bba
+_md5_=b0df94e62aadf2f6c694f0635b052d4d
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.1.2 b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
index 514bb9a3eb63..d77a32637c70 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans IDE Branding
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=keychain elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d71e0743c187acc7ef8ad3c8a35557cb
+_md5_=45aeaa1a6a025923376b697434034e6a
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.1.2 b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
index 87fde8dc69c9..eb35eae17c7f 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans PHP Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/php
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eaa40c723b0a7fe1cec0eb1b409b2d9b
+_md5_=d3c9f76850a161397bdafcd34ebe339d
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.1.2 b/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
index af374ac79099..31ed31a7cc6c 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Platform
 EAPI=4
 HOMEPAGE=http://netbeans.org/features/platform/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.2.7:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=df22f123692ed673fa4524e57cad328e
+_md5_=d441a89be94056976c5e112c3f7dabdd
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2 b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
index 4cb68ee7f28c..0ac10df5fef1 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Profiler Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/projects/profiler
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-java-7.1.2 ~dev-java/netbeans-platform-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bebfd884ae8d914b04967d4cc10a4df6
+_md5_=3d28ebca4ab3a5728df8cf8ce463e9d5
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
index 15a7bde207a1..99b5acec0c76 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans Web Services Common Cluster
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-ide-7.1.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=096a9bac61ff92b6b0773b30034158a3
+_md5_=07b2c1afbbd7004a93fbd23d4d120d48
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index 98e00322dd93..67dbae62a0a1 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=The next generation of high performance, fully compliant XML parsers
 EAPI=4
 HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=db4aee873661a4ca1fe06ac49a9904f7
+_md5_=77e7ffc94e964a2b99c5256a17cc3c7e
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index 5d6608e32d91..a2b71723b7d8 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -4,10 +4,10 @@ DESCRIPTION=An Apache-hosted set of externally-defined standards interfaces, nam
 EAPI=4
 HOMEPAGE=http://xml.apache.org/commons/
 IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0ac7796d5f4dcd685696575188441a00
+_md5_=aecfd06673c2434d9ef422441b03358d
diff --git a/metadata/md5-cache/dev-libs/nspr-4.9 b/metadata/md5-cache/dev-libs/nspr-4.9
index 6752c2847bd9..7c23dccf1bca 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.9
+++ b/metadata/md5-cache/dev-libs/nspr-4.9
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
 IUSE=debug
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fe82b0c55a7e6725d56bc76ba34d3f78
+_md5_=17993f52471b5a2698ace59861cf1fd2
diff --git a/metadata/md5-cache/dev-libs/nss-3.13.4 b/metadata/md5-cache/dev-libs/nss-3.13.4
index 4594fbaeca6b..6d02efbcb7ef 100644
--- a/metadata/md5-cache/dev-libs/nss-3.13.4
+++ b/metadata/md5-cache/dev-libs/nss-3.13.4
@@ -4,10 +4,10 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=utils
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_4_RTM/src/nss-3.13.4.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f28039069d1d201c1208c482b44ee62b
+_md5_=12ddb873fcdf9e97c4e77168aa85c7bf
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.28.03-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.28.03-r1
index 27ed11c0972c..218967667fb8 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.28.03-r1
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.28.03-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=4
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 static-libs threads tools
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=tools? ( dev-perl/frontier-rpc sys-libs/readline ) curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( static-libs abyss curl cxx )
 SLOT=0
 SRC_URI=mirror://gentoo/xmlrpc-c-1.28.03.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=344ad47bbb4dce268006544ffe66c4a5
+_md5_=2bf086f8b854901c538aa09a98890caa
diff --git a/metadata/md5-cache/dev-ml/oasis-0.3.0_rc6 b/metadata/md5-cache/dev-ml/oasis-0.3.0_rc6
new file mode 100644
index 000000000000..da47f1fe6754
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/oasis-0.3.0_rc6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/ocaml-data-notation-0.0.3 dev-ml/ocamlify dev-ml/ocamlmod test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-1.1.0 >=dev-ml/ocaml-expect-0.0.2 dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12[ocamlopt?]
+DESCRIPTION=OASIS is a tool to integrate a configure, build and install system in OCaml project
+EAPI=3
+HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-linking-exception
+RDEPEND=>=dev-ml/ocaml-data-notation-0.0.3 >=dev-lang/ocaml-3.12[ocamlopt?]
+SLOT=0
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/880/oasis-0.3.0~rc6.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	oasis	b06dffa6b9fecb81ede1ade7fead8438	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=24547aa1525c31e03d8a1a28d4441dfc
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.500.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.500.0
index 5c140766bc2c..32d7bbfbea10 100644
--- a/metadata/md5-cache/dev-perl/BerkeleyDB-0.500.0
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.500.0
@@ -4,10 +4,10 @@ DESCRIPTION=This module provides Berkeley DB interface for Perl.
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/BerkeleyDB/
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=sys-libs/db-2.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.50.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=67072f53cad09e6239a6b38d36840757
+_md5_=cc4c93ebfa60fb2f75b72ac3d6e0aff2
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.90.0 b/metadata/md5-cache/dev-perl/Cairo-1.90.0
index 14960d573c53..e625696239c6 100644
--- a/metadata/md5-cache/dev-perl/Cairo-1.90.0
+++ b/metadata/md5-cache/dev-perl/Cairo-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface to the cairo library
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Cairo/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.090.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=58bb4940457fb89763e400d73f21f994
+_md5_=ac36af6fbeb7857db13c62677e382030
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 fb25e6750bce..61a0f36b7e79 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	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=065e0fb4ca8c9c341e6dba2a7ea1b19b
+_md5_=f92bfe3052101ad95bbe8c6e64059c89
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.510.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.510.0
new file mode 100644
index 000000000000..9cf26df067d0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.510.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 >=virtual/perl-ExtUtils-MakeMaker-6.31 dev-lang/perl[-build]
+DESCRIPTION=Parse and Format DateTimes using Strptime
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Strptime/
+KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/DateTime-0.44 >=dev-perl/DateTime-Locale-0.45 >=dev-perl/DateTime-TimeZone-0.79 >=dev-perl/Params-Validate-0.91 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.51.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=a11d3fac2caca7c95fd3c9c00698e6ca
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.510.0 b/metadata/md5-cache/dev-perl/File-Remove-1.510.0
index c8d11a56a59e..0e2c7fcafeb7 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.510.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.510.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
 DESCRIPTION=Remove files and directories
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/File-Remove/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-File-Spec-0.84 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/File-Remove-1.51.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1fd500c32c15c8492136541d9e647e63
+_md5_=f0d2582b37dc64f1877decc71af1cc31
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 f06a0cbd88b0..38a78bd7de30 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	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dc705b8d3c6f8195ccd964dec03385d6
+_md5_=9c18e1fa4ad33eda321e7ec1f2e50a26
diff --git a/metadata/md5-cache/dev-perl/Math-Random-MT-1.140.0 b/metadata/md5-cache/dev-perl/Math-Random-MT-1.140.0
new file mode 100644
index 000000000000..61b9313a2218
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Math-Random-MT-1.140.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl[-build]
+DESCRIPTION=The Mersenne Twister PRNG
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Math-Random-MT/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.14.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=bf585b57bb4eb1122ae664ac36662ac0
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.50.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.50.0
index 7ac096212f35..b9bdfd1387b3 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.50.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.50.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=(Re)name a sub
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Sub-Name/
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3561174ca9e7ecd16a0b92f27b31e067
+_md5_=de46713c9b6c988db1f801f576b395b4
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0
index 4c1daba56a60..5c0c266ffac0 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.410.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.410.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl[-build]
 DESCRIPTION=A Perl extension interface to James Clark's XML parser, expat
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/XML-Parser/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7f12579964cb6ed189043b6810ab1075
+_md5_=6f9526487d0041966bd90011e69391f5
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r1 b/metadata/md5-cache/dev-python/imaging-1.1.7-r1
index d64eb2769876..6477c6fed5d5 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r1
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python Imaging Library (PIL)
 EAPI=3
 HOMEPAGE=http://www.pythonware.com/products/pil/index.htm
 IUSE=doc examples lcms scanner tk X
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=as-is
 RDEPEND=virtual/jpeg media-libs/freetype:2 lcms? ( media-libs/lcms:0 ) scanner? ( media-gfx/sane-backends ) X? ( x11-misc/xdg-utils ) =dev-lang/python-2* tk? ( =dev-lang/python-2*[tk] )
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d5f4b5a6eb7b127feffdbf9f0df95d71
+_md5_=45393b27fa29ff94b0d98d4979c80291
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.2 b/metadata/md5-cache/dev-python/sphinx-1.1.2
index d34c36877a28..a94fdd02cd63 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.2
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Python documentation generator
 EAPI=3
 HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 IUSE=doc latex test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=d5d92925d2339ff192b0d96be2d763c2
+_md5_=c84290fc67f5521b33d3c158ecdae70e
diff --git a/metadata/md5-cache/dev-python/starcluster-0.93.3 b/metadata/md5-cache/dev-python/starcluster-0.93.3
new file mode 100644
index 000000000000..950616c84e42
--- /dev/null
+++ b/metadata/md5-cache/dev-python/starcluster-0.93.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta >=dev-python/workerpool-0.9.2 doc? ( dev-python/sphinx dev-python/epydoc dev-python/matplotlib ) dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
+DESCRIPTION=Utility for creating / managing general purpose computing clusters
+EAPI=4
+HOMEPAGE=http://web.mit.edu/star/cluster
+IUSE=doc bash-completion epydoc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/ssh-1.7.13 >=dev-python/boto-2.3.0 >=dev-python/jinja-2.6 >=dev-python/decorator-3.1.1 >=dev-python/pyasn1-0.0.13_beta >=dev-python/workerpool-0.9.2 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/s/StarCluster/StarCluster-0.93.3.tar.gz
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=86d3865b6e39dca6b70a99cfa829cf6c
diff --git a/metadata/md5-cache/dev-python/workerpool-0.9.2 b/metadata/md5-cache/dev-python/workerpool-0.9.2
new file mode 100644
index 000000000000..2fcd004cadde
--- /dev/null
+++ b/metadata/md5-cache/dev-python/workerpool-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools dev-lang/python test? ( dev-python/nose )
+DESCRIPTION=Module for distributing jobs to a pool of worker threads.
+EAPI=4
+HOMEPAGE=http://github.com/shazow/workerpool
+IUSE=test examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/w//workerpool-0.9.2.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=8e3a260f1964f7d70642b927e85270cc
diff --git a/metadata/md5-cache/dev-python/xlutils-1.5.2 b/metadata/md5-cache/dev-python/xlutils-1.5.2
index ad4449a20999..9e20699aee4c 100644
--- a/metadata/md5-cache/dev-python/xlutils-1.5.2
+++ b/metadata/md5-cache/dev-python/xlutils-1.5.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.3 test? ( dev-python/errorhandler dev-python/mock >=dev-python/testfixtures-1.6.1 ) =dev-lang/python-2* test? ( dev-python/pytest )
+DEPEND=>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.7 test? ( dev-python/errorhandler dev-python/mock >=dev-python/testfixtures-1.6.1 ) =dev-lang/python-2* test? ( dev-python/pytest )
 DESCRIPTION=provides a collection of utilities for working with Excel files
 EAPI=4
 HOMEPAGE=http://pypi.python.org/pypi/xlutils
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.3 =dev-lang/python-2*
+RDEPEND=>=dev-python/xlwt-0.7.3 >=dev-python/xlrd-0.7.7 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-1.5.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=7100eed9f4d18f7a11d746bc28da11d0
+_md5_=9bfd113ddc1ea6b16634099030f9ebfa
diff --git a/metadata/md5-cache/dev-ruby/facets-1.4.5 b/metadata/md5-cache/dev-ruby/facets-1.4.5
deleted file mode 100644
index dd86fa2d5afd..000000000000
--- a/metadata/md5-cache/dev-ruby/facets-1.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/ruby-1.8.5 =dev-lang/ruby-1.8* =dev-lang/ruby-1.8* >=dev-ruby/rubygems-1.3.1 <=dev-ruby/rubygems-1.3.7-r1 !<dev-ruby/rdoc-2
-DESCRIPTION=Facets is an extension library adding extra functionality to Ruby
-HOMEPAGE=http://facets.rubyforge.org/
-IUSE=doc
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Ruby
-RDEPEND=>=dev-lang/ruby-1.8.5 =dev-lang/ruby-1.8* =dev-lang/ruby-1.8* >=dev-ruby/rubygems-1.3.1 <=dev-ruby/rubygems-1.3.7-r1 !<dev-ruby/rdoc-2
-SLOT=0
-SRC_URI=mirror://rubygems/facets-1.4.5.gem
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	gems	60dda728720e42721988e23b89c79250	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2e034212b6d60690c3bd90964bcaba36
diff --git a/metadata/md5-cache/dev-ruby/facets-2.8.4-r1 b/metadata/md5-cache/dev-ruby/facets-2.8.4-r1
deleted file mode 100644
index 5095c642e9f6..000000000000
--- a/metadata/md5-cache/dev-ruby/facets-2.8.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-DESCRIPTION=Facets is an extension library adding extra functionality to Ruby
-EAPI=2
-HOMEPAGE=http://facets.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 doc test test
-KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-SLOT=0
-SRC_URI=mirror://rubygems/facets-2.8.4.gem
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=185b1c73202b989e57859a6fa9c9c15f
diff --git a/metadata/md5-cache/dev-tex/dvi2tty-5.3.4 b/metadata/md5-cache/dev-tex/dvi2tty-5.3.4
index cd076ee02b7d..daec36187c2f 100644
--- a/metadata/md5-cache/dev-tex/dvi2tty-5.3.4
+++ b/metadata/md5-cache/dev-tex/dvi2tty-5.3.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Preview dvi-files on text-only devices
 EAPI=4
 HOMEPAGE=http://www.ctan.org/tex-archive/dviware/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.mesa.nl/pub/dvi2tty/dvi2tty-5.3.4.tgz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e8c5290fddd9ddc21b175c6169a50810
+_md5_=965156aeb301f7fed0f18b1ffd9322b4
diff --git a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1 b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
index 47b5b502121d..981fc39d9467 100644
--- a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
+++ b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl virtual/perl-Getopt-Long app-arch/xz-utils
 DESCRIPTION=Helps prevent .la files from relinking to libraries outside a build tree
 EAPI=4
 HOMEPAGE=http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-command-0.1.1.tar.xz
-_md5_=79a8f34bd9e8e9a6633802be995930b1
+_md5_=20c8f5fc97d14bf198e49de19b1c6011
diff --git a/metadata/md5-cache/dev-util/intltool-0.50.2 b/metadata/md5-cache/dev-util/intltool-0.50.2
index 6bbf475a3d11..ced7585e0dc6 100644
--- a/metadata/md5-cache/dev-util/intltool-0.50.2
+++ b/metadata/md5-cache/dev-util/intltool-0.50.2
@@ -3,9 +3,9 @@ DEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser
 DESCRIPTION=Internationalization Tool Collection
 EAPI=4
 HOMEPAGE=http://edge.launchpad.net/intltool/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.1 dev-perl/XML-Parser sys-devel/gettext
 SLOT=0
 SRC_URI=http://edge.launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz
-_md5_=5971c4d704fa90c96bb8e8573fa425b0
+_md5_=8189f7b167368e481f0aefc17c71e975
diff --git a/metadata/md5-cache/dev-util/netbeans-7.1.2 b/metadata/md5-cache/dev-util/netbeans-7.1.2
index a4e5d74092da..46605e8bb760 100644
--- a/metadata/md5-cache/dev-util/netbeans-7.1.2
+++ b/metadata/md5-cache/dev-util/netbeans-7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Netbeans IDE
 EAPI=4
 HOMEPAGE=http://netbeans.org/
 IUSE=doc +netbeans_modules_apisupport netbeans_modules_cnd netbeans_modules_dlight netbeans_modules_enterprise netbeans_modules_ergonomics netbeans_modules_groovy +netbeans_modules_java netbeans_modules_javacard +netbeans_modules_javafx netbeans_modules_mobility netbeans_modules_php +netbeans_modules_profiler +netbeans_modules_websvccommon linguas_af linguas_ar linguas_bg linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_gl linguas_hi_IN linguas_id linguas_it linguas_ja linguas_ko linguas_lt linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_si linguas_sq linguas_sr linguas_sv linguas_ta_IN linguas_tl linguas_tr linguas_vi linguas_zh_CN linguas_zh_TW elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-nb-7.1.2 ~dev-java/netbeans-platform-7.1.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.1.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.1.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.1.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.1.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.1.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.1.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.1.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.1.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.1.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.1.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.1.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.1.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.1.2 ) doc? ( ~dev-java/netbeans-javadoc-7.1.2 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.1
 SRC_URI=linguas_af? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ar? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_bg? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ca? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_cs? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_de? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_el? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_es? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_fr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_gl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_hi_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_id? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_it? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ja? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ko? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_lt? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_nl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_BR? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_pt_PT? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ro? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ru? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_si? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sq? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_sv? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_ta_IN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tl? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_tr? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_vi? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_CN? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 ) linguas_zh_TW? ( http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.1.1-20120214091350.tar.bz2 )
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eaff49d2f8f049b10b9a792a7048b2d1
+_md5_=b33f26e2b884328021816995661b6cb1
diff --git a/metadata/md5-cache/games-engines/stratagus-2.2.6 b/metadata/md5-cache/games-engines/stratagus-2.2.6-r1
similarity index 56%
rename from metadata/md5-cache/games-engines/stratagus-2.2.6
rename to metadata/md5-cache/games-engines/stratagus-2.2.6-r1
index 3dec4348d0ce..33092f377c8a 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.2.6
+++ b/metadata/md5-cache/games-engines/stratagus-2.2.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libvorbis theora? ( media-libs/libtheora ) ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A realtime strategy game engine
 EAPI=2
 HOMEPAGE=http://stratagus.sourceforge.net/
 IUSE=bzip2 debug doc mikmod mng theora vorbis
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis )
+RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libvorbis theora? ( media-libs/libtheora ) )
 SLOT=0
 SRC_URI=http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d9626805e44e5369daaa1cd2e4040bfd
+_md5_=9590a4ffd9d3f625557324664ae75e6b
diff --git a/metadata/md5-cache/games-roguelike/tome-2.3.5 b/metadata/md5-cache/games-roguelike/tome-2.3.5
index efc1c5cdb699..e3918a8026e6 100644
--- a/metadata/md5-cache/games-roguelike/tome-2.3.5
+++ b/metadata/md5-cache/games-roguelike/tome-2.3.5
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5 X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) s
 SLOT=0
 SRC_URI=http://t-o-m-e.net/dl/src/tome-235-src.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f65a7f525b406eb28ffe01165c9a9b80
+_md5_=2b1abccb2cf0696a50c38705b06ab9e2
diff --git a/metadata/md5-cache/games-strategy/wargus-2.2.6 b/metadata/md5-cache/games-strategy/wargus-2.2.6-r1
similarity index 84%
rename from metadata/md5-cache/games-strategy/wargus-2.2.6
rename to metadata/md5-cache/games-strategy/wargus-2.2.6-r1
index 10c9cb10169c..6b3d1919e874 100644
--- a/metadata/md5-cache/games-strategy/wargus-2.2.6
+++ b/metadata/md5-cache/games-strategy/wargus-2.2.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/cdparanoia media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 DESCRIPTION=Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)
 EAPI=2
 HOMEPAGE=http://wargus.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/l
 SLOT=0
 SRC_URI=http://launchpad.net/wargus/trunk/2.2.6/+download/wargus_2.2.6.orig.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cdrom	415b847346ef9001a89e5c7da6711215	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	games	f75cdbfdf1760e514ca65e2f6c6a7c72	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5e9dac37b36f2150e962f5c78c0a779c
+_md5_=2897e932bfb789841a73646f95aeae8d
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.4.2 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.4.2
index 167141f067e7..c8ea7cf84347 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.4.2
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.4/gsettings-desktop-schemas-3.4.2.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9cbe29c410cfc5b1f46b3632cd06eeb2
+_md5_=04548f45e246e916918cc8654d6b97d5
diff --git a/metadata/md5-cache/mail-client/thunderbird-12.0.1-r1 b/metadata/md5-cache/mail-client/thunderbird-12.0.1-r1
index 1db8ec67480c..ff4eec29964c 100644
--- a/metadata/md5-cache/mail-client/thunderbird-12.0.1-r1
+++ b/metadata/md5-cache/mail-client/thunderbird-12.0.1-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
-SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ar.xpi -> thunderbird-12.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ast.xpi -> thunderbird-12.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/be.xpi -> thunderbird-12.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bg.xpi -> thunderbird-12.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-12.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/br.xpi -> thunderbird-12.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ca.xpi -> thunderbird-12.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/cs.xpi -> thunderbird-12.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/da.xpi -> thunderbird-12.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/de.xpi -> thunderbird-12.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/el.xpi -> thunderbird-12.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-12.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-12.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-12.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/et.xpi -> thunderbird-12.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/eu.xpi -> thunderbird-12.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fi.xpi -> thunderbird-12.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fr.xpi -> thunderbird-12.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-12.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-12.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gd.xpi -> thunderbird-12.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gl.xpi -> thunderbird-12.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/he.xpi -> thunderbird-12.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/hu.xpi -> thunderbird-12.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/id.xpi -> thunderbird-12.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/is.xpi -> thunderbird-12.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/it.xpi -> thunderbird-12.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ja.xpi -> thunderbird-12.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ko.xpi -> thunderbird-12.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/lt.xpi -> thunderbird-12.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-12.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nl.xpi -> thunderbird-12.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-12.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-12.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pl.xpi -> thunderbird-12.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-12.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-12.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/rm.xpi -> thunderbird-12.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ro.xpi -> thunderbird-12.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ru.xpi -> thunderbird-12.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/si.xpi -> thunderbird-12.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sk.xpi -> thunderbird-12.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sl.xpi -> thunderbird-12.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sq.xpi -> thunderbird-12.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sr.xpi -> thunderbird-12.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-12.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-12.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/tr.xpi -> thunderbird-12.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/uk.xpi -> thunderbird-12.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/vi.xpi -> thunderbird-12.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-12.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-12.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/12.0.1/source/thunderbird-12.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.3.tar.xz
+SRC_URI=linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ar.xpi -> thunderbird-12.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ast.xpi -> thunderbird-12.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/be.xpi -> thunderbird-12.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bg.xpi -> thunderbird-12.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-12.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/br.xpi -> thunderbird-12.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ca.xpi -> thunderbird-12.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/cs.xpi -> thunderbird-12.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/da.xpi -> thunderbird-12.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/de.xpi -> thunderbird-12.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/el.xpi -> thunderbird-12.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-12.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-12.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-12.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/et.xpi -> thunderbird-12.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/eu.xpi -> thunderbird-12.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fi.xpi -> thunderbird-12.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fr.xpi -> thunderbird-12.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-12.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-12.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gd.xpi -> thunderbird-12.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/gl.xpi -> thunderbird-12.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/he.xpi -> thunderbird-12.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/hu.xpi -> thunderbird-12.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/id.xpi -> thunderbird-12.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/is.xpi -> thunderbird-12.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/it.xpi -> thunderbird-12.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ja.xpi -> thunderbird-12.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ko.xpi -> thunderbird-12.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/lt.xpi -> thunderbird-12.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-12.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nl.xpi -> thunderbird-12.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-12.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-12.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pl.xpi -> thunderbird-12.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-12.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-12.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/rm.xpi -> thunderbird-12.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ro.xpi -> thunderbird-12.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ru.xpi -> thunderbird-12.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/si.xpi -> thunderbird-12.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sk.xpi -> thunderbird-12.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sl.xpi -> thunderbird-12.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sq.xpi -> thunderbird-12.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sr.xpi -> thunderbird-12.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-12.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-12.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/tr.xpi -> thunderbird-12.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/uk.xpi -> thunderbird-12.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/vi.xpi -> thunderbird-12.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-12.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//12.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-12.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/12.0.1/source/thunderbird-12.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.1.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-12.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.4.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	makeedit	5be302268d425e0429d2f1ee3ba3f5a3	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	c42fe69d78ae059f56a2d43658fc0480	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e6a9e443093f87637f54cf05a367be8b
+_md5_=c44eee7f3920612099fe04b5c68bdab8
diff --git a/metadata/md5-cache/media-gfx/gimp-2.6.12 b/metadata/md5-cache/media-gfx/gimp-2.6.12
index 4744d60a8852..1410054d5206 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.6.12
+++ b/metadata/md5-cache/media-gfx/gimp-2.6.12
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=3
 HOMEPAGE=http://www.gimp.org/
 IUSE=alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf debug
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18.1:2 dev-libs/libxml2 dev-libs/libxslt >=media-libs/fontconfig-2.2.0 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.0.22 <media-libs/gegl-0.2 >=x11-libs/gtk+-2.12.5:2 x11-libs/libXpm >=x11-libs/pango-1.18.0 sys-libs/zlib x11-themes/hicolor-icon-theme aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) exif? ( >=media-libs/libexif-0.6.15 ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) lcms? ( =media-libs/lcms-1* ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.3-r3[cairo] ) png? ( >=media-libs/libpng-1.2.2:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) svg? ( >=gnome-base/librsvg-2.8.0:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) webkit? ( net-libs/webkit-gtk:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/gimp-2.6.11-underlinking.patch.xz mirror://gimp/v2.6/gimp-2.6.12.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b294e794ad222be42aae98a8a1cd5367
+_md5_=6227bd0d9ee16103c1e2c7ec6cef0cdc
diff --git a/metadata/md5-cache/media-libs/gmtk-1.0.6 b/metadata/md5-cache/media-libs/gmtk-1.0.6
index 77078a71230b..d657c6721174 100644
--- a/metadata/md5-cache/media-libs/gmtk-1.0.6
+++ b/metadata/md5-cache/media-libs/gmtk-1.0.6
@@ -4,9 +4,9 @@ DESCRIPTION=GTK+ widget and function libraries for gnome-mplayer
 EAPI=4
 HOMEPAGE=http://code.google.com/p/gmtk/
 IUSE=alsa +dconf pulseaudio
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26 x11-libs/gtk+:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dconf? ( gnome-base/dconf )
 SLOT=0
 SRC_URI=http://gmtk.googlecode.com/files/gmtk-1.0.6.tar.gz
-_md5_=65b8a81e42250d332cf87d71454fae86
+_md5_=2fea5050dcc19b216ca09b8ad10c3d93
diff --git a/metadata/md5-cache/media-libs/mesa-8.0.3 b/metadata/md5-cache/media-libs/mesa-8.0.3
new file mode 100644
index 000000000000..db0204297524
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-8.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] virtual/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=4
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT LGPL-3 SGI-B-2.0
+RDEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.34 ) video_cards_i915? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] )
+REQUIRED_USE=d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/mesa-8.0.3-gentoo-patches-02.tar.bz2
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=4bdcfadc0131129597dc593be9370807
diff --git a/metadata/md5-cache/media-sound/beets-1.0_beta14 b/metadata/md5-cache/media-sound/beets-1.0_beta14
new file mode 100644
index 000000000000..b33341df272b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/beets-1.0_beta14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-python/munkres dev-python/python-musicbrainz-ngs dev-python/unidecode media-libs/mutagen dev-lang/python
+DESCRIPTION=A media library management system for obsessive-compulsive music geeks.
+EAPI=4
+HOMEPAGE=http://beets.radbox.org/
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/munkres dev-python/python-musicbrainz-ngs dev-python/unidecode media-libs/mutagen dev-lang/python
+SLOT=0
+SRC_URI=http://beets.googlecode.com/files/beets-1.0b14.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=cbdc0a4b0dfa75af0c312656d838c65f
diff --git a/metadata/md5-cache/media-sound/mpc-0.22 b/metadata/md5-cache/media-sound/mpc-0.22
index a20ad8416bc9..8a3e7821b636 100644
--- a/metadata/md5-cache/media-sound/mpc-0.22
+++ b/metadata/md5-cache/media-sound/mpc-0.22
@@ -4,10 +4,10 @@ DESCRIPTION=A commandline client for Music Player Daemon (media-sound/mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
 IUSE=iconv
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpdclient-2.2 iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpc-0.22.tar.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2
-_md5_=01d6fdcad5efc318e5442eaeb3a5d7dd
+_md5_=c97a78a67c7f6920200b4e59e6473828
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.20 b/metadata/md5-cache/media-sound/ncmpc-0.20
index 5492d82dfa59..c720f294b400 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.20
+++ b/metadata/md5-cache/media-sound/ncmpc-0.20
@@ -4,10 +4,10 @@ DESCRIPTION=A ncurses client for the Music Player Daemon (MPD)
 EAPI=4
 HOMEPAGE=http://mpd.wikia.com/wiki/Client:Ncmpc
 IUSE=artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.2 sys-libs/ncurses lirc? ( app-misc/lirc )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/musicpd/ncmpc-0.20.tar.bz2
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=aa749fbe42108fa0a247b7933470049c
+_md5_=3fa2df97cae9efc11231aebfaa2caf7c
diff --git a/metadata/md5-cache/media-video/gnome-mplayer-1.0.6 b/metadata/md5-cache/media-video/gnome-mplayer-1.0.6
index 054de9fe37e4..332ab1ed4921 100644
--- a/metadata/md5-cache/media-video/gnome-mplayer-1.0.6
+++ b/metadata/md5-cache/media-video/gnome-mplayer-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ interface to MPlayer
 EAPI=4
 HOMEPAGE=http://code.google.com/p/gnome-mplayer/
 IUSE=alsa +dbus +dconf gnome ipod libnotify musicbrainz pulseaudio
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26 >=media-libs/gmtk-1.0.6[dconf=] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.92 ) gnome? ( gnome-base/nautilus ) ipod? ( >=media-libs/libgpod-0.7 ) libnotify? ( >=x11-libs/libnotify-0.7 ) musicbrainz? ( media-libs/musicbrainz:3 net-misc/curl ) pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) || ( >=media-video/mplayer-1.0_rc4_p20100101[ass] media-video/mplayer2[ass] )
 SLOT=0
 SRC_URI=http://gnome-mplayer.googlecode.com/files/gnome-mplayer-1.0.6.tar.gz
 _eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0
-_md5_=2feebdf92befa2f08730e091c1348dbd
+_md5_=3a8e7c91f43fe4a8b323d2ea1e93fa83
diff --git a/metadata/md5-cache/media-video/smplayer-0.8.0 b/metadata/md5-cache/media-video/smplayer-0.8.0
index db621a16bce9..9c38ff631a35 100644
--- a/metadata/md5-cache/media-video/smplayer-0.8.0
+++ b/metadata/md5-cache/media-video/smplayer-0.8.0
@@ -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.8.0.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=94719be9b81ea0cfbeab77f01ef34dbd
+_md5_=3b0278f67fe254660a6c411705433a6d
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
index dbdeddda88e9..575313f13c34 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.35
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, production-quality, standard-conformant FTP server.
 EAPI=2
 HOMEPAGE=http://www.pureftpd.org/
 IUSE=anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.35.tar.bz2
 _eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=143e4fa04462a8ed05a0801b0720db68
+_md5_=c2173957ffbb7d8364aeb1a5ce96e758
diff --git a/metadata/md5-cache/net-ftp/vsftpd-2.3.5 b/metadata/md5-cache/net-ftp/vsftpd-2.3.5
index 99519a087701..f73c23de174a 100644
--- a/metadata/md5-cache/net-ftp/vsftpd-2.3.5
+++ b/metadata/md5-cache/net-ftp/vsftpd-2.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Very Secure FTP Daemon written with speed, size and security in mind
 EAPI=4
 HOMEPAGE=http://vsftpd.beasts.org/
 IUSE=caps pam tcpd ssl selinux xinetd
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2 ) pam? ( virtual/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( >=dev-libs/openssl-0.9.7d ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=http://security.appspot.com/downloads/vsftpd-2.3.5.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=46ab09910de5740b3db6e840e608352b
+_md5_=82332916c38df125936cce01c3150c0b
diff --git a/metadata/md5-cache/net-im/amsn-0.98.9 b/metadata/md5-cache/net-im/amsn-0.98.9
index 47f232a785d1..a590dd6bda32 100644
--- a/metadata/md5-cache/net-im/amsn-0.98.9
+++ b/metadata/md5-cache/net-im/amsn-0.98.9
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=dev-tcltk/snack-2.2.10 >=net-libs/gupnp-igd-0.1.3 media-libs/libv4l media-libs/imlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=aMSN Messenger client
 EAPI=4
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/amsn/amsn/0.98.9/amsn-0.98.9-src.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9149ffc9ff4621da4d39f873ecc1caa5
+_md5_=d58dc1d6b50e3c0986451d179dbc27b3
diff --git a/metadata/md5-cache/net-misc/mikutter-0.1.0.642 b/metadata/md5-cache/net-misc/mikutter-0.1.1.780
similarity index 91%
rename from metadata/md5-cache/net-misc/mikutter-0.1.0.642
rename to metadata/md5-cache/net-misc/mikutter-0.1.1.780
index b83a8919797d..6b3cff00e354 100644
--- a/metadata/md5-cache/net-misc/mikutter-0.1.0.642
+++ b/metadata/md5-cache/net-misc/mikutter-0.1.1.780
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter.0.1.0.642.tar.gz
+SRC_URI=http://mikutter.hachune.net/bin/mikutter.0.1.1.780.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=84d7e949db008bdfc1342ea489e8994d
+_md5_=607cb6b9cfe892284a5e0188dac299f0
diff --git a/metadata/md5-cache/perl-core/Pod-Simple-3.220.0 b/metadata/md5-cache/perl-core/Pod-Simple-3.220.0
new file mode 100644
index 000000000000..8313cbc53876
--- /dev/null
+++ b/metadata/md5-cache/perl-core/Pod-Simple-3.220.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl[-build]
+DESCRIPTION=Framework for parsing Pod
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/Pod-Simple/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.22.tar.gz
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=db8e1492842d59479181821051bc220f
diff --git a/metadata/md5-cache/sys-boot/unetbootin-575 b/metadata/md5-cache/sys-boot/unetbootin-575
index 9d1a09e28dec..74bb2829dff2 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-575
+++ b/metadata/md5-cache/sys-boot/unetbootin-575
@@ -4,10 +4,10 @@ DESCRIPTION=Universal Netboot Installer creates Live USB systems for various OS
 EAPI=4
 HOMEPAGE=http://unetbootin.sourceforge.net/
 IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui sys-fs/mtools sys-boot/syslinux app-arch/p7zip
 SLOT=0
 SRC_URI=mirror://sourceforge/unetbootin/unetbootin-source-575.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1a4831d52c861da97e5794b00c8701c0
+_md5_=eb24965f0bda32e30ef24f7f4ab5dc23
diff --git a/metadata/md5-cache/sys-fs/fatsort-0.9.16.254 b/metadata/md5-cache/sys-fs/fatsort-0.9.16.254
new file mode 100644
index 000000000000..304e7957be2d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-0.9.16.254
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile prepare
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players.
+EAPI=4
+HOMEPAGE=http://fatsort.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-0.9.16.254.tar.gz
+_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=cbd5a68ebc98edf8fd28d08bd43e0a97
diff --git a/metadata/md5-cache/sys-kernel/mm-sources-3.0 b/metadata/md5-cache/sys-kernel/mm-sources-3.0
deleted file mode 100644
index 34f7f4229d56..000000000000
--- a/metadata/md5-cache/sys-kernel/mm-sources-3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/quilt !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Andrew Morton's -mmotm quilt patchset
-EAPI=4
-HOMEPAGE=http://userweb.kernel.org/~akpm/mmotm/
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=dev-util/quilt !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz -> broken-out-3.0.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b7302b5a077c80ba33b763d34dfb241d
diff --git a/metadata/md5-cache/sys-kernel/mm-sources-3.1_rc3 b/metadata/md5-cache/sys-kernel/mm-sources-3.1_rc3
deleted file mode 100644
index b2947629fff8..000000000000
--- a/metadata/md5-cache/sys-kernel/mm-sources-3.1_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/quilt !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Andrew Morton's -mmotm quilt patchset
-EAPI=4
-HOMEPAGE=http://userweb.kernel.org/~akpm/mmotm/
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=dev-util/quilt !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.1-rc3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz -> broken-out-3.1_rc3.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a1ba63ec83bdfe25cc0fa2c6a961389e
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20120523 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
similarity index 69%
rename from metadata/md5-cache/sys-libs/libcxx-0.0_p20120523
rename to metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
index 8930eccbb0a9..c6a7b95f9fd3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20120523
+++ b/metadata/md5-cache/sys-libs/libcxx-0.0_p20120528
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=New implementation of the C++ standard library, targeting C++0X
 EAPI=4
 HOMEPAGE=http://libcxx.llvm.org/
 KEYWORDS=~amd64
 LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=sys-libs/libcxxrt
 SLOT=0
-SRC_URI=mirror://gentoo/libcxx-0.0_p20120523.tar.xz
+SRC_URI=mirror://gentoo/libcxx-0.0_p20120528.tar.xz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3d44e7dfb6b9358c864784e03de27b26
+_md5_=a02f444037a03ef0b25accb9c82db0da
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index 9183487ebb31..7eaa62c55750 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -1,9 +1,10 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/subversion net-misc/rsync
+DEPEND=sys-libs/libcxxrt sys-devel/clang app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/subversion net-misc/rsync
 DESCRIPTION=New implementation of the C++ standard library, targeting C++0X
 EAPI=4
 HOMEPAGE=http://libcxx.llvm.org/
 LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=sys-libs/libcxxrt
 SLOT=0
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bcfcd5fe5eb8406dfa87d9ebd5522927
+_md5_=59301ff309f602fef6a4035daa8b67e1
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528
new file mode 100644
index 000000000000..c3155c057565
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20120528
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/xz-utils >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD.
+EAPI=4
+HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
+KEYWORDS=~amd64
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=mirror://gentoo/libcxxrt-0.0_p20120528.tar.xz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=e52d56180a1c62e6f4a6452dd9b675f2
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
new file mode 100644
index 000000000000..2e6741e34787
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD.
+EAPI=4
+HOMEPAGE=https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265
+LICENSE=BSD-2
+SLOT=0
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=9fcfe6f2b4622505919dee5ebf071c52
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.220.0 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.220.0
new file mode 100644
index 000000000000..a1ec84ffa7e3
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Pod-Simple-3.220.0
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Pod-Simple
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+RDEPEND=~perl-core/Pod-Simple-3.220.0
+SLOT=0
+_md5_=2e7f2a2775d8d06fcaa211e045020b8a
diff --git a/metadata/md5-cache/www-client/firefox-12.0-r1 b/metadata/md5-cache/www-client/firefox-12.0-r1
index 76a2006ebe48..447b7564c59d 100644
--- a/metadata/md5-cache/www-client/firefox-12.0-r1
+++ b/metadata/md5-cache/www-client/firefox-12.0-r1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linu
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 SLOT=0
-SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/af.xpi -> firefox-12.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ak.xpi -> firefox-12.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ar.xpi -> firefox-12.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/as.xpi -> firefox-12.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ast.xpi -> firefox-12.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/be.xpi -> firefox-12.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bg.xpi -> firefox-12.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-BD.xpi -> firefox-12.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-IN.xpi -> firefox-12.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/br.xpi -> firefox-12.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bs.xpi -> firefox-12.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ca.xpi -> firefox-12.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cs.xpi -> firefox-12.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/csb.xpi -> firefox-12.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cy.xpi -> firefox-12.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/da.xpi -> firefox-12.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/de.xpi -> firefox-12.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/el.xpi -> firefox-12.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-GB.xpi -> firefox-12.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-ZA.xpi -> firefox-12.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eo.xpi -> firefox-12.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-AR.xpi -> firefox-12.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-CL.xpi -> firefox-12.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-ES.xpi -> firefox-12.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-MX.xpi -> firefox-12.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/et.xpi -> firefox-12.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eu.xpi -> firefox-12.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fa.xpi -> firefox-12.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fi.xpi -> firefox-12.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fr.xpi -> firefox-12.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fy-NL.xpi -> firefox-12.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ga-IE.xpi -> firefox-12.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gd.xpi -> firefox-12.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gl.xpi -> firefox-12.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gu-IN.xpi -> firefox-12.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/he.xpi -> firefox-12.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hi-IN.xpi -> firefox-12.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hr.xpi -> firefox-12.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hu.xpi -> firefox-12.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hy-AM.xpi -> firefox-12.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/id.xpi -> firefox-12.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/is.xpi -> firefox-12.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/it.xpi -> firefox-12.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ja.xpi -> firefox-12.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kk.xpi -> firefox-12.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kn.xpi -> firefox-12.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ko.xpi -> firefox-12.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ku.xpi -> firefox-12.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lg.xpi -> firefox-12.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lt.xpi -> firefox-12.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lv.xpi -> firefox-12.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mai.xpi -> firefox-12.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mk.xpi -> firefox-12.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ml.xpi -> firefox-12.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mr.xpi -> firefox-12.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nb-NO.xpi -> firefox-12.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nl.xpi -> firefox-12.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nn-NO.xpi -> firefox-12.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nso.xpi -> firefox-12.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/or.xpi -> firefox-12.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pa-IN.xpi -> firefox-12.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pl.xpi -> firefox-12.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-BR.xpi -> firefox-12.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-PT.xpi -> firefox-12.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/rm.xpi -> firefox-12.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ro.xpi -> firefox-12.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ru.xpi -> firefox-12.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/si.xpi -> firefox-12.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sk.xpi -> firefox-12.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sl.xpi -> firefox-12.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/son.xpi -> firefox-12.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sq.xpi -> firefox-12.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sr.xpi -> firefox-12.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sv-SE.xpi -> firefox-12.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta.xpi -> firefox-12.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta-LK.xpi -> firefox-12.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/te.xpi -> firefox-12.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/th.xpi -> firefox-12.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/tr.xpi -> firefox-12.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/uk.xpi -> firefox-12.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/vi.xpi -> firefox-12.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-CN.xpi -> firefox-12.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-TW.xpi -> firefox-12.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zu.xpi -> firefox-12.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.3.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//12.0/source/firefox-12.0.source.tar.bz2
+SRC_URI=linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/af.xpi -> firefox-12.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ak.xpi -> firefox-12.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ar.xpi -> firefox-12.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/as.xpi -> firefox-12.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ast.xpi -> firefox-12.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/be.xpi -> firefox-12.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bg.xpi -> firefox-12.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-BD.xpi -> firefox-12.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bn-IN.xpi -> firefox-12.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/br.xpi -> firefox-12.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/bs.xpi -> firefox-12.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ca.xpi -> firefox-12.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cs.xpi -> firefox-12.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/csb.xpi -> firefox-12.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/cy.xpi -> firefox-12.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/da.xpi -> firefox-12.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/de.xpi -> firefox-12.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/el.xpi -> firefox-12.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-GB.xpi -> firefox-12.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/en-ZA.xpi -> firefox-12.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eo.xpi -> firefox-12.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-AR.xpi -> firefox-12.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-CL.xpi -> firefox-12.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-ES.xpi -> firefox-12.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/es-MX.xpi -> firefox-12.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/et.xpi -> firefox-12.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/eu.xpi -> firefox-12.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fa.xpi -> firefox-12.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fi.xpi -> firefox-12.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fr.xpi -> firefox-12.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/fy-NL.xpi -> firefox-12.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ga-IE.xpi -> firefox-12.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gd.xpi -> firefox-12.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gl.xpi -> firefox-12.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/gu-IN.xpi -> firefox-12.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/he.xpi -> firefox-12.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hi-IN.xpi -> firefox-12.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hr.xpi -> firefox-12.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hu.xpi -> firefox-12.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/hy-AM.xpi -> firefox-12.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/id.xpi -> firefox-12.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/is.xpi -> firefox-12.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/it.xpi -> firefox-12.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ja.xpi -> firefox-12.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kk.xpi -> firefox-12.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/kn.xpi -> firefox-12.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ko.xpi -> firefox-12.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ku.xpi -> firefox-12.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lg.xpi -> firefox-12.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lt.xpi -> firefox-12.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/lv.xpi -> firefox-12.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mai.xpi -> firefox-12.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mk.xpi -> firefox-12.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ml.xpi -> firefox-12.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/mr.xpi -> firefox-12.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nb-NO.xpi -> firefox-12.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nl.xpi -> firefox-12.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nn-NO.xpi -> firefox-12.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/nso.xpi -> firefox-12.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/or.xpi -> firefox-12.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pa-IN.xpi -> firefox-12.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pl.xpi -> firefox-12.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-BR.xpi -> firefox-12.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/pt-PT.xpi -> firefox-12.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/rm.xpi -> firefox-12.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ro.xpi -> firefox-12.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ru.xpi -> firefox-12.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/si.xpi -> firefox-12.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sk.xpi -> firefox-12.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sl.xpi -> firefox-12.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/son.xpi -> firefox-12.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sq.xpi -> firefox-12.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sr.xpi -> firefox-12.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/sv-SE.xpi -> firefox-12.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta.xpi -> firefox-12.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/ta-LK.xpi -> firefox-12.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/te.xpi -> firefox-12.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/th.xpi -> firefox-12.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/tr.xpi -> firefox-12.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/uk.xpi -> firefox-12.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/vi.xpi -> firefox-12.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-CN.xpi -> firefox-12.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zh-TW.xpi -> firefox-12.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//12.0/linux-i686/xpi/zu.xpi -> firefox-12.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-12.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//12.0/source/firefox-12.0.source.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	check-reqs	e25439e7f4ca914e41d6bb617caa564d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	mozconfig-3	703b00d7435ddcfb8fb7cb4297618c9e	mozcoreconf-2	43f9c2a313b66eae6591721fd343a0a5	mozextension	3555597bb9fa8d695bf69f250bf59a1a	mozlinguas	df344d8308dfb2df49e6b9497f97b347	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	c42fe69d78ae059f56a2d43658fc0480	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=e9bc27cc2eb2e2028f41cb8ab305070a
+_md5_=3d5fc6f52b6170642e313792d83348c6
diff --git a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.6 b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.6
index b8619b3de0bd..9d87fd114b6e 100644
--- a/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.6
+++ b/metadata/md5-cache/www-plugins/gecko-mediaplayer-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=A browser plugin that uses GNOME MPlayer
 EAPI=4
 HOMEPAGE=http://code.google.com/p/gecko-mediaplayer/
 IUSE=+curl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 dev-libs/nspr >=media-libs/gmtk-1.0.6 >=media-video/gnome-mplayer-1.0.6[dbus] curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-1.0.6.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	c42fe69d78ae059f56a2d43658fc0480	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9049587e836594cf5cb78290abcb6cef
+_md5_=647b3d3dc92225c74812634d976fe14d
diff --git a/metadata/md5-cache/x11-apps/xsetmode-1.0.0 b/metadata/md5-cache/x11-apps/xsetmode-1.0.0
deleted file mode 100644
index f2f05db38bc1..000000000000
--- a/metadata/md5-cache/x11-apps/xsetmode-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libXi x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=set the mode for an X Input device
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXi x11-libs/libX11 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetmode-1.0.0.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=d0aacb76d6bddd221c4dd9c0125ec428
diff --git a/metadata/md5-cache/x11-apps/xsetpointer-1.0.1 b/metadata/md5-cache/x11-apps/xsetpointer-1.0.1
deleted file mode 100644
index dc12a6bf55a3..000000000000
--- a/metadata/md5-cache/x11-apps/xsetpointer-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=x11-libs/libXi x11-libs/libX11 >=x11-proto/inputproto-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=set an X Input device as the main pointer
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXi x11-libs/libX11 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetpointer-1.0.1.tar.bz2
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	x-modular	9f4ee0c44a3a3b7ecdf52cefc1e10280
-_md5_=1f5f3d462627db2d5b1c633edd145ad1
diff --git a/metadata/md5-cache/x11-base/xorg-x11-7.4-r1 b/metadata/md5-cache/x11-base/xorg-x11-7.4-r1
deleted file mode 100644
index 753e41121a98..000000000000
--- a/metadata/md5-cache/x11-base/xorg-x11-7.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst preinst
-DEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetmode x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-DESCRIPTION=An X11 implementation maintained by the X.Org Foundation (meta package)
-EAPI=2
-HOMEPAGE=http://xorg.freedesktop.org
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=as-is
-RDEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetmode x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings
-SLOT=0
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8d2aaf61c15e35dc7c8b0134e9b7b4ab
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.1 b/metadata/md5-cache/x11-libs/goocanvas-2.0.1
index 1c1a34346945..bc2d51c6c19d 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	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9070408f927efde93d3cbbc7c37f0216
+_md5_=bd0d2c8e1e868a64ca5ab555e659d385
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0 b/metadata/md5-cache/x11-libs/libGLw-8.0.0
new file mode 100644
index 000000000000..6bdfe094be3f
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libGLw-8.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl virtual/pkgconfig
+DESCRIPTION=Mesa GLw library
+EAPI=4
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=+motif static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	7bd9188561818b742702e8b7b21fd8d3	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=93a2fa7bcf9e70404d8d30132daee3e8
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.4.1.1 b/metadata/md5-cache/x11-terms/gnome-terminal-3.4.1.1
index f2a72b7bcfb8..55700a39126b 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.4.1.1
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.4.1.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.3.17:3[X] >=x11-libs/vte-0.30.
 DESCRIPTION=The Gnome Terminal
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.26.0:2 >=x11-libs/gtk+-3.3.17:3[X] >=x11-libs/vte-0.30.0:2.90 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 x11-libs/libSM x11-libs/libICE
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.4/gnome-terminal-3.4.1.1.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=533839219e1c1513c20b281719f15d86
+_md5_=f7fd99f3db5bf3121cf3006aae64381b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 305d1079c466..18324b7fcfac 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 28 May 2012 09:37:40 +0000
+Mon, 28 May 2012 15:37:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0e5d32457629..d2211522afc3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon May 28 09:37:38 UTC 2012
+Mon May 28 15:37:29 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 028408013793..d1c91dacdf66 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 28 May 2012 10:00:01 +0000
+Mon, 28 May 2012 16:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 05e6ceefa28f..6603c4a6c663 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1338197701 Mon May 28 09:35:01 2012 UTC
+1338219301 Mon May 28 15:35:01 2012 UTC
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
index d0b389c31683..b8aa2f6ad787 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild,v 1.10 2012/05/13 10:52:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.35.ebuild,v 1.11 2012/05/28 13:51:46 armin76 Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
 HOMEPAGE="http://www.pureftpd.org/"
diff --git a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild b/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
index 77c33f06112b..496d236f4e1b 100644
--- a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.3.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-ftp/vsftpd/vsftpd-2.3.5.ebuild,v 1.8 2012/05/13 10:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.5.ebuild,v 1.9 2012/05/28 14:50:42 armin76 Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
diff --git a/net-im/amsn/amsn-0.98.9.ebuild b/net-im/amsn/amsn-0.98.9.ebuild
index 85586a5a9c5d..ddf92f5f141a 100644
--- a/net-im/amsn/amsn-0.98.9.ebuild
+++ b/net-im/amsn/amsn-0.98.9.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-im/amsn/amsn-0.98.9.ebuild,v 1.1 2012/05/26 17:53:45 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.9.ebuild,v 1.2 2012/05/28 15:17:54 tester Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
@@ -60,9 +60,16 @@ src_configure() {
 	econf $(use_enable debug)
 }
 
-src_install() {
+src_compile() {
+	# Custom build system, parallel make fails
+	emake
 	emake -C plugins/amsnplus
-	default
+}
+
+src_install() {
+	# Can't use default because make install isn't parallel friendly
+	emake -j1 DESTDIR="${D}" install
+	dodoc "${DOCS[@]}"
 
 	domenu amsn.desktop
 	sed -i -e s:.png:: "${D}"/usr/share/applications/amsn.desktop || die
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 5f10f85ccc2f..6bfc63fa4550 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,4 +1,4 @@
 DIST mikutter.0.0.4.690.tar.gz 2117444 RMD160 ea658fbdc6db85a9933b16a86fa62bd041751472 SHA1 333ca9924f29adc352742fb46de3847d7e553042 SHA256 8902064a85fa4039e3e75711b72855592bea5565339f0e7f6b2e068161f9e1db
-DIST mikutter.0.1.0.642.tar.gz 2158446 RMD160 a5c18e089b643e86bbbc2ae79460a84a5021ceed SHA1 20ea3de0230045dcd289afe0df4945169ecf1025 SHA256 3c2995b2c9ebc8d5578c658b10b17d24d16040685ad13b8fe42bdb60398ff15c
 DIST mikutter.0.1.0.690.tar.gz 2216155 RMD160 ca4c15e667f9e9f1d0c65606c8b4132dd91cdc20 SHA1 2eaddf9dde1bef678edcf4caf07707519c9dbbfd SHA256 ad12abe5a5093fede4f31edac166190973175af5aeb44423c444fe45fa729b18
 DIST mikutter.0.1.0.723.tar.gz 2228502 RMD160 61bfaf0809a09997dfc9c73ae1d5f3703e40c9c5 SHA1 7020de3fe7111c41a41d4db9aefd449ce0b7eb71 SHA256 71a33452438b95bd00191cb4f1b041d7349b1a82c06d65fab2680be43cfe21c5
+DIST mikutter.0.1.1.780.tar.gz 2239902 RMD160 8376304be67076c193e1065011aed87ae56ebe39 SHA1 232b7de98048e516ceffbe4486d4fd3113b40ff9 SHA256 09c81e648c8da65bedcfe0918beaa74cfeb6739fe958cd84a9c7f417b5ff7d31
diff --git a/net-misc/mikutter/mikutter-0.1.0.642.ebuild b/net-misc/mikutter/mikutter-0.1.1.780.ebuild
similarity index 94%
rename from net-misc/mikutter/mikutter-0.1.0.642.ebuild
rename to net-misc/mikutter/mikutter-0.1.1.780.ebuild
index 437de67b0057..bc79672cabdd 100644
--- a/net-misc/mikutter/mikutter-0.1.0.642.ebuild
+++ b/net-misc/mikutter/mikutter-0.1.1.780.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-misc/mikutter/mikutter-0.1.0.642.ebuild,v 1.1 2012/01/25 13:23:33 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.1.1.780.ebuild,v 1.1 2012/05/28 14:25:02 naota Exp $
 
 EAPI=3
 
diff --git a/perl-core/Pod-Simple/Manifest b/perl-core/Pod-Simple/Manifest
index 96900845b9ad..d16c49af4dd9 100644
--- a/perl-core/Pod-Simple/Manifest
+++ b/perl-core/Pod-Simple/Manifest
@@ -6,3 +6,4 @@ DIST Pod-Simple-3.18.tar.gz 230204 RMD160 1b32b76bb3f6ec5aae3b44180cb17a33a68817
 DIST Pod-Simple-3.19.tar.gz 235837 RMD160 dbebccb6ecb62e2de411f9727d2ca32b322d0355 SHA1 7855de6b0ed4210d60bc98d62084d7e962bf0d84 SHA256 a31afdef687ae6f16ba9baa75cdb10db6fff7268e7286822abf9518474a0b203
 DIST Pod-Simple-3.20.tar.gz 236270 RMD160 1f42320ad2a7b33f5dffafc59ef2527fce58e634 SHA1 3e0eefd541e1bfe5b1367472798238f50d586ac2 SHA256 ac721591548be6ac727348d8556e75ccbaa888226ca925aac46a71d7276d7d26
 DIST Pod-Simple-3.21.tar.gz 237998 RMD160 d1015557fe02fff8b4210d90b9ce54fc6e1aaaf5 SHA1 d21c36390a59b963ae9d2217fb4c2f4cdf1e364e SHA256 29f5e93cf5be8b2dedfec44557bf30a705df1c295e4f23385eec78a1a286e018
+DIST Pod-Simple-3.22.tar.gz 238089 RMD160 21fa09705ee0c85d1b1c604ac1b3961b13e4d043 SHA1 cd91aca3ba335fdc57e19ec47c859dc348dd59a4 SHA256 11d808a70783fbc1c8fb85da33b1dfb6df37e3ef57f260e02e0f140b74f32be7
diff --git a/perl-core/Pod-Simple/Pod-Simple-3.220.0.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.220.0.ebuild
new file mode 100644
index 000000000000..007d6c1ea5e9
--- /dev/null
+++ b/perl-core/Pod-Simple/Pod-Simple-3.220.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.220.0.ebuild,v 1.1 2012/05/28 11:07:28 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DWHEELER
+MODULE_VERSION=3.22
+inherit perl-module
+
+DESCRIPTION="Framework for parsing Pod"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/perl-Pod-Escapes-1.04"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="parallel"
diff --git a/profiles/package.mask b/profiles/package.mask
index 67c2d4574073..a2f62fe55676 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13796 2012/05/27 17:17:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13797 2012/05/28 13:29:34 scarabeus Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -371,31 +371,10 @@ dev-ruby/gherkin:2.10
 # Masked for removal in 30 days.
 dev-python/xsv
 
-# Hans de Graaff <graaff@gentoo.org> (28 Apr 2012)
-# History of broken code, new releases use a test system
-# that does not work itself and has many new dependencies.
-# Current stable version blocks rubygems stabilization.
-# No reverse dependencies.
-# Masked for removal in 30 days.
-dev-ruby/facets
-
 # Robin H. Johnson <robbat2@gentoo.org> (09 Feb 2012)
 # Needs to be slotted better
 =dev-libs/yaz-4*
 
-# Stratos Psomadakis <psomas@gentoo.org> (26 Apr 2012)
-# No longer maintained.
-# Masked for removal in 30 days wrt #412189
-sys-kernel/mm-sources
-
-# Michał Górny <mgorny@gentoo.org> (22 Apr 2012)
-# Obsolete and unmaintained. Their functions are provided by
-# x11-apps/xinput nowadays ('xinput set-mode' and 'xinput set-pointer'
-# respectively). Bug #411999. Masked for removal in 30 days.
-x11-apps/xsetmode
-x11-apps/xsetpointer
-<=x11-base/xorg-x11-7.4-r1
-
 # Torsten Veller <tove@gentoo.org> (21 Apr 2012)
 # Mask for removal: Doesn't install anything (#356559)
 dev-perl/IO-Moose
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2c24f2082ad8..591940c10a68 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1593,6 +1593,7 @@ dev-python/spyder:pylint - Add support for dev-python/pylint
 dev-python/spyder:rope - Add support for dev-python/rope
 dev-python/spyder:scipy - Add support for sci-libs/scipy
 dev-python/spyder:sphinx - Add support for dev-python/sphinx
+dev-python/starcluster:epydoc - Enable build of apidocs in html using epydoc
 dev-python/sympy:imaging - Add support for dev-python/imaging
 dev-python/sympy:ipython - Add support for dev-python/ipython
 dev-python/sympy:mathml - Add support for mathml
diff --git a/sys-boot/unetbootin/unetbootin-575.ebuild b/sys-boot/unetbootin/unetbootin-575.ebuild
index 83350bc7613b..0fe051899955 100644
--- a/sys-boot/unetbootin/unetbootin-575.ebuild
+++ b/sys-boot/unetbootin/unetbootin-575.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-boot/unetbootin/unetbootin-575.ebuild,v 1.1 2012/04/28 17:44:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-575.ebuild,v 1.3 2012/05/28 14:16:34 johu Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 UNETBOOTIN_LINGUAS="
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index a7673f5a0cc9..eb8f01030507 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1 +1,2 @@
 DIST fatsort-0.9.15.247.tar.gz 29917 RMD160 842a3ec9865a05e663594d209b21d4d8f962ad6b SHA1 73e04fa7a48b9025c80460308d2c52214076b430 SHA256 1ef4e7ebbe415f3efccdccafc1bb8ab210d2c54cb0b36e30f61935b14390071a
+DIST fatsort-0.9.16.254.tar.gz 29800 RMD160 0e077ca5bb82bac65b513d476a824ef43222e46f SHA1 cc41229397b4aa5bf2851f316bc5dab527070489 SHA256 4ae755173f56f9ab3d2482f374ba0df6ceb5c51d276be374ab8d5dd86b6df27c
diff --git a/sys-fs/fatsort/fatsort-0.9.16.254.ebuild b/sys-fs/fatsort/fatsort-0.9.16.254.ebuild
new file mode 100644
index 000000000000..016fac3ef305
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-0.9.16.254.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-0.9.16.254.ebuild,v 1.1 2012/05/28 11:47:46 billie Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players."
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e "/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|" \
+		$(find ./ -name Makefile) || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
deleted file mode 100644
index 703d2e5851cd..000000000000
--- a/sys-kernel/mm-sources/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST broken-out-3.0.tar.gz 11991613 RMD160 c2969bd9a93492103d9f45f6922eca7c642f0509 SHA1 7e4bb9e9feaa7e1d5da31ef8effd1de20b4e704c SHA256 a47910335da05d6c5873b0f16c7b6cc701c3f68c78d2e9e2fa52d54a84c40d66
-DIST broken-out-3.1_rc3.tar.gz 14708833 RMD160 22c973ff1dc9f46653bf8209dca53afc11cf0062 SHA1 a68df04deb5b0c585683e6906ffaeae79737e73c SHA256 c632d7e0ab39541177e24e3e275d34e971b71994c07b7bf54d029bba5bd9a45c
-DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
-DIST patch-3.1-rc3.bz2 8476378 RMD160 724d6228cac2287d2e1a182b67aa21b01026966c SHA1 cf66ed566983e46a52417689d36f902aa218b9cd SHA256 a7b1f825a43ccf566ec267ef6f31159d990beda24a78b085d7839612ef11b766
diff --git a/sys-kernel/mm-sources/metadata.xml b/sys-kernel/mm-sources/metadata.xml
deleted file mode 100644
index a37fbaca92b3..000000000000
--- a/sys-kernel/mm-sources/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kernel</herd>
-	<maintainer>
-		<email>psomas@gentoo.org</email>
-		<name>Stratos Psomadakis</name>
-	</maintainer>
-	<longdescription>
-		Andrew Morton's patchset for 2.6. It contains experimental features,
-		cleanups, and other interesting patches.
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-kernel/mm-sources/mm-sources-3.0.ebuild b/sys-kernel/mm-sources/mm-sources-3.0.ebuild
deleted file mode 100644
index a7fc98f0f433..000000000000
--- a/sys-kernel/mm-sources/mm-sources-3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-3.0.ebuild,v 1.1 2011/08/17 15:25:25 psomas Exp $
-
-EAPI=4
-
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-
-ETYPE="sources"
-
-inherit kernel-2 eutils
-detect_version
-
-K_NOSETEXTRAVERSION="don't_set_it"
-
-DESCRIPTION="Andrew Morton's -mmotm quilt patchset"
-HOMEPAGE="http://userweb.kernel.org/~akpm/mmotm/"
-
-PATCHSET_URI="http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz ->
-broken-out-${PV}.tar.gz"
-SRC_URI="${KERNEL_URI} ${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/quilt"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "Do *not* open bugs at Gentoo bugzilla, unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	kernel-2_src_unpack
-	unpack broken-out-${PV}.tar.gz
-}
-
-src_prepare() {
-	einfo "Moving -mmotm quilt patchset to patches/"
-	mv broken-out patches || die "Unable to move -mmotm patchset to patches/"
-
-	einfo "Pushing -mmotm quilt patchset."
-	quilt push -aq  --leave-rejects || die "Unable to apply -mmotm quilt patchset. See the *.rej files in ${S} for more infomation."
-}
diff --git a/sys-kernel/mm-sources/mm-sources-3.1_rc3.ebuild b/sys-kernel/mm-sources/mm-sources-3.1_rc3.ebuild
deleted file mode 100644
index 92de5ebcaa56..000000000000
--- a/sys-kernel/mm-sources/mm-sources-3.1_rc3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-3.1_rc3.ebuild,v 1.1 2011/08/25 09:26:11 psomas Exp $
-
-EAPI=4
-
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-
-ETYPE="sources"
-
-inherit kernel-2 eutils
-detect_version
-
-K_NOSETEXTRAVERSION="don't_set_it"
-
-DESCRIPTION="Andrew Morton's -mmotm quilt patchset"
-HOMEPAGE="http://userweb.kernel.org/~akpm/mmotm/"
-
-PATCHSET_URI="http://userweb.kernel.org/~akpm/mmotm/broken-out.tar.gz ->
-broken-out-${PV}.tar.gz"
-SRC_URI="${KERNEL_URI} ${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/quilt"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "Do *not* open bugs at Gentoo bugzilla, unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-src_unpack() {
-	kernel-2_src_unpack
-	unpack broken-out-${PV}.tar.gz
-}
-
-src_prepare() {
-	einfo "Moving -mmotm quilt patchset to patches/"
-	mv broken-out patches || die "Unable to move -mmotm patchset to patches/"
-
-	einfo "Pushing -mmotm quilt patchset."
-	quilt push -aq  --leave-rejects || die "Unable to apply -mmotm quilt patchset. See the *.rej files in ${S} for more infomation."
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index fdc3aa20ecfe..b996512859c4 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1 +1 @@
-DIST libcxx-0.0_p20120523.tar.xz 817748 RMD160 6619589af8adea3b1294e0abf49014a339a77aba SHA1 32418d2e12ff0b4e25059f334fcd5683f8e664ce SHA256 822d3b0bc2d6a48464eb04665fdded51b144360567726bbc44fffb825140d751
+DIST libcxx-0.0_p20120528.tar.xz 817164 RMD160 0872bff859a48b05f689c63ef0a4916e14f14908 SHA1 280be0ee84b77e6a25a40f5e9eb26953aed309ac SHA256 d2f4a16ba800e34f0ff8514d28ef41d08eab849d27b07a11afd06c4de97b944e
diff --git a/sys-libs/libcxx/files/cxxrt.patch b/sys-libs/libcxx/files/cxxrt.patch
new file mode 100644
index 000000000000..c64d8b3b35d7
--- /dev/null
+++ b/sys-libs/libcxx/files/cxxrt.patch
@@ -0,0 +1,26 @@
+Index: lib/CMakeLists.txt
+===================================================================
+--- lib/CMakeLists.txt	(revision 157576)
++++ lib/CMakeLists.txt	(working copy)
+@@ -36,7 +36,7 @@
+ append_if(libraries LIBCXX_HAS_C_LIB c)
+ append_if(libraries LIBCXX_HAS_M_LIB m)
+ append_if(libraries LIBCXX_HAS_RT_LIB rt)
+-append_if(libraries LIBCXX_HAS_GCC_S_LIB gcc_s)
++append_if(libraries LIBCXX_HAS_LIBCXXRT cxxrt)
+ 
+ target_link_libraries(cxx ${libraries})
+ 
+Index: cmake/config-ix.cmake
+===================================================================
+--- cmake/config-ix.cmake	(revision 157576)
++++ cmake/config-ix.cmake	(working copy)
+@@ -26,7 +26,7 @@
+ check_library_exists(c printf "" LIBCXX_HAS_C_LIB)
+ check_library_exists(m ccos "" LIBCXX_HAS_M_LIB)
+ check_library_exists(rt clock_gettime "" LIBCXX_HAS_RT_LIB)
+-check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB)
++check_library_exists(cxxrt  __cxa_get_globals "" LIBCXX_HAS_LIBCXXRT)
+ 
+ # Check C++0x features
+ if (LIBCXX_ENABLE_CXX0X)
diff --git a/sys-libs/libcxx/libcxx-0.0_p20120523.ebuild b/sys-libs/libcxx/libcxx-0.0_p20120528.ebuild
similarity index 85%
rename from sys-libs/libcxx/libcxx-0.0_p20120523.ebuild
rename to sys-libs/libcxx/libcxx-0.0_p20120528.ebuild
index f3c047c6b3c1..7d61fc1bdfb3 100644
--- a/sys-libs/libcxx/libcxx-0.0_p20120523.ebuild
+++ b/sys-libs/libcxx/libcxx-0.0_p20120528.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-libs/libcxx/libcxx-0.0_p20120523.ebuild,v 1.1 2012/05/24 03:01:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-0.0_p20120528.ebuild,v 1.1 2012/05/28 14:03:08 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
 
-inherit cmake-utils ${SCM} base
+inherit cmake-utils ${SCM} base flag-o-matic
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++0X"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -27,12 +27,13 @@ else
 fi
 IUSE=""
 
-RDEPEND=""
+RDEPEND="sys-libs/libcxxrt"
 DEPEND="${RDEPEND}
 	sys-devel/clang
 	app-arch/xz-utils"
 
-PATCHES=( "${FILESDIR}/multilib.patch" )
+PATCHES=( "${FILESDIR}/multilib.patch"
+		  "${FILESDIR}/cxxrt.patch" )
 DOCS=( "CREDITS.TXT" )
 
 src_prepare() {
@@ -40,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
 	# Needs to be built with clang. gcc-4.6.3 fails at least.
 	# TODO: cross-compile ?
 	export CC=clang
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index f2e52dae7c11..d4fa34224b51 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.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-libs/libcxx/libcxx-9999.ebuild,v 1.1 2012/05/24 03:01:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.2 2012/05/28 13:59:52 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
 
 [ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
 
-inherit cmake-utils ${SCM} base
+inherit cmake-utils ${SCM} base flag-o-matic
 
 DESCRIPTION="New implementation of the C++ standard library, targeting C++0X"
 HOMEPAGE="http://libcxx.llvm.org/"
@@ -27,12 +27,13 @@ else
 fi
 IUSE=""
 
-RDEPEND=""
+RDEPEND="sys-libs/libcxxrt"
 DEPEND="${RDEPEND}
 	sys-devel/clang
 	app-arch/xz-utils"
 
-PATCHES=( "${FILESDIR}/multilib.patch" )
+PATCHES=( "${FILESDIR}/multilib.patch"
+		  "${FILESDIR}/cxxrt.patch" )
 DOCS=( "CREDITS.TXT" )
 
 src_prepare() {
@@ -40,6 +41,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cppflags "-I/usr/include/libcxxrt -DLIBCXXRT"
 	# Needs to be built with clang. gcc-4.6.3 fails at least.
 	# TODO: cross-compile ?
 	export CC=clang
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
new file mode 100644
index 000000000000..7e656f3a15f1
--- /dev/null
+++ b/sys-libs/libcxxrt/Manifest
@@ -0,0 +1 @@
+DIST libcxxrt-0.0_p20120528.tar.xz 57004 RMD160 ad0965a938d32cac87f9457f08075833e4cd059a SHA1 f7b4455bdd7f529648b2740506c0d9698f18bdd0 SHA256 a44008f946ab94a16845f26eaed54be5dabdc2ed5c3b66dd7678086a127b2263
diff --git a/sys-libs/libcxxrt/files/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch b/sys-libs/libcxxrt/files/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch
new file mode 100644
index 000000000000..da14ad8a412d
--- /dev/null
+++ b/sys-libs/libcxxrt/files/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch
@@ -0,0 +1,24 @@
+From 924fc4689d447ab73dd5acc27f1c22f697d2d4d0 Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Sun, 27 May 2012 19:39:13 -0400
+Subject: [PATCH] Link to libdl where needed for dladdr() (exception.cc)
+
+---
+ src/CMakeLists.txt |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0b44852..b4086d9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -13,6 +13,7 @@ set(CXXRT_SOURCES
+ 
+ add_library(cxxrt-static STATIC ${CXXRT_SOURCES})
+ add_library(cxxrt-shared SHARED ${CXXRT_SOURCES})
++target_link_libraries(cxxrt-shared ${CMAKE_DL_LIBS})
+ 
+ set_target_properties(cxxrt-static cxxrt-shared PROPERTIES
+                       OUTPUT_NAME "cxxrt"
+-- 
+1.7.8.6
+
diff --git a/sys-libs/libcxxrt/files/prepare_snapshot.sh b/sys-libs/libcxxrt/files/prepare_snapshot.sh
new file mode 100755
index 000000000000..004bea7b2040
--- /dev/null
+++ b/sys-libs/libcxxrt/files/prepare_snapshot.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+VERSION=$(date +%Y%m%d)
+BASE_VERSION="0.0"
+PACKAGE="libcxxrt-${BASE_VERSION}_p${VERSION}"
+
+git clone git://github.com/pathscale/libcxxrt.git ${PACKAGE}
+
+find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
+find "${PACKAGE}" -type d -name '.git' -prune -print0 | xargs -0 rm -rf
+
+tar cJf ${PACKAGE}.tar.xz ${PACKAGE}
+rm -rf ${PACKAGE}/
+
+echo "Tarball: \"${PACKAGE}.tar.xz\""
+
+echo "** all done **"
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20120528.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20120528.ebuild
new file mode 100644
index 000000000000..6f57e75cbfc6
--- /dev/null
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20120528.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-0.0_p20120528.ebuild,v 1.1 2012/05/28 13:58:04 aballier Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git"
+
+[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
+
+inherit cmake-utils ${SCM} base flag-o-matic
+
+DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
+HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	DEPEND="app-arch/xz-utils"
+else
+	SRC_URI=""
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64"
+else
+	KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${DEPEND}"
+
+PATCHES=( "${FILESDIR}/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch" )
+
+src_prepare() {
+	base_src_prepare
+}
+
+src_install() {
+	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
+	# it. FreeBSD head installs it in /lib
+	cd "${CMAKE_BUILD_DIR}"
+	dolib.so lib/${PN}.so
+	dolib.a lib/${PN}.a
+
+	cd "${S}"
+
+	insinto /usr/include/libcxxrt/
+	doins src/cxxabi.h src/unwind*.h
+
+	dodoc AUTHORS COPYRIGHT README
+}
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
new file mode 100644
index 000000000000..3d47de5158c0
--- /dev/null
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.1 2012/05/28 13:58:04 aballier Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://github.com/pathscale/libcxxrt.git"
+
+[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
+
+inherit cmake-utils ${SCM} base flag-o-matic
+
+DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
+HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	DEPEND="app-arch/xz-utils"
+else
+	SRC_URI=""
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64"
+else
+	KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${DEPEND}"
+
+PATCHES=( "${FILESDIR}/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch" )
+
+src_prepare() {
+	base_src_prepare
+}
+
+src_install() {
+	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
+	# it. FreeBSD head installs it in /lib
+	cd "${CMAKE_BUILD_DIR}"
+	dolib.so lib/${PN}.so
+	dolib.a lib/${PN}.a
+
+	cd "${S}"
+
+	insinto /usr/include/libcxxrt/
+	doins src/cxxabi.h src/unwind*.h
+
+	dodoc AUTHORS COPYRIGHT README
+}
diff --git a/dev-ruby/facets/metadata.xml b/sys-libs/libcxxrt/metadata.xml
similarity index 53%
rename from dev-ruby/facets/metadata.xml
rename to sys-libs/libcxxrt/metadata.xml
index 852136183369..503e8a53624d 100644
--- a/dev-ruby/facets/metadata.xml
+++ b/sys-libs/libcxxrt/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+  <herd>bsd</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
 </pkgmetadata>
+
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.220.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.220.0.ebuild
new file mode 100644
index 000000000000..36aa3fcd1f8e
--- /dev/null
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.220.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Simple/perl-Pod-Simple-3.220.0.ebuild,v 1.1 2012/05/28 11:07:36 tove Exp $
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c0e8ea79c665..b80a4cf02fde 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -231,7 +231,7 @@ DIST firefox-12.0-nn-NO.xpi 251584 RMD160 041e66421f6743e0ce8629a0695702ef1dcf5f
 DIST firefox-12.0-nso.xpi 255057 RMD160 29e2594a03922f52810292b9598edda7e8ee4044 SHA1 d18938e88f74cf0c466a19305b58835cb88b9dc3 SHA256 80e3b19980b9bcfeb2754008dece354daa2001a9c16e18f85720b0fe454416a6
 DIST firefox-12.0-or.xpi 290264 RMD160 b67ad0647f050a8d28a0376b9de333e74098b81d SHA1 32a70a795b62377ed0c7cea417fe68aef043d6ce SHA256 8e7050a78db20ab5476e483d86c21b901c22c040a5797ad6080a1c8b404e5a28
 DIST firefox-12.0-pa-IN.xpi 291378 RMD160 9e16a42b5be9babf74d5b9a3f2db27a815fbdd74 SHA1 85f035b396acf7712903a7504809593edf7c1597 SHA256 6bf483528825485b7fd6ff8d8b25c63f298db64b3478e8a7e086bc8d4a083c29
-DIST firefox-12.0-patches-0.3.tar.xz 12500 RMD160 b6bd3ea865eb3a1286efbbbebdce7b08354c981e SHA1 c9c079aab10bb5c5374d91e24f5ff0fdb6278bca SHA256 a84ff93ccfac5051b915e81d2d3f6f75b72ee49000bf6bf38540e83cafe299cf
+DIST firefox-12.0-patches-0.4.tar.xz 12820 RMD160 08c54d0a3365a615ead75559d0ac382604c83a3c SHA1 f74d4343b67cc59b29bb2bccb08139a757094d48 SHA256 1481e85400de6860f373149f7d0eebd5b8ae5179ed7d8fcbeef0d81115e0f781
 DIST firefox-12.0-pl.xpi 260629 RMD160 65079485d604c9b7b7d78ea0c34eb941c63fadc4 SHA1 970dcc47edf23e99c8695313c66757bad2f3c4a2 SHA256 84382b1ba9208e9fdcb4529ce8327c9b06ccc78bbfb9535c916781548892b8a2
 DIST firefox-12.0-pt-BR.xpi 256574 RMD160 0fe053715bc373d79de22279a5aa2a899b3988db SHA1 b846381743676685a833650b20fac819be4eb1aa SHA256 d535c55943207c1edc2d1009f44e74b6cc45c15d32f1b2d32c1d3b2e64384ed5
 DIST firefox-12.0-pt-PT.xpi 255627 RMD160 10d04a1014da862f2260ffac2f9578e2c6a51fe1 SHA1 0950af9b2b99f29744f82689cc63b6833b6c389e SHA256 16bef61dd49c2c9fdc1263576d1e9275c98e94d7ea744cb551a10a9b9e5a7180
diff --git a/www-client/firefox/firefox-12.0-r1.ebuild b/www-client/firefox/firefox-12.0-r1.ebuild
index a7e361f472ca..0ca5f3e15055 100644
--- a/www-client/firefox/firefox-12.0-r1.ebuild
+++ b/www-client/firefox/firefox-12.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/www-client/firefox/firefox-12.0-r1.ebuild,v 1.2 2012/05/26 16:59:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-12.0-r1.ebuild,v 1.3 2012/05/28 14:44:24 anarchy Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -27,7 +27,7 @@ fi
 # Changeset for alpha snapshot
 CHANGESET="e56ecd8b3a68"
 # Patch version
-PATCH="${PN}-12.0-patches-0.3"
+PATCH="${PN}-12.0-patches-0.4"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.ebuild
index 581d0256716f..54b404fe0531 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.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-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.ebuild,v 1.2 2012/05/03 06:08:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.6.ebuild,v 1.3 2012/05/28 12:24:35 ago Exp $
 
 EAPI=4
 inherit multilib nsplugins
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="+curl"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/x11-apps/xsetmode/Manifest b/x11-apps/xsetmode/Manifest
deleted file mode 100644
index ec2742afd44a..000000000000
--- a/x11-apps/xsetmode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xsetmode-1.0.0.tar.bz2 73757 RMD160 40088c9246a6d67e8d3c759151077fb3cb7dd7a6 SHA1 add4e6a91c9d0e7d1a80b3534c64d6b7bf633ea0 SHA256 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
diff --git a/x11-apps/xsetmode/metadata.xml b/x11-apps/xsetmode/metadata.xml
deleted file mode 100644
index 01c4c004e735..000000000000
--- a/x11-apps/xsetmode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-apps/xsetmode/xsetmode-1.0.0.ebuild b/x11-apps/xsetmode/xsetmode-1.0.0.ebuild
deleted file mode 100644
index b66371e49b46..000000000000
--- a/x11-apps/xsetmode/xsetmode-1.0.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/xsetmode-1.0.0.ebuild,v 1.20 2009/12/15 19:21:00 ranger Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="set the mode for an X Input device"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libXi
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetpointer/Manifest b/x11-apps/xsetpointer/Manifest
deleted file mode 100644
index ef329da5ca12..000000000000
--- a/x11-apps/xsetpointer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xsetpointer-1.0.1.tar.bz2 83260 RMD160 281a766d1b6a34575fd589901417c0cb80e110ee SHA1 a8b01c6f27625a6f6943f9be17b1e5511f69d710 SHA256 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571
diff --git a/x11-apps/xsetpointer/metadata.xml b/x11-apps/xsetpointer/metadata.xml
deleted file mode 100644
index 01c4c004e735..000000000000
--- a/x11-apps/xsetpointer/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-apps/xsetpointer/xsetpointer-1.0.1.ebuild b/x11-apps/xsetpointer/xsetpointer-1.0.1.ebuild
deleted file mode 100644
index 2060dc0452f9..000000000000
--- a/x11-apps/xsetpointer/xsetpointer-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/xsetpointer-1.0.1.ebuild,v 1.13 2010/10/23 23:11:13 leio Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="set an X Input device as the main pointer"
-
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXi
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-1.4"
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild
deleted file mode 100644
index d1f229156b01..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild,v 1.9 2010/09/13 01:03:56 josejx Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
-HOMEPAGE="http://xorg.freedesktop.org"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	x11-apps/xbacklight
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetmode
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# Fonts
-RDEPEND="${RDEPEND}
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-adobe-utopia-100dpi
-	media-fonts/font-adobe-utopia-75dpi
-	media-fonts/font-adobe-utopia-type1
-	media-fonts/font-alias
-	media-fonts/font-arabic-misc
-	media-fonts/font-bh-100dpi
-	media-fonts/font-bh-75dpi
-	media-fonts/font-bh-lucidatypewriter-100dpi
-	media-fonts/font-bh-lucidatypewriter-75dpi
-	media-fonts/font-bh-ttf
-	media-fonts/font-bh-type1
-	media-fonts/font-bitstream-100dpi
-	media-fonts/font-bitstream-75dpi
-	media-fonts/font-bitstream-speedo
-	media-fonts/font-bitstream-type1
-	media-fonts/font-cronyx-cyrillic
-	media-fonts/font-cursor-misc
-	media-fonts/font-daewoo-misc
-	media-fonts/font-dec-misc
-	media-fonts/font-ibm-type1
-	media-fonts/font-isas-misc
-	media-fonts/font-jis-misc
-	media-fonts/font-micro-misc
-	media-fonts/font-misc-cyrillic
-	media-fonts/font-misc-ethiopic
-	media-fonts/font-misc-meltho
-	media-fonts/font-misc-misc
-	media-fonts/font-mutt-misc
-	media-fonts/font-schumacher-misc
-	media-fonts/font-screen-cyrillic
-	media-fonts/font-sony-misc
-	media-fonts/font-sun-misc
-	media-fonts/font-util
-	media-fonts/font-winitzki-cyrillic
-	media-fonts/font-xfree86-type1
-
-	media-fonts/font-alias
-	media-fonts/font-util
-	media-fonts/encodings
-	"
-
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	# Save xorg.conf because of bug #278268
-	if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then
-		cp "${ROOT}etc/X11/xorg.conf" "${T}"
-	fi
-}
-
-pkg_postinst() {
-	# Restore saved xorg.conf
-	if [[ -f "${T}/xorg.conf" ]]; then
-		cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf"
-	fi
-
-	elog
-	elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
-	elog "Any custom cursor sets should be placed in that directory."
-	elog
-	elog "If you wish to set system-wide default cursors, please create"
-	elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
-	elog "with content: \"Inherits=theme_name\" so that future"
-	elog "emerges will not overwrite those settings."
-	elog
-	elog "Listening on TCP is disabled by default with startx."
-	elog "To enable it, edit ${ROOT}usr/bin/startx."
-	elog
-
-	# (#76985)
-	elog "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
-	elog "for more information on configuring X."
-	elog
-}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.1.ebuild
index 1b8524ca1784..1a1a5c18c478 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.9 2012/05/21 19:09:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goocanvas/goocanvas-2.0.1.ebuild,v 1.10 2012/05/28 14:03:35 armin76 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-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
index 03fd35ba0b76..6279f7048b42 100644
--- a/x11-libs/libGLw/Manifest
+++ b/x11-libs/libGLw/Manifest
@@ -1,2 +1,3 @@
 DIST glw-1.0.0.tar.bz2 221075 RMD160 4b59da8806a01b8e48d75f8bb5af47db8356db40 SHA1 d84a07301f652f1cd85f8d9c1ab8bf37a85142c6 SHA256 3c51b8e6d6c5e34bbb618716ad1c81d4d06da4ef6513cb5152908c941ed31766
+DIST glw-8.0.0.tar.bz2 221136 RMD160 f8d0c06d9c379dfafa656c72dffd6a20f652293a SHA1 08de9c63a2d0ec452fb80cca91cd1fa0d9550db4 SHA256 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597
 DIST libGLw-1.0.0_pre120304.tar.xz 10260 RMD160 2ace6b927112bf6222112245921ad422469de771 SHA1 04d4e8702bb0f48ab7b506a48e965df7bc4e7605 SHA256 998e2be9e3b417d9a5c7a713980491826ec8187eba1229c7cedb15b64ba8d815
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
new file mode 100644
index 000000000000..aff735948550
--- /dev/null
+++ b/x11-libs/libGLw/libGLw-8.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libGLw/libGLw-8.0.0.ebuild,v 1.1 2012/05/28 12:57:47 jlec Exp $
+
+EAPI=4
+
+MY_P=glw-"${PV}"
+
+inherit autotools-utils
+
+DESCRIPTION="Mesa GLw library"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+motif static-libs"
+
+RDEPEND="
+	!media-libs/mesa[motif]
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/openmotif
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-motif
+		)
+	autotools-utils_src_configure
+}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild
index e96c75d8a1d8..9c670cf0f87f 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.4.1.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-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild,v 1.2 2012/05/03 07:11:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild,v 1.3 2012/05/28 12:38:09 blueness Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 # FIXME: automagic dependency on gtk+[X]