diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
index 20bb7c76c185..b8b1cca6fb34 100644
--- a/app-arch/createrepo/Manifest
+++ b/app-arch/createrepo/Manifest
@@ -1,2 +1,2 @@
-DIST createrepo-0.9.7.tar.gz 55303 RMD160 e3cd3cecc5dcc1922c05552a99477d72f6bd413a SHA1 8738a208cda03fa175d02dcbf7ed3e4b8a9c0e95 SHA256 dae4b4893fad534b4c3496966696dde9cdf96d41d7f8487fae4ca0e1e5c0bd79
-DIST createrepo-0.9.8.tar.gz 57973 RMD160 aa6021d6cc3e01f8b7dde108a966210dd7480509 SHA1 b4964ea3caf039954467374ffd7769cc6875c70a SHA256 736842bda7d404a03470775332ccda339a114f14772d7a354d99bf64f38ecd14
+DIST createrepo-0.9.9-head.patch.bz2 14380 RMD160 6fe7e41c89ee08a328824cbdea49234597caa1d9 SHA1 42047b9ca3fa634a5e7f7b1cfdb1331d565c1792 SHA256 74bdaea63c5f72d8814b0be5bc4b497188c8bd7c10fc3d66b6fd4058f98b58b8
+DIST createrepo-0.9.9.tar.gz 65114 RMD160 6c0e553a6fc0286436cf736405004e2153ba7a84 SHA1 e4ff7aac85eb2c8d077910e6921c621b4eae256e SHA256 ee897463837b299fb20bf6e970f8c5324cd8b7f26ad3675a9938a2d7ae42ff03
diff --git a/app-arch/createrepo/createrepo-0.9.7-r1.ebuild b/app-arch/createrepo/createrepo-0.9.7-r1.ebuild
deleted file mode 100644
index 3483c722f20f..000000000000
--- a/app-arch/createrepo/createrepo-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.7-r1.ebuild,v 1.1 2011/11/12 19:37:12 maksbotan Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="xml"
-
-inherit python
-
-DESCRIPTION="Creates a common metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/urlgrabber-2.9.0
-	>=app-arch/rpm-4.0[python]
-	dev-libs/libxml2[python]"
-
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${ED}" || die
-	dodoc ChangeLog README
-	python_convert_shebangs -r 2 "${ED}"
-}
diff --git a/app-arch/createrepo/createrepo-0.9.7.ebuild b/app-arch/createrepo/createrepo-0.9.7.ebuild
deleted file mode 100644
index 37bc3530b7bc..000000000000
--- a/app-arch/createrepo/createrepo-0.9.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.7.ebuild,v 1.1 2009/04/12 07:31:37 vapier Exp $
-
-EAPI="2"
-
-DESCRIPTION="Creates a common metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	>=dev-python/urlgrabber-2.9.0
-	>=app-arch/rpm-4.0[python]
-	dev-libs/libxml2[python]"
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/app-arch/createrepo/createrepo-0.9.8-r1.ebuild b/app-arch/createrepo/createrepo-0.9.8-r1.ebuild
deleted file mode 100644
index f099d8d90ce6..000000000000
--- a/app-arch/createrepo/createrepo-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.8-r1.ebuild,v 1.1 2011/11/12 19:37:12 maksbotan Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="xml"
-
-inherit python eutils
-
-DESCRIPTION="Creates a common metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/urlgrabber-2.9.0
-	>=app-arch/rpm-4.0[python]
-	dev-libs/libxml2[python]
-	>=sys-apps/yum-3.2.23"
-
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^sysconfdir/s:=.*/:=/:' \
-		Makefile
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${ED}" || die
-	dodoc ChangeLog README
-	python_convert_shebangs -r 2 "${ED}"
-}
diff --git a/app-arch/createrepo/createrepo-0.9.8.ebuild b/app-arch/createrepo/createrepo-0.9.8.ebuild
deleted file mode 100644
index b197ab14319e..000000000000
--- a/app-arch/createrepo/createrepo-0.9.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.8.ebuild,v 1.2 2010/06/16 20:45:25 patrick Exp $
-
-EAPI="2"
-
-DESCRIPTION="Creates a common metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	>=dev-python/urlgrabber-2.9.0
-	>=app-arch/rpm-4.0[python]
-	dev-libs/libxml2[python]
-	>=sys-apps/yum-3.2.23"
-
-src_prepare() {
-	sed -i \
-		-e '/^sysconfdir/s:=.*/:=/:' \
-		Makefile
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/app-arch/createrepo/createrepo-0.9.9.ebuild b/app-arch/createrepo/createrepo-0.9.9.ebuild
new file mode 100644
index 000000000000..0cfd7e9dcbc0
--- /dev/null
+++ b/app-arch/createrepo/createrepo-0.9.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/createrepo/createrepo-0.9.9.ebuild,v 1.1 2012/05/15 08:55:21 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="xml"
+
+inherit python eutils
+
+DESCRIPTION="Creates a common metadata repository"
+HOMEPAGE="http://createrepo.baseurl.org/"
+SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/maintainer-needed/${PN}-0.9.9-head.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/urlgrabber-2.9.0
+	>=app-arch/rpm-4.1.1[python]
+	dev-libs/libxml2[python]
+	>=app-arch/deltarpm-3.6_pre20110223[python]
+	dev-python/pyliblzma
+	>=sys-apps/yum-3.4.3"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${PN}-0.9.9-head.patch"
+	epatch "${FILESDIR}/${PN}-0.9.9-ten-changelog-limit.patch"
+
+	sed -i -e '/^sysconfdir/s:=.*/:=/:' Makefile || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc ChangeLog README
+	python_convert_shebangs -r 2 "${ED}"
+}
diff --git a/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch b/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch
new file mode 100644
index 000000000000..07b61067462e
--- /dev/null
+++ b/app-arch/createrepo/files/createrepo-0.9.9-ten-changelog-limit.patch
@@ -0,0 +1,11 @@
+--- createrepo/__init__.py~	2011-01-26 12:14:30.000000000 -0500
++++ createrepo/__init__.py	2011-01-26 12:34:17.291441719 -0500
+@@ -96,7 +96,7 @@
+         self.mdtimestamp = 0
+         self.directory = None
+         self.directories = []
+-        self.changelog_limit = None # needs to be an int or None
++        self.changelog_limit = 10 # needs to be an int or None
+         self.unique_md_filenames = True
+         self.additional_metadata = {} # dict of 'type':'filename'
+         self.revision = str(int(time.time()))
diff --git a/app-arch/createrepo/metadata.xml b/app-arch/createrepo/metadata.xml
index 633b5daddbe3..52cd998927e4 100644
--- a/app-arch/createrepo/metadata.xml
+++ b/app-arch/createrepo/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>proxy-maintainers</herd>
 <maintainer>
-	<email>johneed@hotmail.com</email>
-	<name>Ian Delaney</name>
+	<email>alon.barlev@gmail.com</email>
+	<name>Alon Bar-Lev</name>
+	<description>Please assign bugs</description>
+</maintainer>
+<maintainer>
+	<email>pacho@gentoo.org</email>
+	<description>proxy-maintainer, please CC on bugs</description>
 </maintainer>
 </pkgmetadata>
diff --git a/app-arch/deltarpm/Manifest b/app-arch/deltarpm/Manifest
index 21dfbc48fb96..6af0ff6109b7 100644
--- a/app-arch/deltarpm/Manifest
+++ b/app-arch/deltarpm/Manifest
@@ -1 +1 @@
-DIST deltarpm-3.5.tar.bz2 492136 RMD160 6dd307261ab546d238a8009dc6f73d1eb16fbf76 SHA1 07cc1ec30f63344fde0eee478e146b77dd0e80c0 SHA256 db534094ce7ae7e50f85fb085ebb9147054383cec87279df34eed0434ec8a321
+DIST deltarpm-git-20110223.tar.bz2 499623 RMD160 a574852d57ec890c85845586d43ff19827ace57a SHA1 9f8b104b655443808918be1479da95b2edffb8b0 SHA256 e4d6cad74cece0c6e48d5c49929e00a23ba116ff88a09245ad1d7ac84610c089
diff --git a/app-arch/deltarpm/deltarpm-3.5.ebuild b/app-arch/deltarpm/deltarpm-3.5.ebuild
deleted file mode 100644
index 10addb0f20e8..000000000000
--- a/app-arch/deltarpm/deltarpm-3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.5.ebuild,v 1.1 2010/05/18 08:58:16 jlec Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="tools to create and apply deltarpms"
-HOMEPAGE="ftp://ftp.suse.com/pub/projects/deltarpm/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/deltarpm/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	app-arch/xz-utils
-	app-arch/bzip2
-	<app-arch/rpm-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-zlib.patch
-	sed -i \
-		-e '/^prefix/s:/local::' \
-		-e '/^mandir/s:/man:/share/man:' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc README
-}
diff --git a/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild b/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild
new file mode 100644
index 000000000000..63970b28ef2c
--- /dev/null
+++ b/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild,v 1.1 2012/05/15 08:41:59 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.7"
+
+inherit eutils toolchain-funcs python
+
+SNAPSHOT="20110223"
+
+DESCRIPTION="tools to create and apply deltarpms"
+HOMEPAGE="http://gitorious.org/deltarpm/deltarpm"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${PN}-git-${SNAPSHOT}.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/${PN}-git-${SNAPSHOT}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+DEPEND="sys-libs/zlib
+	app-arch/xz-utils
+	app-arch/bzip2
+	<app-arch/rpm-5"
+
+S="${WORKDIR}/${PN}-git-${SNAPSHOT}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^prefix/s:/local::' \
+		-e '/^mandir/s:/man:/share/man:' \
+		Makefile || die
+	epatch "${FILESDIR}/3.6_pre20110223-build.patch"
+}
+
+src_compile() {
+	emake -j1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+
+	if use python; then
+		emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" python
+	fi
+}
diff --git a/app-arch/deltarpm/files/3.6_pre20110223-build.patch b/app-arch/deltarpm/files/3.6_pre20110223-build.patch
new file mode 100644
index 000000000000..c7feea74f893
--- /dev/null
+++ b/app-arch/deltarpm/files/3.6_pre20110223-build.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 0d0028f..9d05d59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@ _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
+ 			if [ ! -f "python$$PYVER/$@" ]; then \
+ 				mkdir -p python$$PYVER ;\
+ 				$(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
+-				$(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $$PYLDFLAGS; \
++				$(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $(LDFLAGS) $$PYLDFLAGS; \
+ 			fi; \
+ 		fi; \
+ 	done
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
index 47d8220bdbed..8dcb9ca92991 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.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/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild,v 1.2 2012/04/23 16:53:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild,v 1.3 2012/05/15 14:31:22 jlec Exp $
 
 EAPI=4
 
@@ -66,9 +66,6 @@ src_install() {
 pkg_postinst() {
 	elog "Please add the init script to your default runlevel"
 	elog "rc-update add bootchart2 default"
-	echo ""
-	elog "Please review /usr/share/doc/${PF}/README"
-	elog "for further usage informations."
 	echo
 	python_mod_optimize pybootchartgui
 }
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild
index 14b69cea5016..8dc8550c5a92 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.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-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild,v 1.2 2012/04/23 16:53:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild,v 1.3 2012/05/15 14:31:22 jlec Exp $
 
 EAPI=4
 
@@ -69,9 +69,6 @@ src_install() {
 pkg_postinst() {
 	elog "Please add the init script to your default runlevel"
 	elog "rc-update add bootchart2 default"
-	echo ""
-	elog "Please review /usr/share/doc/${PF}/README"
-	elog "for further usage informations."
 	echo
 	python_mod_optimize pybootchartgui
 }
diff --git a/app-i18n/enca/enca-1.13-r2.ebuild b/app-i18n/enca/enca-1.13-r2.ebuild
index 17f017c99238..9ade3aafb1bb 100644
--- a/app-i18n/enca/enca-1.13-r2.ebuild
+++ b/app-i18n/enca/enca-1.13-r2.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-i18n/enca/enca-1.13-r2.ebuild,v 1.8 2012/03/02 21:15:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.13-r2.ebuild,v 1.9 2012/05/15 13:01:08 aballier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +recode"
 
 DEPEND="recode? ( >=app-text/recode-3.6_p15 )"
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index faf4e59caadf..809fa6f5835c 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,20 @@
 DIST amd64-debug-libreoffice-base-3.4.5.2-r1.tbz2 401594386 RMD160 41ebf335e3a1adeaacb498465e6039322d064366 SHA1 adfee701a5ec2fcf0ac9469af851cc6cd5eb425f SHA256 d7594e78b2804d258714e8329aea4e5b5ced1fe71c2c997503b81458530965b5
+DIST amd64-debug-libreoffice-base-3.5.2.2-r1.tar.xz 711327216 RMD160 fcbdad40a8c97c5f146c020b1e399b0a96d7372d SHA1 33551bd57e97a3c6bd2674174a5836e07a5793ad SHA256 c3a549233e6e718b34f886a04d70d0dae505778bd3074d06600d53c5e0f2d64e
 DIST amd64-debug-libreoffice-base-3.5.2.2.tar.xz 711622308 RMD160 c91c0165a4a3cf16e09edd42bf8c1e328d451b2b SHA1 984298aa4e5be760ffabc9b2987bd2597df72540 SHA256 11a7fface5ff2f53a308120b71a4a6af5b0f4b519a4e7dd2f6de2ec79211f5dc
 DIST amd64-debug-libreoffice-base-java-3.4.5.2-r1.tbz2 405367077 RMD160 b56794a57a908b9ba94158bf52d317bff1e5101d SHA1 4d4820ed99c693c89a939b2499d93a8575dd7efb SHA256 3f622d5d617eb560cfd59c40b34f86e3b8955c754ecb528a23e510b12c676bec
+DIST amd64-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz 715035776 RMD160 400ef9d756aee83303b1bab167222d469aa634fd SHA1 4e2abb394716ab0b6302a03aff4ccfb4dbaec94f SHA256 c48673403bc8575ddd9db0061fc928f31e1060934fb861e56bc626e5d4d6d24d
 DIST amd64-debug-libreoffice-base-java-3.5.2.2.tar.xz 715355792 RMD160 48d46b2c88122f1f914e4d760549707e3c5fbbd6 SHA1 70a15af20997c9fb8e8747784fc7be314c380e7a SHA256 6e898340439a70f1ca89f630424452570144b92210fc753df3db9fb8bc16c674
 DIST amd64-debug-libreoffice-gnome-3.4.5.2-r1.tbz2 402719568 RMD160 fa63f7c3c5e9c56e4ba430a1858528e8549e38fe SHA1 7239d1078b6c8bfe054293376caf70fc32997e4e SHA256 f91a3334890c6599bf588dd70fe03fbb283a1510274f6cb93eeef0e037c7d662
+DIST amd64-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz 712437644 RMD160 9626c25655221907a0aada9d1fc5df3677ffcf5b SHA1 97a14951875ace3051047d9ee2fc5896fc8edbb8 SHA256 d435b631b9b47cccf38363513055f6a44eaf5c102feba8a9b9654ff7d0e464ef
 DIST amd64-debug-libreoffice-gnome-3.5.2.2.tar.xz 712735124 RMD160 dc9bbd2a2279e7b31953ffdda33201dda663a026 SHA1 37dd6180ea535a919f6ca635e02359031447f2cb SHA256 eed03df2eb693f2f9dc9f4a25795997b656fef9e2bea53165c7fa974bdc5b7a4
 DIST amd64-debug-libreoffice-gnome-java-3.4.5.2-r1.tbz2 406558896 RMD160 27dd7739472d77ae7428d4374870816f789fd0d3 SHA1 5766f55498a2473fa08d90de4c9e742376421263 SHA256 2ed4f75e3ad9d20956372afb4c14abdeb256627d1a41c7a4d3c9ef7524e8c684
+DIST amd64-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz 716149420 RMD160 cb88de06a610dba62960c156e912ac896d3e3be1 SHA1 f853f1296355bead2476072ebd0b65b401e174ea SHA256 571cedd292e4b20744c2e9d775cf72d7666f327e2aeecd6a3bd1dfa499c76d1d
 DIST amd64-debug-libreoffice-gnome-java-3.5.2.2.tar.xz 716465520 RMD160 a665f8d6c58f9360d7468ad51fab920a00e43f4b SHA1 0cafe2b275dabbbb6bbe5b23719c304e6c34c2ad SHA256 a318ed97f1c15ec505f45275b84f65d811abedc34e047a37f9348cf6a20e90df
 DIST amd64-debug-libreoffice-kde-3.4.5.2-r1.tbz2 402546607 RMD160 10620d928bceb17caa154179e3c9e09adebb5e36 SHA1 b9053f1d2058e655edb3ba9e5bb187fbe9b7bd7e SHA256 004aa7c94e6682d874e188248cd2f0bd54c2b23402727f9f132ce54cc3b6bb06
+DIST amd64-debug-libreoffice-kde-3.5.2.2-r1.tar.xz 712377296 RMD160 6d188877d1f381d4b01e5d3fa7acb2644738b622 SHA1 de5a6affc01c466349d69605f72b85f8310296d8 SHA256 8670e24d3bbaa6051354ee7635608706fe3185ee313d74ce34278f70a922046b
 DIST amd64-debug-libreoffice-kde-3.5.2.2.tar.xz 712648220 RMD160 d3ef9161714e9e108db3693d3ee3873bf5143f05 SHA1 e5f431dbd05230af8a16fd3a4c37409f66ff872b SHA256 0256fbe01b00b8cd572c8ec8861bcaf2fa1a4157bd04320772989cf64236e312
 DIST amd64-debug-libreoffice-kde-java-3.4.5.2-r1.tbz2 406397036 RMD160 ca80b721b095d8ee632dff825917607f3f8314c8 SHA1 5ee6cd5c3000f80094f737bda106d85c897e97de SHA256 c32a6ac7a26e0035e2cbd9bf269e7156be69438aa14debf43036ef068b649f6d
+DIST amd64-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz 716089056 RMD160 991d79edc2aa281f17b7b2402c8e810c2c3adf97 SHA1 97882f5a4ef4eaaf8c9e452b1d468837cd7c0fb5 SHA256 646095d2fba2ca9a8ae592e62e3984a8efa0a4ca6cf89ea38838f1f3a49ec5de
 DIST amd64-debug-libreoffice-kde-java-3.5.2.2.tar.xz 716391968 RMD160 e4b5fb933791768c5803bd1693a15202b5754060 SHA1 810e7677a905b77ca84cb3f5bbb38837ece4c82c SHA256 3819a55fbed789318cc58bae994b8886146f9ee5dbfab351c6f599422ae558e0
 DIST x86-debug-libreoffice-base-3.4.5.2-r1.tbz2 391547962 RMD160 ac3c24f085e249e3020e19a1e6869412fde012fa SHA1 e2ef7134622b477a5581d0cb7d689fe1097cd8ca SHA256 0ab5c9ad4fec2df170b559e3f9e87e7ae59efa07b2f8e23d9bfe043b12831b3d
 DIST x86-debug-libreoffice-base-3.5.2.2-r1.tar.xz 691431200 RMD160 160164f4863d6715a9915fc9ed2a4ad3ecb95023 SHA1 a72456f8f2f960244965413367335c03e09b7332 SHA256 c3331afed37af50bdd811a52cb648528513d33be23be58830c38a86c203d56de
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.2-r1.ebuild
index a6132b34886b..31200f93922d 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.2-r1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.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/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.2-r1.ebuild,v 1.1 2012/05/13 19:21:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.2.2-r1.ebuild,v 1.2 2012/05/15 07:47:25 dilfridge Exp $
 
 EAPI=4
 
@@ -39,13 +39,14 @@ SRC_URI_X86="
 "
 
 SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
 	x86? ( ${SRC_URI_X86} )
 "
 
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-text/recode/recode-3.6_p17-r2.ebuild b/app-text/recode/recode-3.6_p17-r2.ebuild
index ca5b61294f98..cfba42b1206b 100644
--- a/app-text/recode/recode-3.6_p17-r2.ebuild
+++ b/app-text/recode/recode-3.6_p17-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild,v 1.11 2011/03/29 05:45:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6_p17-r2.ebuild,v 1.12 2012/05/15 13:00:12 aballier Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
index 84dfb9d0c771..0b11df9f1ea2 100644
--- a/app-vim/automatictexplugin/Manifest
+++ b/app-vim/automatictexplugin/Manifest
@@ -1 +1,2 @@
 DIST AutomaticTexPlugin_10.6.4.tar.gz 385551 RMD160 3498baebcbad639290a0c9b77b83583ea06a3d40 SHA1 06d31d7c269439406789bd68087464b4925a4093 SHA256 1cb8523cc5a376969c33a765ba95dc2b9576bde79509c8792eaf5c9c70ffaef1
+DIST AutomaticTexPlugin_11.tar.gz 418213 RMD160 676ae0f026985292ca168e3ea5b9d05f201cea64 SHA1 3bcb7a89ce9c1df50a28c573a4e8c588a493cd0e SHA256 a789c3dae4585522bba09dc1f29c5aab9c35764218612d4d9a0dbf45db0b99c9
diff --git a/app-vim/automatictexplugin/automatictexplugin-11.ebuild b/app-vim/automatictexplugin/automatictexplugin-11.ebuild
new file mode 100644
index 000000000000..2386dfd8c080
--- /dev/null
+++ b/app-vim/automatictexplugin/automatictexplugin-11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-11.ebuild,v 1.1 2012/05/15 12:34:07 radhermit Exp $
+
+EAPI="4"
+VIM_PLUGIN_VIM_VERSION="7.3"
+
+inherit vim-plugin
+
+MY_P="AutomaticTexPlugin_${PV}"
+DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
+HOMEPAGE="http://atp-vim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+	!app-vim/vim-latex
+	app-vim/align
+	app-text/wdiff
+	>=dev-lang/python-2.7
+	dev-python/psutil
+	dev-tex/latexmk
+	dev-tex/detex
+	virtual/tex-base"
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index 47dc0571c768..8d598412477b 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -1 +1,2 @@
 DIST pango-0.12.0.tar.gz 58732 RMD160 c15e5ffd9ae7d7ea9a97c52739c187d11b4a1fa1 SHA1 9dee7c80a95c59cd54b0afe5e1dac12a4e02c515 SHA256 2bf39aa21de3992786b503e809bc0896614880af30d00a6f1f8cbd3b0985e0ee
+DIST pango-0.12.3.tar.gz 60043 RMD160 6b5da92c0711d1e96f41d6fdb53701fc4d88937b SHA1 7dbe8fca11bd88eb3ba9d4d5ef7ba07a8302401d SHA256 5131833e1b8c311d22cfeaa8de301355142d79145084f5aab958b7c452f90308
diff --git a/dev-haskell/pango/pango-0.12.3.ebuild b/dev-haskell/pango/pango-0.12.3.ebuild
new file mode 100644
index 000000000000..dffa620dc2a9
--- /dev/null
+++ b/dev-haskell/pango/pango-0.12.3.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/dev-haskell/pango/pango-0.12.3.ebuild,v 1.1 2012/05/15 17:04:47 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Pango text rendering engine."
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/cairo-0.12*[profile?]
+		=dev-haskell/glib-0.12*[profile?]
+		dev-haskell/mtl[profile?]
+		>=dev-lang/ghc-6.10.1
+		x11-libs/cairo
+		x11-libs/pango"
+DEPEND="${RDEPEND}
+		dev-haskell/gtk2hs-buildtools"
diff --git a/dev-lang/orc/orc-0.4.16.ebuild b/dev-lang/orc/orc-0.4.16.ebuild
index 43c7220ff414..2251ae520222 100644
--- a/dev-lang/orc/orc-0.4.16.ebuild
+++ b/dev-lang/orc/orc-0.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16.ebuild,v 1.1 2012/02/15 09:58:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16.ebuild,v 1.2 2012/05/15 13:42:59 aballier Exp $
 
 EAPI=4
 inherit autotools flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs examples"
 
 src_prepare() {
diff --git a/dev-lang/python/python-2.6.8.ebuild b/dev-lang/python/python-2.6.8.ebuild
index 1c18ba4f85c9..114cf79a2fb5 100644
--- a/dev-lang/python/python-2.6.8.ebuild
+++ b/dev-lang/python/python-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.11 2012/05/14 21:17:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.12 2012/05/15 14:12:51 jer Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 LICENSE="PSF-2"
 SLOT="2.6"
 PYTHON_ABI="${SLOT}"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 RDEPEND="app-arch/bzip2
diff --git a/dev-lang/python/python-3.1.5.ebuild b/dev-lang/python/python-3.1.5.ebuild
index 06af73922720..df70addd31b1 100644
--- a/dev-lang/python/python-3.1.5.ebuild
+++ b/dev-lang/python/python-3.1.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/dev-lang/python/python-3.1.5.ebuild,v 1.10 2012/05/14 21:17:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.5.ebuild,v 1.11 2012/05/15 14:12:51 jer Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.1"
 PYTHON_ABI="${SLOT}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 RDEPEND="app-arch/bzip2
diff --git a/dev-lang/python/python-3.2.3.ebuild b/dev-lang/python/python-3.2.3.ebuild
index 8067c2456b66..2304247f10de 100644
--- a/dev-lang/python/python-3.2.3.ebuild
+++ b/dev-lang/python/python-3.2.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-lang/python/python-3.2.3.ebuild,v 1.10 2012/05/14 21:17:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.3.ebuild,v 1.11 2012/05/15 14:12:51 jer Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.2"
 PYTHON_ABI="${SLOT}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 RDEPEND="app-arch/bzip2
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 17062394dc8d..d83acd43c038 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,9 +8,9 @@ DIST pl-6.1.3.tar.gz 13839415 RMD160 0952af4fb54bb1d6b3dcbad5d1d27c6630799d76 SH
 DIST pl-6.1.4.tar.gz 13984106 RMD160 ce33579523e8fccc0ac3fb2d63a9cc97c06fb976 SHA1 b215531cc7ef620d936881dfc071ddeb2ca59648 SHA256 d822c08756b1df967cd17cf6f2b8e89a4388b8e2776314324c047237c9ca8468
 DIST swi-prolog-5.10.5-gentoo-patchset-5.tar.gz 10284 RMD160 42b868f886c639fd612e4c03cbabceb4a70b603a SHA1 26275151c36fb0322f60ec4eadfe0852e02f0b71 SHA256 7f7817602dd844cbd587a665164c85a9d0d8a00b09cfce50f9784119563c11ef
 DIST swi-prolog-6.0.0-gentoo-patchset-0.tar.gz 4092 RMD160 73ea1a7f5dffff2c411983abc48e6e028d6366ad SHA1 8adb49c195d9f2250721f16bfb849f45c42e040e SHA256 7e64c64db768e0ad5fd682b3d5b6a3b92bb0d4d8663af26dbd5ab717d712564c
-DIST swi-prolog-6.0.1-gentoo-patchset-0.tar.gz 3853 RMD160 04b086976733d6e2859ed1e288bdc84f962be7ff SHA1 72790d65eca235486f318578a2360a004e339271 SHA256 4c9920f86920b5e5fc24c4fe55cf1e5280f9d382473e4fbd59b8ffff295bcfc9
+DIST swi-prolog-6.0.1-gentoo-patchset-1.tar.gz 4043 RMD160 97a8bfb2babaf003101960aa9192462f81a9eca6 SHA1 ac850bb0dbcbd332fb1ede79887296b08ec8aa32 SHA256 8d2ec220727daf3a3ad09e4c5f2a722295bbb431c8347bda087d09a5e193364f
 DIST swi-prolog-6.1.0-gentoo-patchset-0.tar.gz 4091 RMD160 69420dd1d071b306fe55f79e4b0def6b13736939 SHA1 e78560a8bf29072afed536ba1946b46d52c9e3c8 SHA256 0a01c451999207d326cad29847a94d95621e71b83a62b33cedf23b4be214063b
 DIST swi-prolog-6.1.1-gentoo-patchset-0.tar.gz 3859 RMD160 0bb3cbfeb9e621c51bbcebcdb60301648fbd764b SHA1 01dcc3ace9be32995d2641accadd4c521dd22c34 SHA256 9cd70eaa1029d4fb7ab22abeefba3e7e3efe49ec52733556ed2b35de5b0f5358
 DIST swi-prolog-6.1.2-gentoo-patchset-0.tar.gz 3866 RMD160 7e09c16ecfaa9b0a34c77a403b8a57ca3d65e593 SHA1 9ab931f43a5459ae6c013906470506a311f2677a SHA256 496e87171518d730c2feebd09c9ce96e7226e0d9a5a2e3bd6aa015774a450c8a
 DIST swi-prolog-6.1.3-gentoo-patchset-0.tar.gz 3869 RMD160 32c1b6b5a064e1255aaf3a8f56ed17b687102168 SHA1 06c55af40f483256faae7a58fcf957a48dfdd467 SHA256 08499e866d7e30dcd0cb482c1409a47bc6eaab2be18732ee313b5236a20eeab5
-DIST swi-prolog-6.1.4-gentoo-patchset-0.tar.gz 3873 RMD160 150e3dbf66b9d5342ec21757f76806196d15c9b4 SHA1 2dfa481b6f00c5f1f5651d9f273fb3ceae107a19 SHA256 6d03e4cbcaee459938f55bf39bdc6d68c986d1da150e645c8e54c10b9bd00e85
+DIST swi-prolog-6.1.4-gentoo-patchset-1.tar.gz 4059 RMD160 7dc3d64a3eee06716a84f7d33b3e5f49e0c8ec38 SHA1 26015330af6280bdd2362353f35eee701c72de5f SHA256 2d84f6cc687513df10b1fa5b4f369fc62177e82140cc642c47332efc334480f8
diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild b/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild
index 361665c5e068..35731117dfe0 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild,v 1.1 2012/03/02 20:22:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.0.1.ebuild,v 1.2 2012/05/15 15:50:54 keri Exp $
 
 EAPI=2
 
 inherit eutils flag-o-matic java-pkg-opt-2
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild b/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild
index 9283517e6fa2..953485b4ba48 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild,v 1.1 2012/05/13 15:09:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.1.4.ebuild,v 1.2 2012/05/15 15:50:54 keri Exp $
 
 EAPI=2
 
 inherit eutils flag-o-matic java-pkg-opt-2
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-lang/v8/v8-3.9.24.21.ebuild b/dev-lang/v8/v8-3.9.24.21.ebuild
index 84c7ed38ec34..4787c7f847d7 100644
--- a/dev-lang/v8/v8-3.9.24.21.ebuild
+++ b/dev-lang/v8/v8-3.9.24.21.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-lang/v8/v8-3.9.24.21.ebuild,v 1.1 2012/05/10 02:24:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.9.24.21.ebuild,v 1.2 2012/05/15 16:47:38 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 x86 ~x64-macos ~x86-macos"
 IUSE=""
 
 pkg_setup() {
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch b/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch
new file mode 100644
index 000000000000..446a2f395bce
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-glib-2.31.patch
@@ -0,0 +1,74 @@
+http://bugs.gentoo.org/318569
+http://bugs.gentoo.org/415721
+
+--- charset/fribidi-char-sets.c
++++ charset/fribidi-char-sets.c
+@@ -114,7 +114,7 @@
+ };
+ 
+ #if FRIBIDI_USE_GLIB+0
+-# include <glib/gstrfuncs.h>
++# include <glib.h>
+ # define fribidi_strcasecmp g_ascii_strcasecmp
+ #else /* !FRIBIDI_USE_GLIB */
+ static char
+--- lib/common.h
++++ lib/common.h
+@@ -57,7 +57,7 @@
+ #  define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P
+ # endif	/* !SIZEOF_VOID_P */
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmem.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # ifndef fribidi_malloc
+ #  define fribidi_malloc g_try_malloc
+@@ -65,12 +65,12 @@
+ # endif	/* !fribidi_malloc */
+ # ifndef fribidi_assert
+ #  ifndef __FRIBIDI_DOC
+-#   include <glib/gmessages.h>
++#   include <glib.h>
+ #  endif /* !__FRIBIDI_DOC */
+ #  define fribidi_assert g_assert
+ # endif	/* !fribidi_assert */
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmacros.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # ifndef FRIBIDI_BEGIN_STMT
+ #  define FRIBIDI_BEGIN_STMT G_STMT_START {
+--- lib/fribidi-common.h
++++ lib/fribidi-common.h
+@@ -62,7 +62,7 @@
+ 
+ #if FRIBIDI_USE_GLIB+0
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gmacros.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # define FRIBIDI_BEGIN_DECLS		G_BEGIN_DECLS
+ # define FRIBIDI_END_DECLS		G_END_DECLS
+--- lib/fribidi-types.h
++++ lib/fribidi-types.h
+@@ -40,8 +40,7 @@
+ 
+ #if FRIBIDI_USE_GLIB+0
+ # ifndef __FRIBIDI_DOC
+-#  include <glib/gtypes.h>
+-#  include <glib/gunicode.h>
++#  include <glib.h>
+ # endif	/* !__FRIBIDI_DOC */
+ # define FRIBIDI_INT8_LOCAL		gint8
+ # define FRIBIDI_INT16_LOCAL		gint16
+--- lib/mem.h
++++ lib/mem.h
+@@ -42,7 +42,7 @@
+ #if FRIBIDI_USE_GLIB+0
+ 
+ #ifndef __FRIBIDI_DOC
+-# include <glib/gmem.h>
++# include <glib.h>
+ #endif /* !__FRIBIDI_DOC */
+ 
+ #define FriBidiMemChunk GMemChunk
diff --git a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
index b8cb2645c1ac..8649db285528 100644
--- a/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
+++ b/dev-libs/fribidi/files/fribidi-0.19.2-nodoc.patch
@@ -1,5 +1,5 @@
---- fribidi-0.19.2.orig/Makefile.am	2005-08-26 03:35:34.000000000 +0900
-+++ fribidi-0.19.2/Makefile.am	2010-05-11 17:36:38.000000000 +0900
+--- Makefile.am
++++ Makefile.am
 @@ -9,7 +9,7 @@
  ##############################################################################
  
diff --git a/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
index da7e993bb9ec..cd1ee899b18b 100644
--- a/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.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-libs/fribidi/fribidi-0.19.2-r1.ebuild,v 1.11 2012/05/04 18:35:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2-r1.ebuild,v 1.12 2012/05/15 13:01:48 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://fribidi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild b/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild
new file mode 100644
index 000000000000..ad9bea589d11
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.2-r2.ebuild,v 1.1 2012/05/15 13:35:32 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README ChangeLog THANKS TODO"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glib-2.31.patch \
+		"${FILESDIR}"/${P}-nodoc.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	econf \
+		$(use_enable static-libs static) \
+		--with-glib=yes
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-libs/geoip/geoip-1.4.8.ebuild b/dev-libs/geoip/geoip-1.4.8.ebuild
index 1372d3a25375..d1e4a82c0b2f 100644
--- a/dev-libs/geoip/geoip-1.4.8.ebuild
+++ b/dev-libs/geoip/geoip-1.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8.ebuild,v 1.9 2011/11/27 22:33:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8.ebuild,v 1.10 2012/05/15 16:22:00 darkside Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 perl-geoipupdate static-libs"
 
 RDEPEND="
@@ -48,7 +48,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
 	rm "${ED}/etc/GeoIP.conf.default"
 	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/lib*.la
+		rm -f "${ED}"/usr/lib*/lib*.la
 	fi
 
 	if use ipv6; then
diff --git a/dev-libs/libcdio/libcdio-0.83.ebuild b/dev-libs/libcdio/libcdio-0.83.ebuild
index 602ed8a351d9..faad3446064a 100644
--- a/dev-libs/libcdio/libcdio-0.83.ebuild
+++ b/dev-libs/libcdio/libcdio-0.83.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/libcdio/libcdio-0.83.ebuild,v 1.13 2012/05/04 18:35:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.83.ebuild,v 1.14 2012/05/15 13:49:23 aballier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="cddb +cxx minimal static-libs"
 
 RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
new file mode 100644
index 000000000000..5ea235ca4aa0
--- /dev/null
+++ b/dev-python/cssselect/Manifest
@@ -0,0 +1 @@
+DIST cssselect-0.6.1.tar.gz 29679 RMD160 bac67eeecd1984b12e36513969503256032fa27a SHA1 a0c379438def2267e29de3783a89ab1d9280e55d SHA256 b35683a6526e24240606b46caf6f7c154a3c0f4ac4137fd2b073ddcfcb25445f
diff --git a/dev-python/cssselect/cssselect-0.6.1.ebuild b/dev-python/cssselect/cssselect-0.6.1.ebuild
new file mode 100644
index 000000000000..5797aac09ba8
--- /dev/null
+++ b/dev-python/cssselect/cssselect-0.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.6.1.ebuild,v 1.1 2012/05/15 15:35:33 xarthisius Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="http://packages.python.org/cssselect/ http://pypi.python.org/pypi/cssselect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/lxml )"
+RDEPEND=""
+
+DOCS="AUTHORS CHANGES README.rst"
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		"$(PYTHON -f)" setup.py build_sphinx || die
+	fi
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" ${PN}/tests.py -v
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc ; then
+		dohtml -r docs/_build/html/
+	fi
+}
diff --git a/dev-python/cssselect/metadata.xml b/dev-python/cssselect/metadata.xml
new file mode 100644
index 000000000000..301d2207cc29
--- /dev/null
+++ b/dev-python/cssselect/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/greenlet/greenlet-0.3.4-r1.ebuild b/dev-python/greenlet/greenlet-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..3bc987c80066
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.3.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.3.4-r1.ebuild,v 1.1 2012/05/15 13:45:48 xarthisius Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython"
+DISTUTILS_SRC_TEST=setup.py
+
+inherit distutils
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="http://pypi.python.org/pypi/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+src_compile() {
+	distutils_src_compile
+	if use doc ; then
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r doc/_build/html/
+	fi
+}
diff --git a/dev-python/optcomplete/optcomplete-1.2.ebuild b/dev-python/optcomplete/optcomplete-1.2.ebuild
index 10d8d0b429cf..5a9207d3ddd3 100644
--- a/dev-python/optcomplete/optcomplete-1.2.ebuild
+++ b/dev-python/optcomplete/optcomplete-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/optcomplete/optcomplete-1.2.ebuild,v 1.8 2012/02/01 21:58:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optcomplete/optcomplete-1.2.ebuild,v 1.9 2012/05/15 16:24:51 darkside Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc x86 ~x86-linux"
 IUSE="examples"
 
 DEPEND=""
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 18c078b57cff..77ac400d3123 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,3 +1,4 @@
 DIST pyquery-0.6.1.tar.gz 16176 RMD160 f01b12a3ad53d30801d3863d1381d70df6365241 SHA1 b63cb5027ae4aa39d618c84a3f56e4b70149a08c SHA256 ccbb9ccf7d41f546b28103ddd59fa584927dad1cb817800dadbb8eb1886656b2
 DIST pyquery-1.0.tar.gz 17226 RMD160 186d0f66ca046ea1c81a6f050c7a7e9cc3bbd6fe SHA1 8b0d148f0e9d0627761dc890fcdd70d8b02ef54d SHA256 fb2345065647211507d23355b1026d995ded40e088d86fcae262562921d80408
 DIST pyquery-1.1.1.tar.gz 21108 RMD160 e79b002f0ca31107987194ab2ec94b227d969cba SHA1 be1d145af0b5c10112f604eff5da35dcf18a0281 SHA256 4bdc4b5add5d65055aeb05860c24f53557540db1d945413093c74b554db62a44
+DIST pyquery-1.2.1.tar.gz 21534 RMD160 f74c85ee0ef903260bd31e5e102c4ea51ae460b5 SHA1 b266bc3abed797766b48266ac870fbcfcc64f948 SHA256 a607f81a628887e2cf03d5dddee6f092faf411e51b894130a2b4c839e60c408f
diff --git a/dev-python/pyquery/pyquery-1.2.1.ebuild b/dev-python/pyquery/pyquery-1.2.1.ebuild
new file mode 100644
index 000000000000..d3c189a76e2b
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.1.ebuild,v 1.1 2012/05/15 16:03:43 xarthisius Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.1 *-jython 2.7-pypy-*"
+DISTUTILS_SRC_TEST=nosetests
+
+inherit distutils
+
+DESCRIPTION="A jquery-like library for python"
+HOMEPAGE="http://pypi.python.org/pypi/pyquery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/lxml-2.1
+	dev-python/cssselect
+	>=dev-python/webob-1.2_rc1"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+DOCS="CHANGES.txt README.txt"
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 4bcab7bc2783..fdd1e6f3d625 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,2 +1,3 @@
 DIST WebOb-1.0.7.zip 193712 RMD160 6c6e62d7757d82ceeefd79356578560de516d4d0 SHA1 b5cd2422ae64036895554e6cfa079e05ee8273a6 SHA256 ea0f8be2555986e8e9a0cc104e8e58e438b5462b064d7e9da60101a266518620
 DIST WebOb-1.1.zip 196271 RMD160 97a598f9c7df05c2b5643cf190b9f85f3fa13189 SHA1 9e4fc940f0d0f4c2df6b0920ad161e38de5852bc SHA256 391048babc0d2500a79df0386963f942594b7b986104b49f713dc05ad21627d6
+DIST WebOb-1.2rc1.zip 216706 RMD160 1babbd1e48e81f6e78f42907a4af596d24c7d4be SHA1 03659cfec07f664ff982767b60ba28a52483382e SHA256 b25cb3385fbe0cccf91e8b617eb61057d9ac39c53bf9fa4918a3ec561a0379f5
diff --git a/dev-python/webob/webob-1.2_rc1.ebuild b/dev-python/webob/webob-1.2_rc1.ebuild
new file mode 100644
index 000000000000..0b6d585f6732
--- /dev/null
+++ b/dev-python/webob/webob-1.2_rc1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.2_rc1.ebuild,v 1.1 2012/05/15 15:59:11 xarthisius Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.1"
+DISTUTILS_SRC_TEST=nosetests
+
+inherit distutils versionator
+
+MY_PN=WebOb
+MY_PV=$(delete_version_separator 2)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://pythonpaste.org/webob/ http://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		"$(PYTHON -f)" setup.py build_sphinx || die
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r build/sphinx/html/
+	fi
+}
diff --git a/dev-tex/biblatex/biblatex-1.6.ebuild b/dev-tex/biblatex/biblatex-1.6.ebuild
index c43602c248af..1133fca54bf7 100644
--- a/dev-tex/biblatex/biblatex-1.6.ebuild
+++ b/dev-tex/biblatex/biblatex-1.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/dev-tex/biblatex/biblatex-1.6.ebuild,v 1.2 2012/02/20 20:44:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/biblatex/biblatex-1.6.ebuild,v 1.3 2012/05/15 17:45:32 johu Exp $
 
 inherit latex-package
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 LICENSE="LPPL-1.3"
 SLOT="0"
 IUSE="doc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-texlive/texlive-bibtexextra"
 DEPEND="${RDEPEND}
diff --git a/dev-util/catalyst/catalyst-2.0.8.1.ebuild b/dev-util/catalyst/catalyst-2.0.8.1-r1.ebuild
similarity index 96%
rename from dev-util/catalyst/catalyst-2.0.8.1.ebuild
rename to dev-util/catalyst/catalyst-2.0.8.1-r1.ebuild
index e20120443834..489505cd404b 100644
--- a/dev-util/catalyst/catalyst-2.0.8.1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.8.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/dev-util/catalyst/catalyst-2.0.8.1.ebuild,v 1.1 2012/05/12 14:00:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.1-r1.ebuild,v 1.1 2012/05/15 16:54:08 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -62,7 +62,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	python_convert_shebangs -r 2 .
+	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
 }
 
 src_install() {
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 6dd955c88453..0e89a189da35 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.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/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.5 2012/05/03 03:50:25 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.6 2012/05/15 16:54:08 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -62,7 +62,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	python_convert_shebangs -r 2 .
+	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
 }
 
 src_install() {
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 4bd2ae9eb695..b8f90f930746 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-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/dev-util/catalyst/catalyst-9999.ebuild,v 1.19 2012/05/03 03:50:25 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.20 2012/05/15 16:54:08 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -62,7 +62,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	python_convert_shebangs -r 2 .
+	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
 }
 
 src_install() {
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 59f038116fa6..a652683b290a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,4 +1,4 @@
 DIST glib-2.30.2.tar.xz 5818860 RMD160 d8fc7c876bd15ea3a9255d4d0a67d745e3790488 SHA1 bc7be8572122997e4d5fc6691f51602f28cd4e3a SHA256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82
 DIST glib-2.30.3.tar.xz 5642448 RMD160 0887b08e2fff75c325ed1fb1123baaf42dc9779b SHA1 ec97dd659862dca05d18093a6ea6c309dcff0cdd SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27
-DIST glib-2.32.1.tar.xz 6138200 RMD160 d56ab662502916574e2286f92c2c56dc8aad210d SHA1 3f94733d0e79e5ff10d5ca8735ae5d7f11f2edc0 SHA256 484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398
 DIST glib-2.32.2.tar.xz 6117764 RMD160 2ec828c54c31f07d9d28d182f1d6e8398e112928 SHA1 5898165e58c8f946c2b1fd05b910fe4476b64164 SHA256 b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136
+DIST glib-2.32.3.tar.xz 6164984 RMD160 204ddce09d6622926c7b2d51b995f503ec18673e SHA1 429355327aaf69d2c21cbefcb20c61db94e0acec SHA256 b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild
similarity index 96%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.32.1.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild
index d07c774d7249..a88792548abb 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.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-util/gdbus-codegen/gdbus-codegen-2.32.1.ebuild,v 1.2 2012/04/28 04:07:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.3.ebuild,v 1.1 2012/05/15 09:02:21 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 2a4c778e15a9..2a5e7f92b016 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,2 +1,2 @@
-DIST widelands-build15-src.tar.bz2 107471022 RMD160 23dd238978cf97cea2abcb2b8178b090d790cf77 SHA1 dfa3c1bf701dec55cefb5b10f278da037c9288ea SHA256 99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03
 DIST widelands-build16-src.tar.bz2 137808494 RMD160 aa7d14fe0071041227cebf5b5974feb74e7b8c8f SHA1 3e6df06337a4e422236bb0c0bb21068cddb6e274 SHA256 d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
+DIST widelands-build17-src.tar.bz2 175547379 RMD160 4ea81d21d3b3e02fc22194d1a39e8c08e05aaa44 SHA1 0ac6e1a1e6a5ba8cdd01c3f70e4c391ae9186ff1 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5
diff --git a/games-strategy/widelands/files/widelands-0.15-build.patch b/games-strategy/widelands/files/widelands-0.15-build.patch
deleted file mode 100644
index 846d4b132998..000000000000
--- a/games-strategy/widelands/files/widelands-0.15-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- CMakeLists.txt.old	2010-04-13 17:15:39.000000000 +0200
-+++ CMakeLists.txt	2010-04-13 19:11:45.000000000 +0200
-@@ -106,6 +106,7 @@
- set (BUILD_SHARED_LIBS OFF)
- set (Boost_USE_STATIC_LIBS   ON)
- set (Boost_USE_MULTITHREADED ON)
-+set (Boost_ADDITIONAL_VERSIONS "1.42" "1.42.0")
- find_package(Boost 1.35.0 REQUIRED)
- include_directories(${Boost_INCLUDE_DIR})
- target_link_libraries(widelands ${Boost_LIBRARIES})
-@@ -345,7 +346,7 @@
-     worlds
-     pics
-   DESTINATION ${WLBUILD_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release
-+  CONFIGURATIONS Debug;Release;Gentoo
-   COMPONENT CoreDataFiles
-   PATTERN "*.svn*" EXCLUDE
-   PATTERN "SCons*" EXCLUDE
-@@ -380,7 +381,7 @@
-   set (WL_CREATE_SYMLINK_COMMAND "create_symlink")
- endif (WIN32)
- 
--if (${CMAKE_BUILD_TYPE} STREQUAL Release)
-+if (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
-   add_custom_target (
-     lang ALL
-     COMMAND cmake -E echo "Preparing directory po"
-@@ -399,7 +400,7 @@
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/buildlocale.py
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-   )
--else (${CMAKE_BUILD_TYPE} STREQUAL Release)
-+else (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
-   add_custom_target (
-     lang
-     COMMAND cmake -E echo "Preparing directory po"
-@@ -423,7 +424,7 @@
-     COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/locale
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-   )
--endif (${CMAKE_BUILD_TYPE} STREQUAL Release)
-+endif (${CMAKE_BUILD_TYPE} STREQUAL Gentoo)
- 
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES locale)
- 
-@@ -431,7 +432,7 @@
-   DIRECTORY
-     ${CMAKE_CURRENT_BINARY_DIR}/locale/
-   DESTINATION ${WLBUILD_INSTALL_LOCALEDIR}
--  CONFIGURATIONS Debug;Release
-+  CONFIGURATIONS Debug;Release;Gentoo
-   COMPONENT CoreLanguageFiles
-   PATTERN "*.svn*" EXCLUDE
-   PATTERN "SCons*" EXCLUDE
diff --git a/games-strategy/widelands/files/widelands-0.15-gcc45.patch b/games-strategy/widelands/files/widelands-0.15-gcc45.patch
deleted file mode 100644
index efd42a8b95e4..000000000000
--- a/games-strategy/widelands/files/widelands-0.15-gcc45.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/editor/ui_menus/editor_main_menu_random_map.cc.old	2010-05-18 17:17:15.000000000 +0200
-+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2010-05-18 17:18:29.000000000 +0200
-@@ -251,7 +251,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -322,7 +322,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 		break;
- 	case 9:
- 		break;
-@@ -476,7 +476,7 @@
- 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
- 			++m_currentworld;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 		button_clicked(-1);  // Update other values in UI as well
- 
---- src/editor/ui_menus/editor_main_menu_new_map.cc.old	2010-05-18 17:38:29.000000000 +0200
-+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2010-05-18 17:38:55.000000000 +0200
-@@ -113,7 +113,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Map::button_clicked, *this, 4,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -142,7 +142,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name
- 			 	());
- 		break;
- 	}
diff --git a/games-strategy/widelands/files/widelands-0.15-gcc46.patch b/games-strategy/widelands/files/widelands-0.15-gcc46.patch
deleted file mode 100644
index 9f1d06796765..000000000000
--- a/games-strategy/widelands/files/widelands-0.15-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/economy/supply_list.h.old	2011-04-26 12:25:14.102136343 +0200
-+++ src/economy/supply_list.h	2011-04-26 13:32:57.127500881 +0200
-@@ -21,6 +21,7 @@
- #define SUPPLY_LIST_H
- 
- #include <vector>
-+#include <cstddef>
- 
- namespace Widelands {
- 
diff --git a/games-strategy/widelands/files/widelands-0.15-locale.patch b/games-strategy/widelands/files/widelands-0.15-locale.patch
deleted file mode 100644
index bddeafc64a48..000000000000
--- a/games-strategy/widelands/files/widelands-0.15-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.old	2010-11-20 22:07:17.000000000 +0500
-+++ CMakeLists.txt	2010-11-20 22:07:55.000000000 +0500
-@@ -79,7 +79,7 @@
- 
- set (WLBUILD_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- set (WLBUILD_INSTALL_DATADIR ${WL_INSTALL_DATADIR})
--set (WLBUILD_INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${WL_INSTALL_DATADIR}/locale")
-+set (WLBUILD_INSTALL_LOCALEDIR ${WL_INSTALL_LOCALEDIR})
- set (WLBUILD_INSTALL_BINDIR ${WL_INSTALL_BINDIR})
- 
- if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
diff --git a/games-strategy/widelands/widelands-0.15.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
similarity index 53%
rename from games-strategy/widelands/widelands-0.15.ebuild
rename to games-strategy/widelands/widelands-0.17.ebuild
index 47f8cf772a27..289f0c8c6ab6 100644
--- a/games-strategy/widelands/widelands-0.15.ebuild
+++ b/games-strategy/widelands/widelands-0.17.ebuild
@@ -1,63 +1,56 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.15.ebuild,v 1.8 2011/04/26 12:12:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.1 2012/05/15 11:15:48 scarabeus Exp $
 
-EAPI=2
-inherit eutils versionator cmake-utils games
+EAPI=3
+inherit versionator cmake-utils games
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
 DESCRIPTION="A game similar to Settlers 2"
 HOMEPAGE="http://www.widelands.org/"
-SRC_URI="http://launchpad.net/widelands/${MY_PV}/${MY_PV}/+download/${MY_P}.tar.bz2"
+SRC_URI="http://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="dev-games/ggz-client-libs
-	dev-lang/lua
-	virtual/jpeg
-	media-libs/libpng:0
-	media-libs/libsdl[video]
+RDEPEND="dev-lang/lua
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-gfx
 	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/tiff"
+	media-libs/glew
+	media-libs/sdl-ttf"
 DEPEND="${RDEPEND}
 	dev-libs/boost"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-locale.patch \
-		"${FILESDIR}"/${P}-gcc45.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+CMAKE_BUILD_TYPE=Release
+PREFIX=${GAMES_DATADIR}/${PN}
 
-	sed -i \
-		-e 's:__ppc__:__PPC__:' src/s2map.cc \
-		|| die "sed s2map.cc failed"
+src_prepare() {
+	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
+	sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die
+	sed -i -e '22i#define OF(x) x' src/io/filesystem/ioapi.h || die
+	sed -i -e '/Boost_USE_STATIC_LIBS/s:ON:OFF:' CMakeLists.txt || die
 }
 
 src_configure() {
-	mycmakeargs+=(
+	local mycmakeargs+=(
 		'-DWL_VERSION_STANDARD=true'
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_DATADIR}/${PN}"
 		"-DWL_INSTALL_PREFIX=${GAMES_PREFIX}"
 		"-DWL_INSTALL_DATADIR=${GAMES_DATADIR}/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=locale"
+		"-DWL_INSTALL_LOCALEDIR=${GAMES_DATADIR}/${PN}/locale"
 		"-DWL_INSTALL_BINDIR=${GAMES_BINDIR}"
 	)
 	cmake-utils_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile -j1
+	cmake-utils_src_compile
 }
 
 src_install() {
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
index 20b5ac1b68b9..12e9d4392b5f 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.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/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild,v 1.7 2012/03/25 16:17:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild,v 1.8 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="4"
 
@@ -68,7 +68,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
index da4ddb6c5a5b..77501ffac140 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r2.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/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.6 2012/04/29 15:45:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.7 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="4"
 
@@ -69,7 +69,7 @@ RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
index 92570d89b61d..19ed4b2367c7 100644
--- a/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1.ebuild,v 1.8 2011/03/22 20:13:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1.ebuild,v 1.9 2012/05/15 15:38:12 ssuominen Exp $
 
 EAPI="3"
 
@@ -66,7 +66,7 @@ RDEPEND="!gnome-base/gnome
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
 PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
diff --git a/gnome-base/gnome/gnome-2.32.1-r1.ebuild b/gnome-base/gnome/gnome-2.32.1-r1.ebuild
index 56a086a6a95b..95ee95ff7ded 100644
--- a/gnome-base/gnome/gnome-2.32.1-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r1.ebuild,v 1.7 2011/12/07 07:36:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r1.ebuild,v 1.8 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -159,7 +159,7 @@ RDEPEND="
 		>=app-misc/tomboy-1.4.2 )
 	policykit? ( gnome-extra/polkit-gnome )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
index 67fd581edadd..802520e9c5ff 100644
--- a/gnome-base/gnome/gnome-2.32.1-r2.ebuild
+++ b/gnome-base/gnome/gnome-2.32.1-r2.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/gnome/gnome-2.32.1-r2.ebuild,v 1.5 2012/04/29 15:46:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.6 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -159,7 +159,7 @@ RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
 		>=app-misc/tomboy-1.4.2 )
 	policykit? ( gnome-extra/polkit-gnome )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
diff --git a/gnome-base/gnome/gnome-3.2.1.ebuild b/gnome-base/gnome/gnome-3.2.1.ebuild
index 12f7e52e1fff..2c8dc0b4c2bd 100644
--- a/gnome-base/gnome/gnome-3.2.1.ebuild
+++ b/gnome-base/gnome/gnome-3.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.2.1.ebuild,v 1.1 2011/11/07 07:50:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.2.1.ebuild,v 1.2 2012/05/15 15:32:23 ssuominen Exp $
 
 EAPI="4"
 
@@ -44,7 +44,7 @@ RDEPEND="
 		>=gnome-base/gnome-applets-${PV}
 		>=gnome-base/gnome-fallback-${PV} )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.10.1[gdu]"
+PDEPEND="|| ( >=gnome-base/gvfs-1.10.1[udisks] >=gnome-base/gvfs-1.10.1[gdu] )"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild
index 1b1df23e6fa9..ccac18210d63 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild,v 1.8 2011/02/14 11:35:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3.ebuild,v 1.9 2012/05/15 14:06:14 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild
index c42ddd001ce3..b11697f9d757 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild,v 1.8 2011/02/14 12:52:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4.ebuild,v 1.9 2012/05/15 13:59:44 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild
index 2dae5288922f..672df6c2b62e 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild,v 1.8 2011/02/14 12:54:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4.ebuild,v 1.9 2012/05/15 14:00:56 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild
index 19e0ab05c6a4..6a98d62d8bb8 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild,v 1.8 2011/02/14 12:57:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3.ebuild,v 1.9 2012/05/15 14:04:37 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
index 7bedb4a8cf42..6ab6105d69dc 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild,v 1.8 2011/02/14 12:57:59 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild,v 1.9 2012/05/15 14:01:15 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild
index aac141a41236..13a4012091ec 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild,v 1.8 2011/02/14 12:59:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3.ebuild,v 1.9 2012/05/15 14:07:15 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild
index 6d698a3ac602..538be1299ad5 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild,v 1.7 2011/02/12 16:26:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3.ebuild,v 1.8 2012/05/15 14:11:42 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild
index f6117fd5a9ec..44f0de79aaaf 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild,v 1.7 2011/02/12 16:28:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3.ebuild,v 1.8 2012/05/15 14:11:40 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild
index 9a9232c00388..57b4243455ec 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild,v 1.8 2011/02/14 13:04:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3.ebuild,v 1.9 2012/05/15 14:04:55 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild
index e2317c944206..6c5680bc16f4 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild,v 1.8 2011/02/14 13:05:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3.ebuild,v 1.9 2012/05/15 14:11:35 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild
index 310698efc04a..dee1f8eb0847 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild,v 1.8 2011/02/14 13:06:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2.ebuild,v 1.9 2012/05/15 14:08:46 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="Bitstream Speedo fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild
index b8c893cb828f..17b259a0a479 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild,v 1.8 2011/02/14 13:07:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3.ebuild,v 1.9 2012/05/15 14:11:44 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild
index 630327f4efd9..891a51408b11 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild,v 1.8 2011/02/14 13:09:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3.ebuild,v 1.9 2012/05/15 14:07:27 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild
index 2953e4804d03..6ea138655d88 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild,v 1.8 2011/02/14 13:12:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3.ebuild,v 1.9 2012/05/15 14:07:57 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild
index 36920e3487c7..7e78c17bb718 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild,v 1.8 2011/02/14 13:16:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-jis-misc/font-jis-misc-1.0.3.ebuild,v 1.9 2012/05/15 14:02:55 aballier Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,7 +9,7 @@ EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild
index 7d82ef0e46c4..d2d0279cd176 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild,v 1.8 2011/02/14 13:19:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3.ebuild,v 1.9 2012/05/15 14:06:13 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3.ebuild
index f548d266375a..5537a96e15f8 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.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/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3.ebuild,v 1.9 2012/04/13 19:25:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3.ebuild,v 1.10 2012/05/15 14:00:34 aballier Exp $
 
 EAPI=3
 FONT_DIR="OTF"
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3.ebuild
index b5ff8a726cad..03eff59eceac 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.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/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3.ebuild,v 1.9 2012/04/13 19:26:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3.ebuild,v 1.10 2012/05/15 14:05:02 aballier Exp $
 
 EAPI=3
 FONT_DIR="OTF"
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Syriac fonts"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild
index cc762cf4361f..25527ffa4984 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild,v 1.8 2011/02/14 13:28:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3.ebuild,v 1.9 2012/05/15 14:02:57 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild
index 7462737b6678..a233c3f1971f 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild,v 1.8 2011/03/15 21:09:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2.ebuild,v 1.9 2012/05/15 14:11:40 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild
index 4738c4fd8956..bd5d15029495 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild,v 1.8 2011/02/14 13:32:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4.ebuild,v 1.9 2012/05/15 14:02:19 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild
index 7928cbeb7b50..9f8b021ccdbb 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild,v 1.8 2011/02/14 13:34:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-sony-misc/font-sony-misc-1.0.3.ebuild,v 1.9 2012/05/15 14:02:02 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Sony fonts"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild
index 7f5ec7b621b5..62595d3d23d8 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild,v 1.9 2011/02/14 13:36:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-sun-misc/font-sun-misc-1.0.3.ebuild,v 1.10 2012/05/15 14:08:52 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild
index 09cd713892b2..388bdbafd3bd 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild,v 1.8 2011/02/14 13:41:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3.ebuild,v 1.9 2012/05/15 14:03:56 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/faac/faac-1.28-r3.ebuild b/media-libs/faac/faac-1.28-r3.ebuild
index e37c2d36cb12..eee84ca2d6b6 100644
--- a/media-libs/faac/faac-1.28-r3.ebuild
+++ b/media-libs/faac/faac-1.28-r3.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/faac/faac-1.28-r3.ebuild,v 1.2 2012/04/29 10:44:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r3.ebuild,v 1.3 2012/05/15 13:04:52 aballier Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libmp4v2"
diff --git a/media-libs/flac/flac-1.2.1-r4.ebuild b/media-libs/flac/flac-1.2.1-r4.ebuild
index 8a5c56257d5a..4238b7862066 100644
--- a/media-libs/flac/flac-1.2.1-r4.ebuild
+++ b/media-libs/flac/flac-1.2.1-r4.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/flac/flac-1.2.1-r4.ebuild,v 1.2 2012/05/05 08:02:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r4.ebuild,v 1.3 2012/05/15 13:39:06 aballier Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="3dnow altivec +cxx debug ogg sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
diff --git a/media-libs/libaacplus/libaacplus-2.0.2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2.ebuild
index 984120556313..1683256774c0 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacplus/libaacplus-2.0.2.ebuild,v 1.11 2012/05/13 19:21:01 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacplus/libaacplus-2.0.2.ebuild,v 1.12 2012/05/15 13:05:56 aballier Exp $
 
 EAPI=4
 inherit autotools
@@ -19,7 +19,7 @@ SRC_URI="http://dev.gentoo.org/~aballier/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="bindist fftw static-libs"
 
 RESTRICT="mirror"
diff --git a/media-libs/libass/libass-0.10.0.ebuild b/media-libs/libass/libass-0.10.0.ebuild
index 89e503d54375..9d6e19bbfb05 100644
--- a/media-libs/libass/libass-0.10.0.ebuild
+++ b/media-libs/libass/libass-0.10.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-libs/libass/libass-0.10.0.ebuild,v 1.2 2012/05/05 08:02:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libass/libass-0.10.0.ebuild,v 1.3 2012/05/15 13:02:07 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://libass.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+enca +fontconfig harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.4.2 )
diff --git a/media-libs/libcddb/libcddb-1.3.2.ebuild b/media-libs/libcddb/libcddb-1.3.2.ebuild
index e3c9731e1224..eacf6e7ecb03 100644
--- a/media-libs/libcddb/libcddb-1.3.2.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/libcddb-1.3.2.ebuild,v 1.11 2012/03/02 09:57:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/libcddb-1.3.2.ebuild,v 1.12 2012/05/15 13:48:21 aballier Exp $
 
 EAPI=4
 inherit libtool
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libiconv"
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
index 25f51c11c031..0219f7351508 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild,v 1.7 2012/04/12 23:40:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild,v 1.8 2012/05/15 16:58:56 ssuominen Exp $
 
 EAPI=4
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
@@ -15,7 +15,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd6
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-${PV}"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
 DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
 
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 2dd3a009ded0..158e03d0f582 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.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/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.5 2012/04/12 23:40:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.7 2012/05/15 17:03:16 ssuominen Exp $
 
 EAPI=4
 WANT_AUTOCONF=2.5
 
-inherit autotools subversion
+inherit autotools eutils subversion
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
@@ -15,6 +15,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+RDEPEND=">=media-libs/libdvdread-${PV}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
+
 DOCS=( AUTHORS DEVELOPMENT-POLICY.txt ChangeLog TODO doc/dvd_structures README )
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
index 1497c09d7b20..fe3120720be4 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.8.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/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild,v 1.9 2012/05/05 08:02:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild,v 1.10 2012/05/15 13:12:50 aballier Exp $
 
 EAPI=4
 inherit autotools base
@@ -11,7 +11,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libmp4v2/libmp4v2-1.9.1_p479.ebuild b/media-libs/libmp4v2/libmp4v2-1.9.1_p479.ebuild
index 1cc05f9f2a88..6a17df306e59 100644
--- a/media-libs/libmp4v2/libmp4v2-1.9.1_p479.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-1.9.1_p479.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/libmp4v2/libmp4v2-1.9.1_p479.ebuild,v 1.2 2012/03/21 09:01:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.9.1_p479.ebuild,v 1.3 2012/05/15 13:04:48 aballier Exp $
 
 EAPI=4
 inherit libtool versionator
@@ -13,7 +13,7 @@ SRC_URI="http://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs test utils"
 
 RDEPEND=""
diff --git a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild b/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild
index 8cf5efd556f8..f46116d28fff 100644
--- a/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild
+++ b/media-libs/libpostproc/libpostproc-0.8.0.20120217.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/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.1 2012/05/14 19:12:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-0.8.0.20120217.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $
 
 EAPI="4"
 
@@ -32,12 +32,11 @@ IUSE="pic static-libs"
 # String for CPU features in the useflag[:configure_option] form
 # if :configure_option isn't set, it will use 'useflag' as configure option
 CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec mmx vis"
-
 for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
-DEPEND=">=media-video/libav-0.8"
+DEPEND=">=media-video/libav-0.8.2-r2"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -84,11 +83,3 @@ src_configure() {
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 39294180dfe9..3e56ffdf615e 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-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/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.1 2012/05/14 19:12:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpostproc/libpostproc-9999.ebuild,v 1.2 2012/05/15 08:41:37 scarabeus Exp $
 
 EAPI="4"
 
@@ -37,7 +37,7 @@ for i in ${CPU_FEATURES}; do
 	IUSE="${IUSE} ${i%:*}"
 done
 
-DEPEND=">=media-video/libav-0.8"
+DEPEND=">=media-video/libav-0.8.2-r2"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -84,11 +84,3 @@ src_configure() {
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.25.ebuild b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
index 18279acd2db7..8e836c88fab5 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25.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/libsndfile/libsndfile-1.0.25.ebuild,v 1.8 2012/05/05 08:02:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.9 2012/05/15 13:44:21 aballier Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="alsa minimal sqlite static-libs"
 
 RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
diff --git a/media-libs/libtheora/libtheora-1.1.1.ebuild b/media-libs/libtheora/libtheora-1.1.1.ebuild
index 9f4ffe0c39fa..12e90159ee06 100644
--- a/media-libs/libtheora/libtheora-1.1.1.ebuild
+++ b/media-libs/libtheora/libtheora-1.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/media-libs/libtheora/libtheora-1.1.1.ebuild,v 1.9 2012/05/05 08:02:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1.ebuild,v 1.10 2012/05/15 13:09:16 aballier Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +encode examples static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/libvorbis/libvorbis-1.3.3.ebuild b/media-libs/libvorbis/libvorbis-1.3.3.ebuild
index a02d05839596..241dcd84ebbf 100644
--- a/media-libs/libvorbis/libvorbis-1.3.3.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.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/media-libs/libvorbis/libvorbis-1.3.3.ebuild,v 1.2 2012/05/05 08:02:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.3.3.ebuild,v 1.3 2012/05/15 12:55:40 aballier Exp $
 
 EAPI=4
 inherit autotools
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libogg"
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-chost.patch b/media-libs/libvpx/files/libvpx-1.1.0-chost.patch
new file mode 100644
index 000000000000..eb6b286cd66b
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.1.0-chost.patch
@@ -0,0 +1,36 @@
+commit 871bd23e4c41bb0fb94b72832b270766de540dea
+Author: Alexis Ballier <alexis.ballier@gmail.com>
+Date:   Sat May 12 15:45:13 2012 -0400
+
+    Allow target autodetection to work when cross-compiling.
+    
+    Allow CHOST to override the gcc -dumpmachine output. This allows to
+    use the target autodetection code when cross compiling by setting the
+    CHOST variable.
+    
+    On Gentoo, we would like to support easy cross-compilation, and for
+    libvpx this would basically mean copying the code in
+    build/make/configure.sh to setup the right --target option. It seems a
+    lot easier to let it guess by itself.
+    
+    Another option I considered was using CROSS-gcc instead but this would
+    not work for our multilib setups: They use gcc -m32 to build 32bits
+    binaries and gcc -m32 -dumpmachine will output the 64bits version,
+    which would then make libvpx wrongly believe it is building for a
+    64bits architecture.
+    
+    Change-Id: I05a19be402228f749e23be7473ca53ae74fd2186
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 3c772e5..3118c0a 100755
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -549,7 +549,7 @@ setup_gnu_toolchain() {
+ 
+ process_common_toolchain() {
+     if [ -z "$toolchain" ]; then
+-        gcctarget="$(gcc -dumpmachine 2> /dev/null)"
++        gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"
+ 
+         # detect tgt_isa
+         case "$gcctarget" in
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index bbaf07dfb024..c0635f4a507e 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.8 2012/05/12 18:06:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.10 2012/05/15 13:57:24 aballier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs
+inherit multilib toolchain-funcs base
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	SRC_URI="http://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
@@ -39,6 +39,8 @@ REQUIRED_USE="
 	sse2? ( mmx )
 	"
 
+PATCHES=( "${FILESDIR}/${P}-chost.patch" )
+
 src_configure() {
 	#let the build system decide which AS to use (it honours $AS but
 	#then feeds it with yasm flags without checking...) bug 345161
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index b907619f7719..9414355b0e73 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-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/media-libs/libvpx/libvpx-9999.ebuild,v 1.24 2012/05/12 18:06:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.25 2012/05/15 13:57:24 aballier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	SRC_URI="http://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/media-libs/openal/openal-1.13.ebuild b/media-libs/openal/openal-1.13.ebuild
index db3f71c525cb..e5cf6d9d7a6b 100644
--- a/media-libs/openal/openal-1.13.ebuild
+++ b/media-libs/openal/openal-1.13.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/openal/openal-1.13.ebuild,v 1.7 2012/03/02 20:50:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.13.ebuild,v 1.8 2012/05/15 13:52:18 aballier Exp $
 
 EAPI=3
 inherit cmake-utils
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="alsa debug oss portaudio pulseaudio"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.3.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.3.ebuild
index f9cbe498d740..a91f1177494d 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.3.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.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/media-libs/opencore-amr/opencore-amr-0.1.3.ebuild,v 1.1 2012/02/20 21:06:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencore-amr/opencore-amr-0.1.3.ebuild,v 1.2 2012/05/15 12:57:04 aballier Exp $
 
 EAPI=2
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/media-libs/schroedinger/schroedinger-1.0.11.ebuild b/media-libs/schroedinger/schroedinger-1.0.11.ebuild
index 60c36c3733cb..6d33624e1911 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.11.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/schroedinger/schroedinger-1.0.11.ebuild,v 1.4 2012/05/05 08:02:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11.ebuild,v 1.5 2012/05/15 13:42:36 aballier Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-lang/orc-0.4.16"
diff --git a/media-libs/speex/speex-1.2_rc1-r1.ebuild b/media-libs/speex/speex-1.2_rc1-r1.ebuild
index f79a27790566..125bff789f94 100644
--- a/media-libs/speex/speex-1.2_rc1-r1.ebuild
+++ b/media-libs/speex/speex-1.2_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r1.ebuild,v 1.2 2012/05/05 08:02:36 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/speex/speex-1.2_rc1-r1.ebuild,v 1.3 2012/05/15 13:10:33 aballier Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="ogg sse static-libs"
 
 RDEPEND="ogg? ( media-libs/libogg )"
diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild
index 4108db6ae4f3..bdb474cf55cf 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild,v 1.3 2012/04/14 18:26:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-aacenc/vo-aacenc-0.1.2.ebuild,v 1.4 2012/05/15 13:08:05 aballier Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples static-libs neon"
 
 src_prepare() {
diff --git a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 939797b9547d..c99dd4a30fc1 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-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/media-libs/vo-aacenc/vo-aacenc-9999.ebuild,v 1.7 2012/04/14 18:26:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-aacenc/vo-aacenc-9999.ebuild,v 1.8 2012/05/15 13:08:05 aballier Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples static-libs neon"
 
 src_prepare() {
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild
index 72b65574d37e..67ea5e86ae01 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild,v 1.1 2012/02/20 21:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.2.ebuild,v 1.2 2012/05/15 13:09:37 aballier Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
 src_prepare() {
diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
index 4b2bd6c2ebce..7a83e55de86b 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-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/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild,v 1.4 2012/02/20 21:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild,v 1.5 2012/05/15 13:09:37 aballier Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples static-libs"
 
 src_prepare() {
diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild
index 863434cb472c..6a9273edf4c4 100644
--- a/media-libs/x264/x264-0.0.20120327.ebuild
+++ b/media-libs/x264/x264-0.0.20120327.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/x264/x264-0.0.20120327.ebuild,v 1.1 2012/03/28 18:43:18 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120327.ebuild,v 1.2 2012/05/15 13:12:19 aballier Exp $
 
 EAPI=4
 
@@ -29,8 +29,7 @@ SLOT="0"
 if [ "${PV#9999}" != "${PV}" ]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
-	~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index fb03e45cdd44..826e7ff92d14 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-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/media-libs/x264/x264-9999.ebuild,v 1.3 2012/02/04 11:48:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.4 2012/05/15 13:12:19 aballier Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ SLOT="0"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 IUSE="debug +threads pic static-libs"
 
diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild
index 9d77a31bf9bc..c2079dd6ab64 100644
--- a/media-sound/gsm/gsm-1.0.13.ebuild
+++ b/media-sound/gsm/gsm-1.0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.6 2011/06/14 04:39:07 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gsm/gsm-1.0.13.ebuild,v 1.7 2012/05/15 12:59:33 aballier Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
diff --git a/media-sound/lame/lame-3.99.5.ebuild b/media-sound/lame/lame-3.99.5.ebuild
index cc748fc7ad9a..c639a97c9360 100644
--- a/media-sound/lame/lame-3.99.5.ebuild
+++ b/media-sound/lame/lame-3.99.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/media-sound/lame/lame-3.99.5.ebuild,v 1.2 2012/05/05 08:39:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5.ebuild,v 1.3 2012/05/15 13:45:24 aballier Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug mmx mp3rtp sndfile static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7
diff --git a/media-video/dirac/dirac-1.0.2.ebuild b/media-video/dirac/dirac-1.0.2.ebuild
index 95e6c1522736..941f2b89ba57 100644
--- a/media-video/dirac/dirac-1.0.2.ebuild
+++ b/media-video/dirac/dirac-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-1.0.2.ebuild,v 1.11 2011/10/23 23:40:11 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-1.0.2.ebuild,v 1.12 2012/05/15 13:07:41 aballier Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc mmx static-libs"
 
 RDEPEND=""
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 43c977c2dbd5..d46f9dd81804 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,2 @@
 DIST ffmpeg-0.10.2.tar.bz2 5780204 RMD160 b9dd617935e106e4a1980167bdb7ec8d76d3f2f7 SHA1 743f44a71f93b14c9b26ca2424b0da8457cef4be SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
 DIST ffmpeg-0.10.3.tar.bz2 5855494 RMD160 1fa566eb75489ed48faf8f818561399b3d426791 SHA1 4fb6f682dbc1b4ea54178040d515fc3a4c05d415 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f
-DIST ffmpeg-0.10.tar.bz2 5778962 RMD160 a60568d4e8bd1a44a2c986e0648cfacba766bcd4 SHA1 a3a7fe25db760a99d51266b33386da9c8552feef SHA256 43596aa76d1a0fab6d42927bf60383405de2bca8fbc740c2012877559ae17ff9
-DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c SHA1 df4983c028a61d4bf3baceab3bae535b91b8928a SHA256 548197968e69b732c12b2cad3173eb6933a9573a7b1f5b29be36d31b9977c9f3
diff --git a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild b/media-video/ffmpeg/ffmpeg-0.10.3.ebuild
index 592851ddb0ed..adcddef89089 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.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/media-video/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.1 2012/05/08 22:49:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.2 2012/05/15 13:57:24 aballier Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug
diff --git a/media-video/ffmpeg/ffmpeg-0.10.ebuild b/media-video/ffmpeg/ffmpeg-0.10.ebuild
deleted file mode 100644
index 52954d880efc..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.ebuild,v 1.9 2012/05/05 08:58:57 jdhore Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-IUSE="
-	aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug
-	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
-	jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio
-	+qt-faststart rtmp schroedinger sdl speex static-libs test theora threads
-	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ass? ( media-libs/libass )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
-	celt? ( >=media-libs/celt-0.11.1 )
-	dirac? ( media-video/dirac )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20111017 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( net-libs/gnutls )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
-	doc? ( app-text/texi2html )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	test? ( encode zlib )"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
-
-	# enabled by default
-	for i in debug doc network vaapi vdpau zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
-	for i in gnutls ; do
-		use $i && myconf="${myconf} --enable-$i"
-	done
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
-		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use cdio && myconf="${myconf} --enable-libcdio"
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	use openal && myconf="${myconf} --enable-openal"
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf="${myconf} --disable-indev=v4l"
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-	use pulseaudio && myconf="${myconf} --enable-libpulse"
-	use libv4l && myconf="${myconf} --enable-libv4l2"
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-	use truetype && myconf="${myconf} --enable-libfreetype"
-	use ass && myconf="${myconf} --enable-libass"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
-	done
-	if use pic ; then
-		myconf="${myconf} --enable-pic"
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
-	fi
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		${version3}
-		--enable-postproc
-		--enable-avfilter
-		--disable-stripping
-		${myconf}"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	cd "${S}"
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc -r doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.7.8.ebuild b/media-video/ffmpeg/ffmpeg-0.7.8.ebuild
deleted file mode 100644
index 74ec2d31024d..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.7.8.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.8.ebuild,v 1.8 2012/05/05 08:58:57 jdhore Exp $
-
-EAPI="2"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-IUSE="
-	+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection
-	custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables
-	ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic +qt-faststart rtmp
-	schroedinger sdl speex +ssse3 static-libs test theora threads truetype
-	v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	celt? ( >=media-libs/celt-0.11.1 )
-	dirac? ( media-video/dirac )
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20110426 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	zlib? ( sys-libs/zlib )
-	!media-video/qt-faststart
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
-	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}"/${PN}-0.7.6-fix_ppc64_32ul.patch #387207
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-	# Set to --enable-version3 if (L)GPL-3 is required
-	local version3=""
-
-	# enabled by default
-	for i in debug doc network vaapi zlib; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use bzip2 || myconf="${myconf} --disable-bzlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
-	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
-	#done
-	use video_cards_nvidia && use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# Encoders
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
-		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
-		for i in theora vorbis x264 xvid; do
-			use ${i} && myconf="${myconf} --enable-lib${i}"
-		done
-		if use bindist
-		then
-			use faac && ewarn "faac is nonfree and cannot be distributed;
-			disabling faac support."
-		else
-			use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
-		fi
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	# Indevs
-	# v4l1 gone since linux-headers-2.6.38
-	myconf="${myconf} --disable-indev=v4l"
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
-	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
-	done
-	# libavfilter options
-	use frei0r && myconf="${myconf} --enable-frei0r"
-	use truetype && myconf="${myconf} --enable-libfreetype"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
-	for i in celt gsm dirac rtmp schroedinger speex vpx; do
-		use ${i} && myconf="${myconf} --enable-lib${i}"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-
-	# CPU features
-	for i in mmx ssse3 altivec avx ; do
-		use ${i} || myconf="${myconf} --disable-${i}"
-	done
-	use mmxext || myconf="${myconf} --disable-mmx2"
-	use 3dnow || myconf="${myconf} --disable-amd3dnow"
-	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && use x86 ; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf="${myconf} --enable-pic"
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="
-		--enable-gpl
-		${version3}
-		--enable-postproc
-		--enable-avfilter
-		--disable-stripping
-		${myconf}"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd "${S}"
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die
-
-	dodoc README INSTALL
-	dodoc doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart || die
-	fi
-}
-
-src_test() {
-	if use encode ; then
-		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-			emake test || die "Some tests failed"
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f0896d59cf9f..7e23d29cbb84 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.90 2012/05/12 00:24:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.91 2012/05/15 13:57:24 aballier Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
 LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="
 	aac aacplus alsa amr ass bindist bluray +bzip2 cdio celt cpudetection debug
diff --git a/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch b/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch
deleted file mode 100644
index 9754d5fd5a19..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Autodetect PowerPC vs. PowerPC64.
-
-This is the same code as for x86_64.
-This is necessary because uname returns PPC64 if the hardware
-is 64 bit, however the userland can still be fully 32 bit.
-In that case FFmpeg fails to compile because some macros in the
-asm code are set up incorrectly.
-For details see https://bugs.gentoo.org/show_bug.cgi?id=341235
-https://bugs.gentoo.org/show_bug.cgi?id=387207
-
-author: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-
-diff --git a/configure b/configure
-index 6aa194c..0752d73 100755
---- a/configure
-+++ b/configure
-@@ -2188,13 +2188,9 @@ case "$arch" in
-         arch="parisc"
-         subarch="parisc64"
-     ;;
--    "Power Macintosh"|ppc|powerpc)
-+    "Power Macintosh"|ppc|powerpc|ppc64|powerpc64)
-         arch="ppc"
-     ;;
--    ppc64|powerpc64)
--        arch="ppc"
--        subarch="ppc64"
--    ;;
-     s390|s390x)
-         arch="s390"
-     ;;
-@@ -2392,6 +2388,11 @@ EOF
-             spic=$shared
-         fi
-     ;;
-+    ppc)
-+        check_cc <<EOF && subarch="ppc64"
-+        int test[(int)sizeof(char*) - 7];
-+EOF
-+    ;;
- esac
- 
- enable $subarch
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 0b75b158bbcf..617e548641ea 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -28,7 +28,6 @@
     <flag name="network">Enables network streaming support</flag>
 	<flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
     <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
-	<flag name="qt-faststart">Build and install qt-faststart application</flag>
     <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
     <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index 7f1b55f8d713..d4fe008221d4 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -1 +1,2 @@
 DIST kdenlive-0.8.2.1.tar.gz 5135630 RMD160 443ad814827220cd7985cf3160e77f6e6899a1cf SHA1 14c3d17ed3388ef6f90a00f4d5f58934307e3e40 SHA256 a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717
+DIST kdenlive-0.9.tar.gz 6912159 RMD160 859250beed005c3eaffa45af5224bfaac1ac5c39 SHA1 fdd88e688a607e1fbf515f704951091c5d94cbdf SHA256 9982a619e5a25ad8ebcc85b3860b926baf1aef3bc5d6883af6f5fc2cc97e4dc2
diff --git a/media-video/kdenlive/kdenlive-0.9.ebuild b/media-video/kdenlive/kdenlive-0.9.ebuild
new file mode 100644
index 000000000000..04a2c111ccb8
--- /dev/null
+++ b/media-video/kdenlive/kdenlive-0.9.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/media-video/kdenlive/kdenlive-0.9.ebuild,v 1.2 2012/05/15 15:32:37 johu Exp $
+
+EAPI=4
+KDE_LINGUAS="ca cs da de el es et fi fr ga gl he hr hu it ja lt nb nds nl pl pt
+pt_BR ru sk sl sv tr uk zh zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE."
+HOMEPAGE="http://www.kdenlive.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+IUSE="debug semantic-desktop"
+
+RDEPEND="
+	dev-libs/qjson
+	>=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde]
+	virtual/ffmpeg[encode,sdl,X]
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 89900cda7b5d..ccdee3a8cdb2 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-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/media-video/libav/libav-9999.ebuild,v 1.45 2012/05/15 06:10:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.47 2012/05/15 08:31:57 scarabeus Exp $
 
 EAPI=4
 
@@ -27,63 +27,78 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
-	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
-	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
-	  oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
-	  test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
-
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
-neon ssse3 vis"
-
-for i in ${CPU_FEATURES}; do
+IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
+	+encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
+	x264 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
+for i in ${CPU_FEATURES} ; do
 	IUSE+=" ${i%:*}"
 done
 
+TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
+
 RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode]
+			media-libs/libogg
+		)
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	truetype? ( media-libs/freetype:2 )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	rtmp? ( >=media-video/rtmpdump-2.4 )
 	pulseaudio? ( media-sound/pulseaudio )
-	ssl? ( openssl? ( dev-libs/openssl )
-		   !openssl? ( net-libs/gnutls ) )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
+	ssl? (
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
+	)
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
+	truetype? ( media-libs/freetype:2 )
 	vaapi? ( x11-libs/libva )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
 	zlib? ( sys-libs/zlib )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
-	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
+	ieee1394? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
+	ssl? ( virtual/pkgconfig )
+	test? ( sys-devel/bc )
 	truetype? ( virtual/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
 "
@@ -94,9 +109,12 @@ DEPEND="${RDEPEND}
 # amr and aac require at least lgpl3
 # x264 requires gpl2
 REQUIRED_USE="bindist? ( !faac !openssl )
-			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+	test? ( encode zlib )
+"
 
+# Test on live ebuild are not possible as they require trunk fate
 RESTRICT="test"
 
 src_prepare() {
@@ -106,20 +124,18 @@ src_prepare() {
 	fi
 }
 
-TOOLS="aviocat graph2dot ismindex qt-faststart"
-
 src_configure() {
 	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
+	use zlib && TOOLS+=" cws2fws"
+
 	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-avfilter
 	"
 
-	use zlib && TOOLS+=" cws2fws"
-
 	# enabled by default
 	uses="debug doc network zlib"
 	for i in ${uses}; do
@@ -130,27 +146,23 @@ src_configure() {
 
 	if use ssl; then
 		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-					|| myconf+=" --enable-gnutls"
+			|| myconf+=" --enable-gnutls"
 	fi
 
 	use custom-cflags && myconf+=" --disable-optimizations"
 	use cpudetection && myconf+=" --enable-runtime-cpudetect"
 
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
-	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
-	#done
 	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"
 
 	# Encoders
 	if use encode; then
+		use faac && myconf+=" --enable-nonfree"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
-		use faac && myconf+=" --enable-libfaac --enable-nonfree"
 		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="theora vorbis x264 xvid"
+		uses="faac theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -162,6 +174,7 @@ src_configure() {
 	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	use pulseaudio && myconf+=" --enable-libpulse"
+
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -183,7 +196,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm dirac rtmp schroedinger speex vpx"
+	uses="gsm rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -212,8 +225,7 @@ src_configure() {
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
+		[[ "${i}" == "native" ]] && i="host" # bug #273421
 		myconf+=" --cpu=${i}"
 		break
 	done
@@ -254,22 +266,27 @@ src_configure() {
 
 	cd "${S}"
 	./configure \
-		--prefix="$EPREFIX"/usr \
-		--libdir="$EPREFIX"/usr/$(get_libdir) \
-		--shlibdir="$EPREFIX"/usr/$(get_libdir) \
-		--mandir="$EPREFIX"/usr/share/man \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
 		--enable-shared \
 		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
 src_compile() {
+	local i
+
 	emake
 
 	if use tools; then
 		tc-export CC
-		local i
+
 		for i in ${TOOLS}; do
 			emake tools/${i}
 		done
@@ -278,6 +295,7 @@ src_compile() {
 
 src_install() {
 	local i
+
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
@@ -303,5 +321,6 @@ pkg_postinst() {
 }
 
 src_test() {
-	ewarn "Live ebuild needs the current fate repository. Skipping for now"
+	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake V=1 -j1 fate
 }
diff --git a/media-video/rtmpdump/rtmpdump-2.4.ebuild b/media-video/rtmpdump/rtmpdump-2.4.ebuild
index 4d08904e4466..73767234be75 100644
--- a/media-video/rtmpdump/rtmpdump-2.4.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.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/media-video/rtmpdump/rtmpdump-2.4.ebuild,v 1.2 2012/03/20 23:31:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4.ebuild,v 1.3 2012/05/15 13:46:49 aballier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 # the library is LGPL-2.1, the command is GPL-2
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gnutls polarssl ssl"
 
 DEPEND="ssl? (
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7a02e7823af9..ddb817c35c8c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,5 +1,4 @@
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
-DIST vlc-2.0.0.tar.xz 17144876 RMD160 6c4d1401a7cc5b1c66dde7eb896347a728961d2b SHA1 c28c4c8128110fd02a7bdf55c9dad5cc20eb91b8 SHA256 455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106
 DIST vlc-2.0.1.tar.xz 17210552 RMD160 9d932e1be72b65cf47057191d9e84deeedea282c SHA1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
diff --git a/media-video/vlc/vlc-2.0.0.ebuild b/media-video/vlc/vlc-2.0.0.ebuild
deleted file mode 100644
index 21094d6ba6cf..000000000000
--- a/media-video/vlc/vlc-2.0.0.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.0.ebuild,v 1.6 2012/05/05 08:58:52 jdhore Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP="bootstrap"
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-PATCHLEVEL="101"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
-	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
-	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
-	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
-	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio
-	+postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
-	sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
-	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
-		>=sys-libs/zlib-1.2.5.1-r2[minizip]
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23 )
-		avahi? ( >=net-dns/avahi-0.6[dbus] )
-		avcodec? ( virtual/ffmpeg )
-		avformat? ( virtual/ffmpeg )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		bluray? ( >=media-libs/libbluray-0.2.1 )
-		cddb? ( >=media-libs/libcddb-1.2.0 )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB sys-libs/zlib )
-		dts? ( media-libs/libdca )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 )
-		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
-		egl? ( virtual/opengl )
-		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
-		fluidsynth? ( media-sound/fluidsynth )
-		fontconfig? ( media-libs/fontconfig )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
-		gme? ( media-libs/game-music-emu )
-		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-2.0.0 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
-		ios-vout? ( virtual/opengl )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-		libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 )
-		libproxy? ( net-libs/libproxy )
-		libsamplerate? ( media-libs/libsamplerate )
-		libtar? ( >=dev-libs/libtar-1.2.11-r3 )
-		libtiger? ( media-libs/libtiger )
-		linsys? ( >=media-libs/zvbi-0.2.28 )
-		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2011.12.23 )
-		lua? ( >=dev-lang/lua-5.1 )
-		macosx-vout? ( virtual/opengl )
-		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		musepack? ( >=media-sound/musepack-tools-444 )
-		ncurses? ( sys-libs/ncurses[unicode] )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
-		png? ( media-libs/libpng sys-libs/zlib )
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( virtual/ffmpeg )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-		samba? ( >=net-fs/samba-3.4.6[smbclient] )
-		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
-		shout? ( media-libs/libshout )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext x11-libs/libXpm )
-		speex? ( media-libs/speex )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		swscale? ( virtual/ffmpeg )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( media-libs/freetype virtual/ttf-fonts
-			!fontconfig? ( media-fonts/dejavu ) )
-		twolame? ( media-sound/twolame )
-		udev? ( >=sys-fs/udev-142 )
-		upnp? ( net-libs/libupnp )
-		v4l? ( media-libs/libv4l )
-		vaapi? ( x11-libs/libva )
-		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
-		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
-		X? ( x11-libs/libX11 )
-		x264? ( >=media-libs/x264-0.0.20090923 )
-		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	fbosd? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	xcb? ( x11-proto/xproto )
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	egl? ( X )
-	ffmpeg? ( avcodec avformat postproc swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	libtar? ( skins )
-	libtiger? ( kate )
-	media-library? ( sqlite )
-	qt4? ( X )
-	sdl? ( X )
-	skins? ( truetype qt4 X )
-	switcher? ( avcodec )
-	vaapi? ( avcodec X )
-	vlm? ( encode )
-	xosd? ( X )
-	xv? ( xcb )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-2_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	eautoreconf
-}
-
-src_configure() {
-	# needs libresid-builder from libsidplay:2 which is in another directory...
-	# FIXME!
-	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avahi bonjour) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable direct2d) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dshow) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable egl) \
-		$(use_enable encode sout) \
-		$(use_enable fbosd) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable ios-vout) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-audio) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable macosx-vout) \
-		$(use_enable matroska mkv) \
-		$(use_enable media-library) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) \
-		$(use_enable omxil) \
-		$(use_enable opengl glx) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		$(use_enable portaudio) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shine) \
-		$(use_enable sid) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sqlite) \
-		$(use_enable sse) \
-		$(use_enable svg) \
-		$(use_enable switcher) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable waveout) \
-		$(use_enable win32codecs loader) \
-		$(use_enable wingdi) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-optimizations \
-		--without-tuning \
-		--enable-fast-install
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS THANKS NEWS README \
-		doc/fortunes.txt doc/intf-vcd.txt
-
-	# Punt useless libtool's .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index a80037f4657b..67a014c69e1f 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.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/media-video/vlc/vlc-2.0.9999.ebuild,v 1.8 2012/05/14 19:45:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.9 2012/05/15 13:30:42 aballier Exp $
 
 EAPI="4"
 
@@ -167,6 +167,7 @@ REQUIRED_USE="
 	swscale? ( ffmpeg )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
+	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
 	media-library? ( sqlite )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index ff9f3a112534..bb4b5fece321 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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/media-video/vlc/vlc-9999.ebuild,v 1.166 2012/05/14 19:45:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.169 2012/05/15 13:40:37 aballier Exp $
 
 EAPI="4"
 
@@ -46,7 +46,7 @@ fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
 	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
-	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
@@ -55,7 +55,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger
 	sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher
 	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
+	win32codecs wingdi wma-fixed +X x264 +xcb xml xv zvbi"
 
 RDEPEND="
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
@@ -142,13 +142,11 @@ RDEPEND="
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
 		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
 		zvbi? ( >=media-libs/zvbi-0.2.25 )
 		"
 
 DEPEND="${RDEPEND}
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	fbosd? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	xcb? ( x11-proto/xproto )
 	app-arch/xz-utils
@@ -166,6 +164,7 @@ REQUIRED_USE="
 	swscale? ( ffmpeg )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
+	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
 	media-library? ( sqlite )
@@ -175,7 +174,6 @@ REQUIRED_USE="
 	switcher? ( avcodec )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
-	xosd? ( X )
 	xv? ( xcb )
 "
 
@@ -231,7 +229,6 @@ src_configure() {
 		$(use_enable dxva2) \
 		$(use_enable egl) \
 		$(use_enable encode sout) \
-		$(use_enable fbosd) \
 		$(use_enable flac) \
 		$(use_enable fluidsynth) \
 		$(use_enable fontconfig) \
@@ -241,7 +238,7 @@ src_configure() {
 		$(use_enable gnutls) \
 		$(use_enable growl) \
 		$(use_enable httpd) \
-		$(use_enable ieee1394 dv) \
+		$(use_enable ieee1394 dv1394) \
 		$(use_enable ios-vout) \
 		$(use_enable jack) \
 		$(use_enable kate) \
@@ -319,7 +316,6 @@ src_configure() {
 		$(use_enable x264) \
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-optimizations \
diff --git a/metadata/cache/app-arch/createrepo-0.9.7 b/metadata/cache/app-arch/createrepo-0.9.7
deleted file mode 100644
index 555c0f1f612a..000000000000
--- a/metadata/cache/app-arch/createrepo-0.9.7
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/python >=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python]
-0
-http://createrepo.baseurl.org/download/createrepo-0.9.7.tar.gz
-
-http://createrepo.baseurl.org/
-GPL-2
-Creates a common metadata repository
-~amd64 ~x86
-
-
-
-
-
-2
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-arch/createrepo-0.9.7-r1 b/metadata/cache/app-arch/createrepo-0.9.7-r1
deleted file mode 100644
index a433db7f1413..000000000000
--- a/metadata/cache/app-arch/createrepo-0.9.7-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
->=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-0
-http://createrepo.baseurl.org/download/createrepo-0.9.7.tar.gz
-
-http://createrepo.baseurl.org/
-GPL-2
-Creates a common metadata repository
-~amd64 ~x86
-multilib python toolchain-funcs
-
-
-
-
-3
-
-compile install setup
-
-
-
-
-
diff --git a/metadata/cache/app-arch/createrepo-0.9.8 b/metadata/cache/app-arch/createrepo-0.9.8
deleted file mode 100644
index f4c561333b2a..000000000000
--- a/metadata/cache/app-arch/createrepo-0.9.8
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/python >=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] >=sys-apps/yum-3.2.23
-0
-http://createrepo.baseurl.org/download/createrepo-0.9.8.tar.gz
-
-http://createrepo.baseurl.org/
-GPL-2
-Creates a common metadata repository
-~amd64 ~x86
-
-
-
-
-
-2
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-arch/createrepo-0.9.8-r1 b/metadata/cache/app-arch/createrepo-0.9.8-r1
deleted file mode 100644
index 591f8b73e28c..000000000000
--- a/metadata/cache/app-arch/createrepo-0.9.8-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
->=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] >=sys-apps/yum-3.2.23 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-0
-http://createrepo.baseurl.org/download/createrepo-0.9.8.tar.gz
-
-http://createrepo.baseurl.org/
-GPL-2
-Creates a common metadata repository
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-
-
-
-
-3
-
-compile install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-arch/createrepo-0.9.9 b/metadata/cache/app-arch/createrepo-0.9.9
new file mode 100644
index 000000000000..7999b0006d13
--- /dev/null
+++ b/metadata/cache/app-arch/createrepo-0.9.9
@@ -0,0 +1,22 @@
+=dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+>=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.1.1[python] dev-libs/libxml2[python] >=app-arch/deltarpm-3.6_pre20110223[python] dev-python/pyliblzma >=sys-apps/yum-3.4.3 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+0
+http://createrepo.baseurl.org/download/createrepo-0.9.9.tar.gz http://dev.gentoo.org/~pacho/maintainer-needed/createrepo-0.9.9-head.patch.bz2
+
+http://createrepo.baseurl.org/
+GPL-2
+Creates a common metadata repository
+~amd64 ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+4
+
+compile install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-arch/deltarpm-3.5 b/metadata/cache/app-arch/deltarpm-3.5
deleted file mode 100644
index 9bb3e47539e4..000000000000
--- a/metadata/cache/app-arch/deltarpm-3.5
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5
-sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5
-0
-ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-3.5.tar.bz2
-
-ftp://ftp.suse.com/pub/projects/deltarpm/
-BSD
-tools to create and apply deltarpms
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-3
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-arch/deltarpm-3.6_pre20110223 b/metadata/cache/app-arch/deltarpm-3.6_pre20110223
new file mode 100644
index 000000000000..ded19579bb61
--- /dev/null
+++ b/metadata/cache/app-arch/deltarpm-3.6_pre20110223
@@ -0,0 +1,22 @@
+sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? ( =dev-lang/python-2.7* )
+python? ( =dev-lang/python-2.7* )
+0
+http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/deltarpm-git-20110223.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/deltarpm-git-20110223.tar.bz2
+
+http://gitorious.org/deltarpm/deltarpm
+BSD
+tools to create and apply deltarpms
+~amd64 ~x86
+eutils multilib python toolchain-funcs user
+python
+
+
+
+4
+
+compile prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-doc/elisp-manual-23.4 b/metadata/cache/app-doc/elisp-manual-23.4
new file mode 100644
index 000000000000..12145f07eb82
--- /dev/null
+++ b/metadata/cache/app-doc/elisp-manual-23.4
@@ -0,0 +1,22 @@
+app-arch/xz-utils
+
+23
+mirror://gentoo/elisp-manual-23.4.tar.xz
+
+http://www.gnu.org/software/emacs/manual/
+FDL-1.3
+The GNU Emacs Lisp Reference Manual
+~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/app-i18n/enca-1.13-r2 b/metadata/cache/app-i18n/enca-1.13-r2
index 90e7ac4a6859..14cbe8e57b35 100644
--- a/metadata/cache/app-i18n/enca-1.13-r2
+++ b/metadata/cache/app-i18n/enca-1.13-r2
@@ -6,7 +6,7 @@ http://dl.cihar.com/enca/enca-1.13.tar.bz2
 http://gitorious.org/enca
 GPL-2
 ENCA detects the character coding of a file and converts it if desired
-alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 doc +recode
 
diff --git a/metadata/cache/app-office/libreoffice-bin-debug-3.5.2.2-r1 b/metadata/cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
index de6a7711ae15..737461209274 100644
--- a/metadata/cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
+++ b/metadata/cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
@@ -1,12 +1,12 @@
 
 =app-office/libreoffice-bin-3.5.2.2-r1[gnome=,java=,kde=]
 0
-x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) )
+amd64? ( kde? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) )
 test strip
 http://www.libreoffice.org
 LGPL-3
 LibreOffice, a full office productivity suite. Binary package, debug info.
--* ~x86
+-* ~amd64 ~x86
 
 gnome java kde
 
diff --git a/metadata/cache/app-text/recode-3.6_p17-r2 b/metadata/cache/app-text/recode-3.6_p17-r2
index c46d1dcb1c76..481144a59c77 100644
--- a/metadata/cache/app-text/recode-3.6_p17-r2
+++ b/metadata/cache/app-text/recode-3.6_p17-r2
@@ -6,7 +6,7 @@ mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_
 http://recode.progiciels-bpi.ca/
 GPL-2
 Convert files between various character sets
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 nls static-libs
 
diff --git a/metadata/cache/app-vim/automatictexplugin-11 b/metadata/cache/app-vim/automatictexplugin-11
new file mode 100644
index 000000000000..d38ca470de5c
--- /dev/null
+++ b/metadata/cache/app-vim/automatictexplugin-11
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+|| ( app-editors/vim[python] app-editors/gvim[python] ) !app-vim/vim-latex app-vim/align app-text/wdiff >=dev-lang/python-2.7 dev-python/psutil dev-tex/latexmk dev-tex/detex virtual/tex-base || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+0
+mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_11.tar.gz
+
+http://atp-vim.sourceforge.net/
+GPL-3
+vim plugin: a comprehensive plugin for editing LaTeX files
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/pango-0.12.3 b/metadata/cache/dev-haskell/pango-0.12.3
new file mode 100644
index 000000000000..150479107fad
--- /dev/null
+++ b/metadata/cache/dev-haskell/pango-0.12.3
@@ -0,0 +1,22 @@
+=dev-haskell/cairo-0.12*[profile?] =dev-haskell/glib-0.12*[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango dev-haskell/gtk2hs-buildtools doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour )
+=dev-haskell/cairo-0.12*[profile?] =dev-haskell/glib-0.12*[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/pango/0.12.3/pango-0.12.3.tar.gz
+
+http://projects.haskell.org/gtk2hs/
+LGPL-2.1
+Binding to the Pango text rendering engine.
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/orc-0.4.16 b/metadata/cache/dev-lang/orc-0.4.16
index a0e79dcd893f..6a7072ff260b 100644
--- a/metadata/cache/dev-lang/orc-0.4.16
+++ b/metadata/cache/dev-lang/orc-0.4.16
@@ -6,7 +6,7 @@ http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
 http://code.entropywave.com/projects/orc/
 BSD BSD-2
 The Oil Runtime Compiler
-~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 static-libs examples
 
diff --git a/metadata/cache/dev-lang/python-2.6.8 b/metadata/cache/dev-lang/python-2.6.8
index 60b88784a35d..29be5c6f73d2 100644
--- a/metadata/cache/dev-lang/python-2.6.8
+++ b/metadata/cache/dev-lang/python-2.6.8
@@ -6,7 +6,7 @@ http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/pyth
 http://www.python.org/
 PSF-2
 Python is an interpreted, interactive, object-oriented programming language.
-alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
 -berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
 
diff --git a/metadata/cache/dev-lang/python-3.1.5 b/metadata/cache/dev-lang/python-3.1.5
index 9ef7b78ffbbf..93a2f25c1bf6 100644
--- a/metadata/cache/dev-lang/python-3.1.5
+++ b/metadata/cache/dev-lang/python-3.1.5
@@ -6,7 +6,7 @@ http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/pytho
 http://www.python.org/
 PSF-2
 Python is an interpreted, interactive, object-oriented programming language.
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
 build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
 
diff --git a/metadata/cache/dev-lang/python-3.2.3 b/metadata/cache/dev-lang/python-3.2.3
index 65a6cc1b2a78..752247ba6bb4 100644
--- a/metadata/cache/dev-lang/python-3.2.3
+++ b/metadata/cache/dev-lang/python-3.2.3
@@ -6,7 +6,7 @@ http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/pytho
 http://www.python.org/
 PSF-2
 Python is an interpreted, interactive, object-oriented programming language.
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib pax-utils python toolchain-funcs user
 build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
 
diff --git a/metadata/cache/dev-lang/swi-prolog-6.0.1 b/metadata/cache/dev-lang/swi-prolog-6.0.1
index 392293a4d348..0fce63f163a6 100644
--- a/metadata/cache/dev-lang/swi-prolog-6.0.1
+++ b/metadata/cache/dev-lang/swi-prolog-6.0.1
@@ -1,7 +1,7 @@
 sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-http://www.swi-prolog.org/download/stable/src/pl-6.0.1.tar.gz mirror://gentoo/swi-prolog-6.0.1-gentoo-patchset-0.tar.gz
+http://www.swi-prolog.org/download/stable/src/pl-6.0.1.tar.gz mirror://gentoo/swi-prolog-6.0.1-gentoo-patchset-1.tar.gz
 
 http://www.swi-prolog.org/
 LGPL-2.1
diff --git a/metadata/cache/dev-lang/swi-prolog-6.1.4 b/metadata/cache/dev-lang/swi-prolog-6.1.4
index 726393b52a4f..ab4ed21b992b 100644
--- a/metadata/cache/dev-lang/swi-prolog-6.1.4
+++ b/metadata/cache/dev-lang/swi-prolog-6.1.4
@@ -1,7 +1,7 @@
 sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-http://www.swi-prolog.org/download/devel/src/pl-6.1.4.tar.gz mirror://gentoo/swi-prolog-6.1.4-gentoo-patchset-0.tar.gz
+http://www.swi-prolog.org/download/devel/src/pl-6.1.4.tar.gz mirror://gentoo/swi-prolog-6.1.4-gentoo-patchset-1.tar.gz
 
 http://www.swi-prolog.org/
 LGPL-2.1
diff --git a/metadata/cache/dev-lang/v8-3.9.24.21 b/metadata/cache/dev-lang/v8-3.9.24.21
index 61bfc7a28c1a..a7ffc0daec15 100644
--- a/metadata/cache/dev-lang/v8-3.9.24.21
+++ b/metadata/cache/dev-lang/v8-3.9.24.21
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.9.24.21.t
 http://code.google.com/p/v8
 BSD
 Google's open source JavaScript engine
-~amd64 ~x86 ~x64-macos ~x86-macos
+~amd64 x86 ~x64-macos ~x86-macos
 eutils multilib pax-utils python toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/dev-libs/fribidi-0.19.2-r1 b/metadata/cache/dev-libs/fribidi-0.19.2-r1
index 1aeba03a7146..870af304dafe 100644
--- a/metadata/cache/dev-libs/fribidi-0.19.2-r1
+++ b/metadata/cache/dev-libs/fribidi-0.19.2-r1
@@ -6,7 +6,7 @@ http://fribidi.org/download/fribidi-0.19.2.tar.gz
 http://fribidi.org/
 LGPL-2.1
 A free implementation of the unicode bidirectional algorithm
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/dev-libs/fribidi-0.19.2-r2 b/metadata/cache/dev-libs/fribidi-0.19.2-r2
new file mode 100644
index 000000000000..cd645218f428
--- /dev/null
+++ b/metadata/cache/dev-libs/fribidi-0.19.2-r2
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2
+0
+http://fribidi.org/download/fribidi-0.19.2.tar.gz
+
+http://fribidi.org/
+LGPL-2.1
+A free implementation of the unicode bidirectional algorithm
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+autotools eutils libtool multilib toolchain-funcs user
+static-libs
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/geoip-1.4.8 b/metadata/cache/dev-libs/geoip-1.4.8
index 21956cfe01a3..3732f1a8bfe4 100644
--- a/metadata/cache/dev-libs/geoip-1.4.8
+++ b/metadata/cache/dev-libs/geoip-1.4.8
@@ -6,7 +6,7 @@ http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz ipv6? ( http://ge
 http://www.maxmind.com/geoip/api/c.shtml
 LGPL-2.1 GPL-2 MaxMind2
 easily lookup countries by IP addresses, even when Reverse DNS entries don't exist
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 autotools eutils libtool multilib toolchain-funcs user
 ipv6 perl-geoipupdate static-libs
 
diff --git a/metadata/cache/dev-libs/libcdio-0.83 b/metadata/cache/dev-libs/libcdio-0.83
index 3b461980f77e..95abbc2c04fb 100644
--- a/metadata/cache/dev-libs/libcdio-0.83
+++ b/metadata/cache/dev-libs/libcdio-0.83
@@ -6,7 +6,7 @@ mirror://gnu/libcdio/libcdio-0.83.tar.gz
 http://www.gnu.org/software/libcdio/
 GPL-2
 A library to encapsulate CD-ROM reading and control
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 autotools autotools-utils eutils libtool multilib toolchain-funcs user
 cddb +cxx minimal static-libs
 
diff --git a/metadata/cache/dev-python/cssselect-0.6.1 b/metadata/cache/dev-python/cssselect-0.6.1
new file mode 100644
index 000000000000..e62bab9baf20
--- /dev/null
+++ b/metadata/cache/dev-python/cssselect-0.6.1
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/lxml ) dev-lang/python
+dev-lang/python
+0
+mirror://pypi/c/cssselect/cssselect-0.6.1.tar.gz
+
+http://packages.python.org/cssselect/ http://pypi.python.org/pypi/cssselect
+BSD
+parses CSS3 Selectors and translates them to XPath 1.0
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+doc test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/greenlet-0.3.4-r1 b/metadata/cache/dev-python/greenlet-0.3.4-r1
new file mode 100644
index 000000000000..f57e84eddbb6
--- /dev/null
+++ b/metadata/cache/dev-python/greenlet-0.3.4-r1
@@ -0,0 +1,22 @@
+app-arch/unzip dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python
+dev-lang/python
+0
+mirror://pypi/g/greenlet/greenlet-0.3.4.zip
+
+http://pypi.python.org/pypi/greenlet/
+MIT
+Lightweight in-process concurrent programming
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+doc
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/optcomplete-1.2 b/metadata/cache/dev-python/optcomplete-1.2
index 289f71e8a5f7..d02003b30bf2 100644
--- a/metadata/cache/dev-python/optcomplete-1.2
+++ b/metadata/cache/dev-python/optcomplete-1.2
@@ -6,7 +6,7 @@ http://furius.ca/downloads/optcomplete/releases/optcomplete-1.2.tar.bz2
 http://furius.ca/optcomplete/ http://pypi.python.org/pypi/optcomplete
 BSD
 Shell completion self-generator for Python
-amd64 ppc x86
+amd64 ppc x86 ~x86-linux
 distutils multilib python toolchain-funcs
 examples
 
diff --git a/metadata/cache/dev-python/pyquery-1.2.1 b/metadata/cache/dev-python/pyquery-1.2.1
new file mode 100644
index 000000000000..75b739c0b111
--- /dev/null
+++ b/metadata/cache/dev-python/pyquery-1.2.1
@@ -0,0 +1,22 @@
+>=dev-python/lxml-2.1 dev-python/cssselect >=dev-python/webob-1.2_rc1 dev-python/setuptools dev-lang/python test? ( dev-python/nose )
+>=dev-python/lxml-2.1 dev-python/cssselect >=dev-python/webob-1.2_rc1 dev-lang/python
+0
+mirror://pypi/p/pyquery/pyquery-1.2.1.tar.gz
+
+http://pypi.python.org/pypi/pyquery
+BSD
+A jquery-like library for python
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/webob-1.2_rc1 b/metadata/cache/dev-python/webob-1.2_rc1
new file mode 100644
index 000000000000..fef2696dd94a
--- /dev/null
+++ b/metadata/cache/dev-python/webob-1.2_rc1
@@ -0,0 +1,22 @@
+app-arch/unzip dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python test? ( dev-python/nose )
+dev-lang/python
+0
+mirror://pypi/W/WebOb/WebOb-1.2rc1.zip
+
+http://pythonpaste.org/webob/ http://pypi.python.org/pypi/WebOb
+MIT
+WSGI request and response object
+~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+distutils eutils multilib python toolchain-funcs user versionator
+doc test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-tex/biblatex-1.6 b/metadata/cache/dev-tex/biblatex-1.6
index a50ad01834ab..11350a8e1caf 100644
--- a/metadata/cache/dev-tex/biblatex-1.6
+++ b/metadata/cache/dev-tex/biblatex-1.6
@@ -6,7 +6,7 @@ mirror://gentoo/biblatex-1.6.zip
 http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex
 LPPL-1.3
 Reimplementation of the bibliographic facilities provided by LaTeX
-~amd64
+~amd64 ~x86
 base eutils latex-package multilib toolchain-funcs user
 doc
 
diff --git a/metadata/cache/dev-util/catalyst-2.0.8.1 b/metadata/cache/dev-util/catalyst-2.0.8.1-r1
similarity index 100%
rename from metadata/cache/dev-util/catalyst-2.0.8.1
rename to metadata/cache/dev-util/catalyst-2.0.8.1-r1
diff --git a/metadata/cache/dev-util/gdbus-codegen-2.32.1 b/metadata/cache/dev-util/gdbus-codegen-2.32.3
similarity index 89%
rename from metadata/cache/dev-util/gdbus-codegen-2.32.1
rename to metadata/cache/dev-util/gdbus-codegen-2.32.3
index 618c4d7ebb14..53e1f7df2f4e 100644
--- a/metadata/cache/dev-util/gdbus-codegen-2.32.1
+++ b/metadata/cache/dev-util/gdbus-codegen-2.32.3
@@ -1,7 +1,7 @@
 app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
-mirror://gnome/sources/glib/2.32/glib-2.32.1.tar.xz
+mirror://gnome/sources/glib/2.32/glib-2.32.3.tar.xz
 
 http://www.gtk.org/
 LGPL-2
@@ -10,7 +10,7 @@ GDBus code and documentation generator
 eutils gnome.org multilib python toolchain-funcs user versionator
 
 
->=dev-libs/glib-2.32.1:2
+>=dev-libs/glib-2.32.3:2
 
 4
 
diff --git a/metadata/cache/games-strategy/widelands-0.15 b/metadata/cache/games-strategy/widelands-0.15
deleted file mode 100644
index 2391d1404776..000000000000
--- a/metadata/cache/games-strategy/widelands-0.15
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-games/ggz-client-libs dev-lang/lua virtual/jpeg media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/sdl-ttf media-libs/tiff dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-dev-games/ggz-client-libs dev-lang/lua virtual/jpeg media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/sdl-ttf media-libs/tiff
-0
-http://launchpad.net/widelands/build15/build15/+download/widelands-build15-src.tar.bz2
-
-http://www.widelands.org/
-GPL-2
-A game similar to Settlers 2
-amd64 ppc x86
-base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user versionator
-
-
-
-
-2
-
-compile configure install postinst preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/games-strategy/widelands-0.17 b/metadata/cache/games-strategy/widelands-0.17
new file mode 100644
index 000000000000..2dd2c40c9ca4
--- /dev/null
+++ b/metadata/cache/games-strategy/widelands-0.17
@@ -0,0 +1,22 @@
+dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf
+0
+http://launchpad.net/widelands/build17/build-17/+download/widelands-build17-src.tar.bz2
+
+http://www.widelands.org/
+GPL-2
+A game similar to Settlers 2
+~amd64 ~ppc ~x86
+base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user versionator
+
+
+
+
+3
+
+compile configure install postinst preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/gnome-2.32.1-r1 b/metadata/cache/gnome-base/gnome-2.32.1-r1
index 4f7c56018d5d..750932ffdc37 100644
--- a/metadata/cache/gnome-base/gnome-2.32.1-r1
+++ b/metadata/cache/gnome-base/gnome-2.32.1-r1
@@ -10,7 +10,7 @@ alpha amd64 ia64 ppc ppc64 sparc x86
 
 accessibility cdr cups dvdr ldap mono policykit
 
->=gnome-base/gvfs-1.6.6[gdu]
+|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )
 
 4
 
diff --git a/metadata/cache/gnome-base/gnome-2.32.1-r2 b/metadata/cache/gnome-base/gnome-2.32.1-r2
index fa4e620815ab..a5ee9b5c869c 100644
--- a/metadata/cache/gnome-base/gnome-2.32.1-r2
+++ b/metadata/cache/gnome-base/gnome-2.32.1-r2
@@ -10,7 +10,7 @@ Meta package for the GNOME desktop
 
 accessibility cdr cups dvdr ldap mono policykit
 
->=gnome-base/gvfs-1.6.6[gdu]
+|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )
 
 4
 
diff --git a/metadata/cache/gnome-base/gnome-3.2.1 b/metadata/cache/gnome-base/gnome-3.2.1
index c32c8e639023..e9bb3dafad2b 100644
--- a/metadata/cache/gnome-base/gnome-3.2.1
+++ b/metadata/cache/gnome-base/gnome-3.2.1
@@ -10,7 +10,7 @@ Meta package for GNOME 3, merge this package to install
 
 accessibility +cdr cups +extras +fallback
 
->=gnome-base/gvfs-1.10.1[gdu]
+|| ( >=gnome-base/gvfs-1.10.1[udisks] >=gnome-base/gvfs-1.10.1[gdu] )
 
 4
 
diff --git a/metadata/cache/gnome-base/gnome-light-2.32.1 b/metadata/cache/gnome-base/gnome-light-2.32.1
index 941f883ff5ae..4b6b3e2c3018 100644
--- a/metadata/cache/gnome-base/gnome-light-2.32.1
+++ b/metadata/cache/gnome-base/gnome-light-2.32.1
@@ -10,7 +10,7 @@ alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x
 
 +automount
 
->=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 
 3
 
diff --git a/metadata/cache/gnome-base/gnome-light-2.32.1-r1 b/metadata/cache/gnome-base/gnome-light-2.32.1-r1
index db0f2d6f7bf4..0015592c093a 100644
--- a/metadata/cache/gnome-base/gnome-light-2.32.1-r1
+++ b/metadata/cache/gnome-base/gnome-light-2.32.1-r1
@@ -10,7 +10,7 @@ alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x
 
 +automount
 
->=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 
 4
 
diff --git a/metadata/cache/gnome-base/gnome-light-2.32.1-r2 b/metadata/cache/gnome-base/gnome-light-2.32.1-r2
index 7f5a7f1a0130..cff7b0617f0c 100644
--- a/metadata/cache/gnome-base/gnome-light-2.32.1-r2
+++ b/metadata/cache/gnome-base/gnome-light-2.32.1-r2
@@ -10,7 +10,7 @@ Meta package for the GNOME desktop, merge this package to install
 
 +automount
 
->=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 
 4
 
diff --git a/metadata/cache/media-fonts/font-adobe-100dpi-1.0.3 b/metadata/cache/media-fonts/font-adobe-100dpi-1.0.3
index e05d1e4b80d4..6c807231f806 100644
--- a/metadata/cache/media-fonts/font-adobe-100dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-adobe-100dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar
 http://xorg.freedesktop.org/
 MIT
 X.Org Adobe bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-adobe-utopia-75dpi-1.0.4 b/metadata/cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
index b26f7999c5ea..a1ec22ccbba7 100644
--- a/metadata/cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
+++ b/metadata/cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0
 http://xorg.freedesktop.org/
 MIT
 X.Org Adobe Utopia bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-adobe-utopia-type1-1.0.4 b/metadata/cache/media-fonts/font-adobe-utopia-type1-1.0.4
index 4e51eb8f6f01..68b18ed24c87 100644
--- a/metadata/cache/media-fonts/font-adobe-utopia-type1-1.0.4
+++ b/metadata/cache/media-fonts/font-adobe-utopia-type1-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0
 http://xorg.freedesktop.org/
 MIT
 X.Org Adobe Utopia Type 1 fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X
 
diff --git a/metadata/cache/media-fonts/font-arabic-misc-1.0.3 b/metadata/cache/media-fonts/font-arabic-misc-1.0.3
index c731b5b74748..060db4ef17e7 100644
--- a/metadata/cache/media-fonts/font-arabic-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-arabic-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.3.tar.
 http://xorg.freedesktop.org/
 MIT
 X.Org arabic bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bh-100dpi-1.0.3 b/metadata/cache/media-fonts/font-bh-100dpi-1.0.3
index f32a8eae356d..80bbfb816526 100644
--- a/metadata/cache/media-fonts/font-bh-100dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bh-100dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz
 http://xorg.freedesktop.org/
 MIT
 X.Org Bigelow & Holmes bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bh-75dpi-1.0.3 b/metadata/cache/media-fonts/font-bh-75dpi-1.0.3
index 6ab0243a450e..7a8a647e0fd9 100644
--- a/metadata/cache/media-fonts/font-bh-75dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bh-75dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Bigelow & Holmes bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3 b/metadata/cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
index 1f5eaa55559b..4f57040e5772 100644
--- a/metadata/cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-10
 http://xorg.freedesktop.org/
 MIT
 X.Org Bigelow & Holmes Lucida bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3 b/metadata/cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
index 99d5fdae0805..bfca99b0c513 100644
--- a/metadata/cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75
 http://xorg.freedesktop.org/
 MIT
 X.Org Bigelow & Holmes Lucida bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bitstream-100dpi-1.0.3 b/metadata/cache/media-fonts/font-bitstream-100dpi-1.0.3
index 152f761bd702..10223cf746b6 100644
--- a/metadata/cache/media-fonts/font-bitstream-100dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bitstream-100dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.3
 http://xorg.freedesktop.org/
 MIT
 X.Org Bitstream bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bitstream-75dpi-1.0.3 b/metadata/cache/media-fonts/font-bitstream-75dpi-1.0.3
index 40475d206991..29b57ecd644d 100644
--- a/metadata/cache/media-fonts/font-bitstream-75dpi-1.0.3
+++ b/metadata/cache/media-fonts/font-bitstream-75dpi-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.3.
 http://xorg.freedesktop.org/
 MIT
 X.Org Bitstream bitmap fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-bitstream-speedo-1.0.2 b/metadata/cache/media-fonts/font-bitstream-speedo-1.0.2
index 4d8fc9f0de62..a91b4e32cc9a 100644
--- a/metadata/cache/media-fonts/font-bitstream-speedo-1.0.2
+++ b/metadata/cache/media-fonts/font-bitstream-speedo-1.0.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.2
 http://xorg.freedesktop.org/
 MIT
 Bitstream Speedo fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X
 
diff --git a/metadata/cache/media-fonts/font-bitstream-type1-1.0.3 b/metadata/cache/media-fonts/font-bitstream-type1-1.0.3
index ede997dde3d8..207207f7f78e 100644
--- a/metadata/cache/media-fonts/font-bitstream-type1-1.0.3
+++ b/metadata/cache/media-fonts/font-bitstream-type1-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.3.
 http://xorg.freedesktop.org/
 MIT
 X.Org Bitstream Type 1 fonts
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X
 
diff --git a/metadata/cache/media-fonts/font-cronyx-cyrillic-1.0.3 b/metadata/cache/media-fonts/font-cronyx-cyrillic-1.0.3
index 2d030570fe66..192b6b13dfe1 100644
--- a/metadata/cache/media-fonts/font-cronyx-cyrillic-1.0.3
+++ b/metadata/cache/media-fonts/font-cronyx-cyrillic-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.
 http://xorg.freedesktop.org/
 MIT
 X.Org Cronyx cyrillic fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-daewoo-misc-1.0.3 b/metadata/cache/media-fonts/font-daewoo-misc-1.0.3
index 99e0b57ed130..e5e884215b54 100644
--- a/metadata/cache/media-fonts/font-daewoo-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-daewoo-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.
 http://xorg.freedesktop.org/
 MIT
 X.Org Daewoo fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-jis-misc-1.0.3 b/metadata/cache/media-fonts/font-jis-misc-1.0.3
index 9e9b052a274c..4b0da2314da7 100644
--- a/metadata/cache/media-fonts/font-jis-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-jis-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org JIS (japanese) fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-misc-cyrillic-1.0.3 b/metadata/cache/media-fonts/font-misc-cyrillic-1.0.3
index af8b2b7e5180..907918e686bd 100644
--- a/metadata/cache/media-fonts/font-misc-cyrillic-1.0.3
+++ b/metadata/cache/media-fonts/font-misc-cyrillic-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.3.ta
 http://xorg.freedesktop.org/
 MIT
 X.Org misc-cyrillic fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-misc-ethiopic-1.0.3 b/metadata/cache/media-fonts/font-misc-ethiopic-1.0.3
index 0388fcc7d7ea..c2a75723bc32 100644
--- a/metadata/cache/media-fonts/font-misc-ethiopic-1.0.3
+++ b/metadata/cache/media-fonts/font-misc-ethiopic-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.3.ta
 http://xorg.freedesktop.org/
 MIT
 Miscellaneous Ethiopic fonts
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X
 
diff --git a/metadata/cache/media-fonts/font-misc-meltho-1.0.3 b/metadata/cache/media-fonts/font-misc-meltho-1.0.3
index 4a010f4eca39..29b305afb9f4 100644
--- a/metadata/cache/media-fonts/font-misc-meltho-1.0.3
+++ b/metadata/cache/media-fonts/font-misc-meltho-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.3.tar.
 http://xorg.freedesktop.org/
 MIT
 X.Org Syriac fonts
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X
 
diff --git a/metadata/cache/media-fonts/font-mutt-misc-1.0.3 b/metadata/cache/media-fonts/font-mutt-misc-1.0.3
index b92adc5786f1..60a0903465fe 100644
--- a/metadata/cache/media-fonts/font-mutt-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-mutt-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz
 http://xorg.freedesktop.org/
 MIT
 X.Org ClearlyU fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-schumacher-misc-1.1.2 b/metadata/cache/media-fonts/font-schumacher-misc-1.1.2
index f34e533eac99..aa6cf113729b 100644
--- a/metadata/cache/media-fonts/font-schumacher-misc-1.1.2
+++ b/metadata/cache/media-fonts/font-schumacher-misc-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.1.2.
 http://xorg.freedesktop.org/
 MIT
 X.Org Schumacher fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-screen-cyrillic-1.0.4 b/metadata/cache/media-fonts/font-screen-cyrillic-1.0.4
index 1393fb00f80f..c3fa48865152 100644
--- a/metadata/cache/media-fonts/font-screen-cyrillic-1.0.4
+++ b/metadata/cache/media-fonts/font-screen-cyrillic-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.4.
 http://xorg.freedesktop.org/
 MIT
 X.Org Screen cyrillic fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-sony-misc-1.0.3 b/metadata/cache/media-fonts/font-sony-misc-1.0.3
index 16293c5f59ac..23ef9d0f6435 100644
--- a/metadata/cache/media-fonts/font-sony-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-sony-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz
 http://xorg.freedesktop.org/
 MIT
 X.Org Sony fonts
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-sun-misc-1.0.3 b/metadata/cache/media-fonts/font-sun-misc-1.0.3
index 6d65af44d430..a361e8db7132 100644
--- a/metadata/cache/media-fonts/font-sun-misc-1.0.3
+++ b/metadata/cache/media-fonts/font-sun-misc-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org Sun fonts
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-fonts/font-winitzki-cyrillic-1.0.3 b/metadata/cache/media-fonts/font-winitzki-cyrillic-1.0.3
index fbaaf09ca9f1..4c7942ba403f 100644
--- a/metadata/cache/media-fonts/font-winitzki-cyrillic-1.0.3
+++ b/metadata/cache/media-fonts/font-winitzki-cyrillic-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.
 http://xorg.freedesktop.org/
 MIT
 X.Org Winitzki cyrillic font
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic font libtool multilib toolchain-funcs user xorg-2
 X nls
 
diff --git a/metadata/cache/media-libs/faac-1.28-r3 b/metadata/cache/media-libs/faac-1.28-r3
index 52463dd8ab6a..769c4e7dc9e0 100644
--- a/metadata/cache/media-libs/faac-1.28-r3
+++ b/metadata/cache/media-libs/faac-1.28-r3
@@ -6,7 +6,7 @@ mirror://sourceforge/faac/faac-1.28.tar.gz
 http://www.audiocoding.com
 LGPL-2.1 MPEG-4
 Free MPEG-4 audio codecs by AudioCoding.com
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/flac-1.2.1-r4 b/metadata/cache/media-libs/flac-1.2.1-r4
index a259331a3d0c..224e6e3868ec 100644
--- a/metadata/cache/media-libs/flac-1.2.1-r4
+++ b/metadata/cache/media-libs/flac-1.2.1-r4
@@ -6,7 +6,7 @@ mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-
 http://flac.sourceforge.net
 BSD FDL-1.2 GPL-2 LGPL-2.1
 free lossless audio encoder and decoder
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 3dnow altivec +cxx debug ogg sse static-libs
 
diff --git a/metadata/cache/media-libs/libaacplus-2.0.2 b/metadata/cache/media-libs/libaacplus-2.0.2
index 4bd085855724..eaa564b7fcdc 100644
--- a/metadata/cache/media-libs/libaacplus-2.0.2
+++ b/metadata/cache/media-libs/libaacplus-2.0.2
@@ -6,7 +6,7 @@ mirror
 http://tipok.org.ua/node/17
 LGPL-2.1
 HE-AAC+ v2 library, based on the reference implementation
-amd64 hppa ppc ppc64 x86 ~x86-fbsd
+amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 bindist fftw static-libs
 !bindist
diff --git a/metadata/cache/media-libs/libass-0.10.0 b/metadata/cache/media-libs/libass-0.10.0
index 3f309ee5b087..3c297b5f8e42 100644
--- a/metadata/cache/media-libs/libass-0.10.0
+++ b/metadata/cache/media-libs/libass-0.10.0
@@ -6,7 +6,7 @@ http://libass.googlecode.com/files/libass-0.10.0.tar.xz
 http://code.google.com/p/libass/
 ISC
 Library for SSA/ASS subtitles rendering
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 
 +enca +fontconfig harfbuzz static-libs
 
diff --git a/metadata/cache/media-libs/libcddb-1.3.2 b/metadata/cache/media-libs/libcddb-1.3.2
index ff75d355b6ff..40c5139c9cfb 100644
--- a/metadata/cache/media-libs/libcddb-1.3.2
+++ b/metadata/cache/media-libs/libcddb-1.3.2
@@ -6,7 +6,7 @@ test
 http://libcddb.sourceforge.net/
 LGPL-2
 A library for accessing a CDDB server
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 libtool multilib toolchain-funcs
 doc static-libs
 
diff --git a/metadata/cache/media-libs/libdvdnav-4.2.0 b/metadata/cache/media-libs/libdvdnav-4.2.0
index b8cc85fbfc5e..f9b85654bdca 100644
--- a/metadata/cache/media-libs/libdvdnav-4.2.0
+++ b/metadata/cache/media-libs/libdvdnav-4.2.0
@@ -1,4 +1,4 @@
->=media-libs/libdvdread-4.2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libdvdread-4.2.0 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libdvdread-4.2.0
 0
 http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2
diff --git a/metadata/cache/media-libs/libdvdnav-9999 b/metadata/cache/media-libs/libdvdnav-9999
index 2b3d56792aaa..e8cf5197f65d 100644
--- a/metadata/cache/media-libs/libdvdnav-9999
+++ b/metadata/cache/media-libs/libdvdnav-9999
@@ -1,5 +1,5 @@
-|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
-
+>=media-libs/libdvdread-9999 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+>=media-libs/libdvdread-9999
 0
 
 
diff --git a/metadata/cache/media-libs/libmodplug-0.8.8.4 b/metadata/cache/media-libs/libmodplug-0.8.8.4
index 724af1194cd2..0b82620c403d 100644
--- a/metadata/cache/media-libs/libmodplug-0.8.8.4
+++ b/metadata/cache/media-libs/libmodplug-0.8.8.4
@@ -6,7 +6,7 @@ mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
 http://modplug-xmms.sourceforge.net/
 public-domain
 Library for playing MOD-like music files
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools base eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/libmp4v2-1.9.1_p479 b/metadata/cache/media-libs/libmp4v2-1.9.1_p479
index 902bb490f3c0..8b2b650aa3a3 100644
--- a/metadata/cache/media-libs/libmp4v2-1.9.1_p479
+++ b/metadata/cache/media-libs/libmp4v2-1.9.1_p479
@@ -6,7 +6,7 @@ http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2
 http://code.google.com/p/mp4v2/
 MPL-1.1
 Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 eutils libtool multilib toolchain-funcs user versionator
 static-libs test utils
 
diff --git a/metadata/cache/media-libs/libpostproc-0.8.0.20120217 b/metadata/cache/media-libs/libpostproc-0.8.0.20120217
index 94d8bac22f2d..b438b00486cd 100644
--- a/metadata/cache/media-libs/libpostproc-0.8.0.20120217
+++ b/metadata/cache/media-libs/libpostproc-0.8.0.20120217
@@ -1,5 +1,5 @@
->=media-video/libav-0.8
->=media-video/libav-0.8
+>=media-video/libav-0.8.2-r2
+>=media-video/libav-0.8.2-r2
 0
 http://dev.gentoo.org/~lu_zero/distfiles/libpostproc-0.8.0.20120217.tar.xz
 
@@ -14,7 +14,7 @@ pic static-libs 3dnow 3dnowext altivec mmx vis
 
 4
 
-compile configure install
+configure
 
 
 
diff --git a/metadata/cache/media-libs/libpostproc-9999 b/metadata/cache/media-libs/libpostproc-9999
index 6b1b9b0f1902..d03919582e0d 100644
--- a/metadata/cache/media-libs/libpostproc-9999
+++ b/metadata/cache/media-libs/libpostproc-9999
@@ -1,5 +1,5 @@
->=media-video/libav-0.8 dev-vcs/git
->=media-video/libav-0.8
+>=media-video/libav-0.8.2-r2 dev-vcs/git
+>=media-video/libav-0.8.2-r2
 0
 
 
@@ -14,7 +14,7 @@ pic static-libs 3dnow 3dnowext altivec mmx vis
 
 4
 
-compile configure install unpack
+configure unpack
 
 
 
diff --git a/metadata/cache/media-libs/libsndfile-1.0.25 b/metadata/cache/media-libs/libsndfile-1.0.25
index 8c5a5b8ffa13..de860ec5215a 100644
--- a/metadata/cache/media-libs/libsndfile-1.0.25
+++ b/metadata/cache/media-libs/libsndfile-1.0.25
@@ -6,7 +6,7 @@ http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
 http://www.mega-nerd.com/libsndfile
 LGPL-2.1
 A C library for reading and writing files containing sampled sound
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 alsa minimal sqlite static-libs
 
diff --git a/metadata/cache/media-libs/libtheora-1.1.1 b/metadata/cache/media-libs/libtheora-1.1.1
index 444e01e29fc9..c4b77e52fc4a 100644
--- a/metadata/cache/media-libs/libtheora-1.1.1
+++ b/metadata/cache/media-libs/libtheora-1.1.1
@@ -6,7 +6,7 @@ http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 http://www.theora.org
 BSD
 The Theora Video Compression Codec
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 doc +encode examples static-libs
 
diff --git a/metadata/cache/media-libs/libvorbis-1.3.3 b/metadata/cache/media-libs/libvorbis-1.3.3
index be289724b982..934763982da3 100644
--- a/metadata/cache/media-libs/libvorbis-1.3.3
+++ b/metadata/cache/media-libs/libvorbis-1.3.3
@@ -6,7 +6,7 @@ http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz
 http://xiph.org/vorbis
 BSD
 The Ogg Vorbis sound file format library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/libvpx-1.1.0 b/metadata/cache/media-libs/libvpx-1.1.0
index 9519c1de9c03..905ede4baafb 100644
--- a/metadata/cache/media-libs/libvpx-1.1.0
+++ b/metadata/cache/media-libs/libvpx-1.1.0
@@ -6,15 +6,15 @@ http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2
 http://www.webmproject.org
 BSD
 WebM VP8 Codec SDK
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-multilib toolchain-funcs
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+base eutils multilib toolchain-funcs user
 altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads
 sse2? ( mmx )
 
 
 4
 
-configure install
+compile configure install prepare unpack
 
 
 
diff --git a/metadata/cache/media-libs/openal-1.13 b/metadata/cache/media-libs/openal-1.13
index c03adabec468..ba6dab9652a7 100644
--- a/metadata/cache/media-libs/openal-1.13
+++ b/metadata/cache/media-libs/openal-1.13
@@ -6,7 +6,7 @@ http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2
 http://kcat.strangesoft.net/openal.html
 LGPL-2
 A software implementation of the OpenAL 3D audio API
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 alsa debug oss portaudio pulseaudio
 
diff --git a/metadata/cache/media-libs/opencore-amr-0.1.3 b/metadata/cache/media-libs/opencore-amr-0.1.3
index 7af9d467e2bc..739458ffc3e9 100644
--- a/metadata/cache/media-libs/opencore-amr-0.1.3
+++ b/metadata/cache/media-libs/opencore-amr-0.1.3
@@ -6,7 +6,7 @@ mirror://sourceforge/opencore-amr/opencore-amr-0.1.3.tar.gz
 http://opencore-amr.sourceforge.net/
 Apache-2.0
 Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 multilib toolchain-funcs
 static-libs
 
diff --git a/metadata/cache/media-libs/schroedinger-1.0.11 b/metadata/cache/media-libs/schroedinger-1.0.11
index 6e5a561bfdbe..921a5699a938 100644
--- a/metadata/cache/media-libs/schroedinger-1.0.11
+++ b/metadata/cache/media-libs/schroedinger-1.0.11
@@ -6,7 +6,7 @@ http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
 http://www.diracvideo.org/
 GPL-2 LGPL-2 MIT MPL-1.1
 C-based libraries for the Dirac video codec
-~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/media-libs/speex-1.2_rc1-r1 b/metadata/cache/media-libs/speex-1.2_rc1-r1
index d4b1e32b1218..1df2ecbbdf1c 100644
--- a/metadata/cache/media-libs/speex-1.2_rc1-r1
+++ b/metadata/cache/media-libs/speex-1.2_rc1-r1
@@ -6,7 +6,7 @@ http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
 http://www.speex.org
 BSD
 Audio compression format designed for speech.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user
 ogg sse static-libs
 
diff --git a/metadata/cache/media-libs/vo-aacenc-0.1.2 b/metadata/cache/media-libs/vo-aacenc-0.1.2
index 1fdfac547afd..41e0faf3d725 100644
--- a/metadata/cache/media-libs/vo-aacenc-0.1.2
+++ b/metadata/cache/media-libs/vo-aacenc-0.1.2
@@ -6,7 +6,7 @@ mirror://sourceforge/opencore-amr/vo-aacenc-0.1.2.tar.gz
 http://sourceforge.net/projects/opencore-amr/
 Apache-2.0
 VisualOn AAC encoder library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 autotools eutils libtool multilib toolchain-funcs user
 examples static-libs neon
 
diff --git a/metadata/cache/media-libs/vo-amrwbenc-0.1.2 b/metadata/cache/media-libs/vo-amrwbenc-0.1.2
index b3a5ac2d4fe0..24a9068c931d 100644
--- a/metadata/cache/media-libs/vo-amrwbenc-0.1.2
+++ b/metadata/cache/media-libs/vo-amrwbenc-0.1.2
@@ -6,7 +6,7 @@ mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.2.tar.gz
 http://sourceforge.net/projects/opencore-amr/
 Apache-2.0
 VisualOn AMR-WB encoder library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 autotools eutils libtool multilib toolchain-funcs user
 examples static-libs
 
diff --git a/metadata/cache/media-libs/x264-0.0.20120327 b/metadata/cache/media-libs/x264-0.0.20120327
index 8bc43e9dedd2..c67b2f88ca24 100644
--- a/metadata/cache/media-libs/x264-0.0.20120327
+++ b/metadata/cache/media-libs/x264-0.0.20120327
@@ -6,7 +6,7 @@ http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-
 http://www.videolan.org/developers/x264.html
 GPL-2
 A free library for encoding X264/AVC streams
-~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 eutils flag-o-matic multilib toolchain-funcs user versionator
 10bit custom-cflags debug +interlaced pic static-libs +threads
 
diff --git a/metadata/cache/media-sound/gsm-1.0.13 b/metadata/cache/media-sound/gsm-1.0.13
index e4dc9208cb28..72afd7c46aed 100644
--- a/metadata/cache/media-sound/gsm-1.0.13
+++ b/metadata/cache/media-sound/gsm-1.0.13
@@ -6,7 +6,7 @@ mirror://gentoo/gsm-1.0.13.tar.gz
 http://packages.qa.debian.org/libg/libgsm.html
 gsm
 Lossy speech compression library and tool.
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/media-sound/lame-3.99.5 b/metadata/cache/media-sound/lame-3.99.5
index 3636fcbac39b..98e2425b6b52 100644
--- a/metadata/cache/media-sound/lame-3.99.5
+++ b/metadata/cache/media-sound/lame-3.99.5
@@ -6,7 +6,7 @@ mirror://sourceforge/lame/lame-3.99.5.tar.gz
 http://lame.sourceforge.net/
 LGPL-2.1
 LAME Ain't an MP3 Encoder
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 debug mmx mp3rtp sndfile static-libs
 
diff --git a/metadata/cache/media-video/dirac-1.0.2 b/metadata/cache/media-video/dirac-1.0.2
index 7a009077ddf5..1592f28be411 100644
--- a/metadata/cache/media-video/dirac-1.0.2
+++ b/metadata/cache/media-video/dirac-1.0.2
@@ -6,7 +6,7 @@ mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
 http://dirac.sourceforge.net/
 MPL-1.1
 Open Source video codec
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 debug doc mmx static-libs
 
diff --git a/metadata/cache/media-video/ffmpeg-0.10 b/metadata/cache/media-video/ffmpeg-0.10
deleted file mode 100644
index 000433bcfe8b..000000000000
--- a/metadata/cache/media-video/ffmpeg-0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( net-libs/gnutls ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( net-libs/gnutls ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart
-0
-http://ffmpeg.org/releases/ffmpeg-0.10.tar.bz2
-
-http://ffmpeg.org/
-GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-Complete solution to record, convert and stream audio and video. Includes libavcodec.
-~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
-eutils flag-o-matic multilib toolchain-funcs user
-aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon iwmmxt
-bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) test? ( encode zlib )
-
-
-4
-
-compile configure install prepare test
-
-
-
-
-
diff --git a/metadata/cache/media-video/ffmpeg-0.10.3 b/metadata/cache/media-video/ffmpeg-0.10.3
index c81647483f24..973e67db7de9 100644
--- a/metadata/cache/media-video/ffmpeg-0.10.3
+++ b/metadata/cache/media-video/ffmpeg-0.10.3
@@ -6,7 +6,7 @@ http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2
 http://ffmpeg.org/
 GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 Complete solution to record, convert and stream audio and video. Includes libavcodec.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 eutils flag-o-matic multilib toolchain-funcs user
 aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
 bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
diff --git a/metadata/cache/media-video/ffmpeg-0.7.8 b/metadata/cache/media-video/ffmpeg-0.7.8
deleted file mode 100644
index 820b9d31372c..000000000000
--- a/metadata/cache/media-video/ffmpeg-0.7.8
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20110426 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) ieee1394? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20110426 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart
-0
-http://ffmpeg.org/releases/ffmpeg-0.7.8.tar.bz2
-
-http://ffmpeg.org/
-GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-Complete solution to record, convert and stream audio and video. Includes libavcodec.
-alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-eutils flag-o-matic multilib toolchain-funcs user
-+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic +qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib video_cards_nvidia
-
-
-
-2
-
-compile configure install prepare test
-
-
-
-
-
diff --git a/metadata/cache/media-video/kdenlive-0.9 b/metadata/cache/media-video/kdenlive-0.9
new file mode 100644
index 000000000000..b6c4d56521bd
--- /dev/null
+++ b/metadata/cache/media-video/kdenlive-0.9
@@ -0,0 +1,22 @@
+dev-libs/qjson >=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+dev-libs/qjson >=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+mirror://kde/stable/kdenlive/0.9/src/kdenlive-0.9.tar.gz
+
+http://www.kdenlive.org/
+GPL-2
+Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE.
+~amd64 ~ppc ~x86 ~x86-linux
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh linguas_zh_CN linguas_zh_TW +handbook aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-video/libav-9999 b/metadata/cache/media-video/libav-9999
index 542199be681f..77aedda34c47 100644
--- a/metadata/cache/media-video/libav-9999
+++ b/metadata/cache/media-video/libav-9999
@@ -1,5 +1,5 @@
-!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.4 ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
-!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.4 ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
+!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) ssl? ( virtual/pkgconfig ) test? ( sys-devel/bc ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
 0
 
 test
@@ -8,8 +8,8 @@ LGPL-2.1 gpl? ( GPL-3 )
 Complete solution to record, convert and stream audio and video.
 
 eutils flag-o-matic git-2 multilib toolchain-funcs user
-+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
-bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
+bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode zlib )
 
 
 4
diff --git a/metadata/cache/media-video/rtmpdump-2.4 b/metadata/cache/media-video/rtmpdump-2.4
index fbe02051b1de..560c2a467ea3 100644
--- a/metadata/cache/media-video/rtmpdump-2.4
+++ b/metadata/cache/media-video/rtmpdump-2.4
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4.tar.gz
 http://rtmpdump.mplayerhq.hu/
 GPL-2 LGPL-2.1
 Open source command-line RTMP client intended to stream audio or video flash content
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
 multilib toolchain-funcs
 gnutls polarssl ssl
 
diff --git a/metadata/cache/media-video/vlc-2.0.0 b/metadata/cache/media-video/vlc-2.0.0
deleted file mode 100644
index d429db56098d..000000000000
--- a/metadata/cache/media-video/vlc-2.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
-0
-http://download.videolan.org/pub/videolan/vlc/2.0.0/vlc-2.0.0.tar.xz mirror://gentoo/vlc-patches-101.tar.bz2
-
-http://www.videolan.org/vlc/
-LGPL-2.1 GPL-2
-VLC media player - Video player and streamer
-~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user
-a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
-aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat postproc swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
-
-
-4
-
-configure install postinst prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/media-video/vlc-2.0.9999 b/metadata/cache/media-video/vlc-2.0.9999
index d218783d2f66..e9d54d674b9b 100644
--- a/metadata/cache/media-video/vlc-2.0.9999
+++ b/metadata/cache/media-video/vlc-2.0.9999
@@ -9,7 +9,7 @@ VLC media player - Video player and streamer
 
 autotools eutils flag-o-matic git-2 libtool multilib toolchain-funcs user
 a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
-aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
+aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 
 
 4
diff --git a/metadata/cache/media-video/vlc-9999 b/metadata/cache/media-video/vlc-9999
index c375e3edc697..5b3d4b267983 100644
--- a/metadata/cache/media-video/vlc-9999
+++ b/metadata/cache/media-video/vlc-9999
@@ -1,5 +1,5 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 mirror://gentoo/vlc-patches-101.tar.bz2
 
@@ -8,8 +8,8 @@ LGPL-2.1 GPL-2
 VLC media player - Video player and streamer
 
 autotools eutils flag-o-matic git-2 libtool multilib toolchain-funcs user
-a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
-aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
+a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xv zvbi
+aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 
 
 4
diff --git a/metadata/cache/net-irc/atheme-services-6.0.11 b/metadata/cache/net-irc/atheme-services-6.0.11
new file mode 100644
index 000000000000..94bc7c5940e3
--- /dev/null
+++ b/metadata/cache/net-irc/atheme-services-6.0.11
@@ -0,0 +1,22 @@
+dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
+0
+http://atheme.net/downloads/atheme-services-6.0.11.tar.bz2
+
+http://atheme.net/
+BSD
+A portable and secure set of open-source and modular IRC services
+~amd64 ~x86 ~x86-fbsd ~amd64-linux
+autotools base eutils flag-o-matic libtool multilib perl-module prefix toolchain-funcs user
+cracklib largenet ldap nls +pcre perl profile ssl
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-irc/atheme-services-7.0.0 b/metadata/cache/net-irc/atheme-services-7.0.2
similarity index 70%
rename from metadata/cache/net-irc/atheme-services-7.0.0
rename to metadata/cache/net-irc/atheme-services-7.0.2
index 35b3196278ee..5b581d0a038c 100644
--- a/metadata/cache/net-irc/atheme-services-7.0.0
+++ b/metadata/cache/net-irc/atheme-services-7.0.2
@@ -1,13 +1,13 @@
->=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig dev-lang/perl[-build]
 >=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 0
-http://atheme.net/downloads/atheme-services-7.0.0.tar.bz2
+http://atheme.net/downloads/atheme-services-7.0.2.tar.bz2
 
 http://atheme.net/
 BSD
 A portable and secure set of open-source and modular IRC services
 ~amd64 ~x86 ~x86-fbsd ~amd64-linux
-autotools base eutils flag-o-matic libtool multilib perl-module toolchain-funcs user
+base eutils flag-o-matic multilib perl-module toolchain-funcs user
 cracklib largenet ldap nls +pcre perl profile ssl
 
 
diff --git a/metadata/cache/net-libs/miniupnpc-1.6-r1 b/metadata/cache/net-libs/miniupnpc-1.6-r1
index 7b2b285e6ed2..61093d9a0405 100644
--- a/metadata/cache/net-libs/miniupnpc-1.6-r1
+++ b/metadata/cache/net-libs/miniupnpc-1.6-r1
@@ -1,4 +1,4 @@
-sys-apps/lsb-release
+kernel_linux? ( sys-apps/lsb-release )
 
 0
 http://miniupnp.free.fr/files/miniupnpc-1.6.tar.gz
@@ -6,7 +6,7 @@ test
 http://miniupnp.free.fr/
 BSD
 UPnP client library and a simple UPnP client
-amd64 ~arm ppc ppc64 x86
+amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 base eutils multilib toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/net-misc/bfgminer-2.4.1 b/metadata/cache/net-misc/bfgminer-2.4.1
new file mode 100644
index 000000000000..4dc118cc877c
--- /dev/null
+++ b/metadata/cache/net-misc/bfgminer-2.4.1
@@ -0,0 +1,22 @@
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) opencl? ( virtual/opencl ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
+0
+http://luke.dashjr.org/programs/bitcoin/files/bfgminer/2.4.1/bfgminer-2.4.1.tbz2
+
+https://bitcointalk.org/index.php?topic=78192.0
+GPL-3
+Modular Bitcoin CPU/GPU/FPGA miner in C
+~x86 ~amd64
+eutils multilib toolchain-funcs user
++adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/cgminer-2.4.0 b/metadata/cache/net-misc/cgminer-2.4.0
index 7188f6b63987..67e6a5e8c83a 100644
--- a/metadata/cache/net-misc/cgminer-2.4.0
+++ b/metadata/cache/net-misc/cgminer-2.4.0
@@ -1,7 +1,7 @@
 net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
 net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
 0
-http://ck.kolivas.org/apps/cgminer/cgminer-2.4.0.tar.bz2
+http://ck.kolivas.org/apps/cgminer/cgminer-2.4/cgminer-2.4.0.tar.bz2
 
 https://bitcointalk.org/index.php?topic=28402.0
 GPL-3
diff --git a/metadata/cache/net-misc/cgminer-2.4.1 b/metadata/cache/net-misc/cgminer-2.4.1
new file mode 100644
index 000000000000..09828b010dfe
--- /dev/null
+++ b/metadata/cache/net-misc/cgminer-2.4.1
@@ -0,0 +1,22 @@
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
+0
+http://ck.kolivas.org/apps/cgminer/cgminer-2.4.1.tar.bz2
+
+https://bitcointalk.org/index.php?topic=28402.0
+GPL-3
+Bitcoin CPU/GPU/FPGA miner in C
+~x86 ~amd64
+eutils multilib toolchain-funcs user versionator
++adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-nntp/tin-2.0.1 b/metadata/cache/net-nntp/tin-2.0.1
new file mode 100644
index 000000000000..608ee254efdb
--- /dev/null
+++ b/metadata/cache/net-nntp/tin-2.0.1
@@ -0,0 +1,22 @@
+dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu ) virtual/pkgconfig
+dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu )
+0
+ftp://ftp.tin.org/pub/news/clients/tin/v2.0/tin-2.0.1.tar.bz2
+
+http://www.tin.org/
+GPL-2
+A threaded NNTP and spool based UseNet newsreader
+~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+eutils multilib toolchain-funcs user versionator
+cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-print/cups-pdf-3.0_beta1 b/metadata/cache/net-print/cups-pdf-3.0_beta1
new file mode 100644
index 000000000000..27e29758ac18
--- /dev/null
+++ b/metadata/cache/net-print/cups-pdf-3.0_beta1
@@ -0,0 +1,22 @@
+net-print/cups app-text/ghostscript-gpl
+net-print/cups app-text/ghostscript-gpl
+0
+http://www.cups-pdf.de/src/cups-pdf_3.0beta1.tar.gz
+
+http://www.cups-pdf.de/
+GPL-2
+Provides a virtual printer for CUPS to produce PDF files.
+~amd64 ~ppc ~x86
+multilib toolchain-funcs
++ppds
+
+
+
+4
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/net-wireless/wpa_supplicant-0.7.3-r2 b/metadata/cache/net-wireless/wpa_supplicant-0.7.3-r2
deleted file mode 100644
index 102b2b2a55c4..000000000000
--- a/metadata/cache/net-wireless/wpa_supplicant-0.7.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-libs/libnl ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) wimax? ( !net-wireless/libeap ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) virtual/pkgconfig
-dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-libs/libnl ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) wimax? ( !net-wireless/libeap ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) )
-0
-http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz
-
-http://hostap.epitest.fi/wpa_supplicant/
-|| ( GPL-2 BSD )
-IEEE 802.1X/WPA supplicant for secure wireless transfers
-amd64 arm ppc ppc64 x86 ~x86-fbsd
-base eutils multilib qt4-r2 toolchain-funcs user
-dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wimax wps kernel_linux kernel_FreeBSD
-
-
-
-2
-
-compile configure install postinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-wireless/wpa_supplicant-1.0 b/metadata/cache/net-wireless/wpa_supplicant-1.0
new file mode 100644
index 000000000000..b462d6daa055
--- /dev/null
+++ b/metadata/cache/net-wireless/wpa_supplicant-1.0
@@ -0,0 +1,22 @@
+dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 ) dev-libs/libnl:1.1 ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 ) dev-libs/libnl:1.1 ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager )
+0
+http://hostap.epitest.fi/releases/wpa_supplicant-1.0.tar.gz
+
+http://hostap.epitest.fi/wpa_supplicant/
+|| ( GPL-2 BSD )
+IEEE 802.1X/WPA supplicant for secure wireless transfers
+~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+base eutils multilib qt4-r2 systemd toolchain-funcs user
+dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD
+
+
+
+4
+
+compile configure install postinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-physics/root-5.32.03 b/metadata/cache/sci-physics/root-5.32.03
new file mode 100644
index 000000000000..5cdb495d9caf
--- /dev/null
+++ b/metadata/cache/sci-physics/root-5.32.03
@@ -0,0 +1,22 @@
+app-arch/xz-utils >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre media-libs/freetype media-libs/giflib media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg virtual/shadow X? ( media-libs/ftgl media-libs/glew x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) xft? ( x11-libs/libXft ) ) afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c[curl] ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) graphviz? ( media-gfx/graphviz ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) xrootd? ( net-libs/xrootd ) virtual/pkgconfig python? ( =dev-lang/python-2* )
+virtual/fortran app-arch/xz-utils >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre media-libs/freetype media-libs/giflib media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg virtual/shadow X? ( media-libs/ftgl media-libs/glew x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) xft? ( x11-libs/libXft ) ) afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c[curl] ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) graphviz? ( media-gfx/graphviz ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) xrootd? ( net-libs/xrootd ) reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd ) python? ( =dev-lang/python-2* )
+0
+ftp://root.cern.ch/root/root_v5.32.03.source.tar.gz doc? ( ftp://root.cern.ch/root/doc/Users_Guide_5_26.pdf math? ( ftp://root.cern.ch/root/doc/RooFit_Users_Manual_2.91-33.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.03.pdf ) )
+
+http://root.cern.ch/
+LGPL-2.1
+C++ data analysis framework and interpreter from CERN
+~amd64 ~x86 ~amd64-linux ~x86-linux
+elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user
++X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd
+!X? ( !opengl !qt4 !xft )
+
+
+4
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/gptfdisk-0.8.4 b/metadata/cache/sys-apps/gptfdisk-0.8.4
index cf8e22c174c0..f7482d220ace 100644
--- a/metadata/cache/sys-apps/gptfdisk-0.8.4
+++ b/metadata/cache/sys-apps/gptfdisk-0.8.4
@@ -6,7 +6,7 @@ mirror://sourceforge/gptfdisk/gptfdisk-0.8.4.tar.gz
 http://www.rodsbooks.com/gdisk/
 GPL-2
 gdisk - GPT partition table manipulator for Linux
-~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/sys-boot/yaboot-1.3.17-r1 b/metadata/cache/sys-boot/yaboot-1.3.17-r1
index 912bedaecb06..a9109bdb047c 100644
--- a/metadata/cache/sys-boot/yaboot-1.3.17-r1
+++ b/metadata/cache/sys-boot/yaboot-1.3.17-r1
@@ -6,7 +6,7 @@ http://yaboot.ozlabs.org/releases/yaboot-1.3.17.tar.gz
 http://yaboot.ozlabs.org
 GPL-2
 PPC Bootloader
--* ~ppc -ppc64
+-* ppc -ppc64
 eutils multilib toolchain-funcs user
 ibm
 
diff --git a/metadata/cache/sys-boot/yaboot-static-1.3.17 b/metadata/cache/sys-boot/yaboot-static-1.3.17
index cd8d462e991e..9e4a596c6774 100644
--- a/metadata/cache/sys-boot/yaboot-static-1.3.17
+++ b/metadata/cache/sys-boot/yaboot-static-1.3.17
@@ -6,7 +6,7 @@ mirror://gentoo/yaboot-static-1.3.17.tbz2
 http://penguinppc.org/projects/yaboot/
 GPL-2
 Static yaboot ppc boot loader for machines with open firmware
--* ~ppc64
+-* ppc64
 eutils multilib toolchain-funcs user
 ibm
 
diff --git a/metadata/cache/sys-fs/udisks-1.94.0 b/metadata/cache/sys-fs/udisks-1.94.0
deleted file mode 100644
index ba461134da48..000000000000
--- a/metadata/cache/sys-fs/udisks-1.94.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.32.0 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
->=dev-libs/glib-2.32.0 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) sys-apps/acl virtual/eject
-2
-http://udisks.freedesktop.org/releases/udisks-1.94.0.tar.bz2
-
-http://www.freedesktop.org/wiki/Software/udisks
-GPL-2
-Daemon providing interfaces to work with storage devices
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs user versionator
-debug doc +introspection
-
-
-
-4
-
-configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/udisks-1.96.0 b/metadata/cache/sys-fs/udisks-1.96.0
deleted file mode 100644
index d56df7748a8e..000000000000
--- a/metadata/cache/sys-fs/udisks-1.96.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
->=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject crypt? ( sys-fs/cryptsetup ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-2
-http://udisks.freedesktop.org/releases/udisks-1.96.0.tar.bz2
-
-http://www.freedesktop.org/wiki/Software/udisks
-GPL-2
-Daemon providing interfaces to work with storage devices
-~amd64 ~arm ~x86
-bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs user versionator
-debug doc crypt +gptfdisk +introspection systemd
-
-
-
-4
-
-configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/udisks-1.97.0 b/metadata/cache/sys-fs/udisks-1.97.0-r1
similarity index 94%
rename from metadata/cache/sys-fs/udisks-1.97.0
rename to metadata/cache/sys-fs/udisks-1.97.0-r1
index 2823e42e69b2..b11b20b49a3f 100644
--- a/metadata/cache/sys-fs/udisks-1.97.0
+++ b/metadata/cache/sys-fs/udisks-1.97.0-r1
@@ -6,7 +6,7 @@ http://udisks.freedesktop.org/releases/udisks-1.97.0.tar.bz2
 http://www.freedesktop.org/wiki/Software/udisks
 GPL-2
 Daemon providing interfaces to work with storage devices
-~amd64 ~arm ~x86
+~amd64 ~arm ~ppc ~ppc64 ~x86
 bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs user versionator
 debug doc crypt +gptfdisk +introspection systemd
 
@@ -14,7 +14,7 @@ debug doc crypt +gptfdisk +introspection systemd
 
 4
 
-configure install prepare setup
+configure install postinst prepare setup
 
 
 
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r100 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r100
deleted file mode 100644
index c81d356ed52f..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r100
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r100
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-102.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r101 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r101
deleted file mode 100644
index 1bcf3522ba5c..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r101
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r101
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-103.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r102 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r102
deleted file mode 100644
index 642b92196968..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r102
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r102
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-104.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r103 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r103
deleted file mode 100644
index c84f0dd4fdf4..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r103
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r103
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-105.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.15 b/metadata/cache/sys-kernel/hardened-sources-3.2.15
deleted file mode 100644
index f538b623aac2..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.15
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.15
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.15-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-13.base.tar.bz2 mirror://gentoo/genpatches-3.2-13.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.2)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.16 b/metadata/cache/sys-kernel/hardened-sources-3.2.16
deleted file mode 100644
index 5c75065dea78..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.16
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.16
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.2)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.16-r1 b/metadata/cache/sys-kernel/hardened-sources-3.2.16-r1
deleted file mode 100644
index 5153c61e197c..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.16-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.16-r1
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.2)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.16-r2 b/metadata/cache/sys-kernel/hardened-sources-3.2.16-r2
deleted file mode 100644
index 9a912e3a5b2d..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.16-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.16-r2
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.2)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.2 b/metadata/cache/sys-kernel/hardened-sources-3.3.2
deleted file mode 100644
index bab11b7d8ed5..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.2
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.2
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-3.base.tar.bz2 mirror://gentoo/genpatches-3.3-3.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.3)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.3 b/metadata/cache/sys-kernel/hardened-sources-3.3.3
deleted file mode 100644
index e8fa838167ba..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.3
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.3-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-4.base.tar.bz2 mirror://gentoo/genpatches-3.3-4.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.3)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.4 b/metadata/cache/sys-kernel/hardened-sources-3.3.4
deleted file mode 100644
index 4a94aeb7863f..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.4
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.4
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.4-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.3)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.5 b/metadata/cache/sys-kernel/hardened-sources-3.3.5
deleted file mode 100644
index 65356bd9682d..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.5
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.5
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.5-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.3)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/virtual/ffmpeg-0.10.2-r1 b/metadata/cache/virtual/ffmpeg-0.10.2-r1
index 68f4bc93ea75..7b4d25cf9849 100644
--- a/metadata/cache/virtual/ffmpeg-0.10.2-r1
+++ b/metadata/cache/virtual/ffmpeg-0.10.2-r1
@@ -6,7 +6,7 @@
 
 
 Virtual package for FFmpeg implementation
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 
 X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264
 
diff --git a/metadata/cache/virtual/monodoc-2.11 b/metadata/cache/virtual/monodoc-2.11
new file mode 100644
index 000000000000..947fd7787982
--- /dev/null
+++ b/metadata/cache/virtual/monodoc-2.11
@@ -0,0 +1,22 @@
+
+=dev-lang/mono-2.11*
+0
+
+
+
+
+Virtual for monodoc
+~amd64 ~ppc ~x86
+eutils multilib toolchain-funcs user versionator
+
+
+
+
+
+virtual
+-
+
+
+
+
+
diff --git a/metadata/cache/www-client/chromium-19.0.1084.46 b/metadata/cache/www-client/chromium-19.0.1084.46
index e59466cd5264..9b56780182df 100644
--- a/metadata/cache/www-client/chromium-19.0.1084.46
+++ b/metadata/cache/www-client/chromium-19.0.1084.46
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/chromium-19.0.
 http://chromium.org/
 BSD
 Open-source version of Google Chrome web browser
-~amd64 ~x86
+~amd64 x86
 chromium eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
 bindist cups gnome gnome-keyring kerberos pulseaudio custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 
diff --git a/metadata/cache/www-client/midori-0.4.4 b/metadata/cache/www-client/midori-0.4.4
deleted file mode 100644
index f9fde16dbad7..000000000000
--- a/metadata/cache/www-client/midori-0.4.4
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
-dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 )
-0
-mirror://xfce/src/apps/midori/0.4/midori-0.4.4.tar.bz2
-
-http://www.twotoasts.de/index.php?/pages/midori_summary.html
-LGPL-2.1 MIT
-A lightweight web browser based on WebKitGTK+
-~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-base eutils fdo-mime gnome2-utils multilib python toolchain-funcs user waf-utils
-doc gnome libnotify nls +unique
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/midori-0.4.5 b/metadata/cache/www-client/midori-0.4.6
similarity index 95%
rename from metadata/cache/www-client/midori-0.4.5
rename to metadata/cache/www-client/midori-0.4.6
index ece31fc84942..0ae5e7043309 100644
--- a/metadata/cache/www-client/midori-0.4.5
+++ b/metadata/cache/www-client/midori-0.4.6
@@ -1,7 +1,7 @@
 dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
 dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 )
 0
-mirror://xfce/src/apps/midori/0.4/midori-0.4.5.tar.bz2
+mirror://xfce/src/apps/midori/0.4/midori-0.4.6.tar.bz2
 
 http://www.twotoasts.de/index.php?/pages/midori_summary.html
 LGPL-2.1 MIT
diff --git a/metadata/cache/www-client/midori-9999 b/metadata/cache/www-client/midori-9999
index 5e57150d1ab1..96539096e3dc 100644
--- a/metadata/cache/www-client/midori-9999
+++ b/metadata/cache/www-client/midori-9999
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads] dev-vcs/git
+dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.16 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads] dev-vcs/git
 dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 )
 0
 
diff --git a/metadata/cache/x11-apps/appres-1.0.3 b/metadata/cache/x11-apps/appres-1.0.3
index 4b586c6e5c24..c37075c18215 100644
--- a/metadata/cache/x11-apps/appres-1.0.3
+++ b/metadata/cache/x11-apps/appres-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/appres-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 list X application resource database
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/bitmap-1.0.6 b/metadata/cache/x11-apps/bitmap-1.0.6
index fdd3a380c33b..8fde8977b9a3 100644
--- a/metadata/cache/x11-apps/bitmap-1.0.6
+++ b/metadata/cache/x11-apps/bitmap-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org bitmap application
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/sessreg-1.0.7 b/metadata/cache/x11-apps/sessreg-1.0.7
index 54aa757ca315..32c9ffe3d437 100644
--- a/metadata/cache/x11-apps/sessreg-1.0.7
+++ b/metadata/cache/x11-apps/sessreg-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 manage utmp/wtmp entries for non-init clients
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/setxkbmap-1.3.0 b/metadata/cache/x11-apps/setxkbmap-1.3.0
index ee194ba684dd..cb2d6e0be293 100644
--- a/metadata/cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/cache/x11-apps/setxkbmap-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Controls the keyboard layout of a running X server.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/smproxy-1.0.5 b/metadata/cache/x11-apps/smproxy-1.0.5
index 31af86e67a33..50ecf752a222 100644
--- a/metadata/cache/x11-apps/smproxy-1.0.5
+++ b/metadata/cache/x11-apps/smproxy-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Session Manager Proxy
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/x11perf-1.5.4 b/metadata/cache/x11-apps/x11perf-1.5.4
index 843662f20d05..d683cad5f8b1 100644
--- a/metadata/cache/x11-apps/x11perf-1.5.4
+++ b/metadata/cache/x11-apps/x11perf-1.5.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X rendering operation stress test utility
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xbacklight-1.1.2 b/metadata/cache/x11-apps/xbacklight-1.1.2
index 40048d67589b..2a160c4fca2a 100644
--- a/metadata/cache/x11-apps/xbacklight-1.1.2
+++ b/metadata/cache/x11-apps/xbacklight-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Sets backlight level using the RandR 1.2 BACKLIGHT output property
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xcmsdb-1.0.4 b/metadata/cache/x11-apps/xcmsdb-1.0.4
index 08db719ae169..ca0f0e36daed 100644
--- a/metadata/cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/cache/x11-apps/xcmsdb-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Device Color Characterization utility for X Color Management System
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xdpyinfo-1.3.0 b/metadata/cache/x11-apps/xdpyinfo-1.3.0
index 331c8ac53d80..d7759b1b62b7 100644
--- a/metadata/cache/x11-apps/xdpyinfo-1.3.0
+++ b/metadata/cache/x11-apps/xdpyinfo-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.3.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Display information utility for X
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 dga dmx xinerama
 
diff --git a/metadata/cache/x11-apps/xdriinfo-1.0.4 b/metadata/cache/x11-apps/xdriinfo-1.0.4
index d194b347c901..aa416709e308 100644
--- a/metadata/cache/x11-apps/xdriinfo-1.0.4
+++ b/metadata/cache/x11-apps/xdriinfo-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 query configuration information of DRI drivers
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xev-1.2.0 b/metadata/cache/x11-apps/xev-1.2.0
index 8841c57cef84..08a74a0869e2 100644
--- a/metadata/cache/x11-apps/xev-1.2.0
+++ b/metadata/cache/x11-apps/xev-1.2.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 print contents of X events
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-interix ~x86-linux ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xf86dga-1.0.3 b/metadata/cache/x11-apps/xf86dga-1.0.3
index 5dac876b8f93..7b306ba28dc6 100644
--- a/metadata/cache/x11-apps/xf86dga-1.0.3
+++ b/metadata/cache/x11-apps/xf86dga-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xf86dga-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 test program for the XFree86-DGA extension
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xgamma-1.0.5 b/metadata/cache/x11-apps/xgamma-1.0.5
index 36ca293288ac..077b28151b4d 100644
--- a/metadata/cache/x11-apps/xgamma-1.0.5
+++ b/metadata/cache/x11-apps/xgamma-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Alter a monitor's gamma correction through the X server
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xinput-1.5.4 b/metadata/cache/x11-apps/xinput-1.5.4
index ff1ccccf36bf..b353007124ae 100644
--- a/metadata/cache/x11-apps/xinput-1.5.4
+++ b/metadata/cache/x11-apps/xinput-1.5.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Utility to set XInput device parameters
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xkbevd-1.1.3 b/metadata/cache/x11-apps/xkbevd-1.1.3
index 157e750ca526..5bca281fd438 100644
--- a/metadata/cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/cache/x11-apps/xkbevd-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 XKB event daemon
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xkbutils-1.0.3 b/metadata/cache/x11-apps/xkbutils-1.0.3
index 5bce8fecbe44..6e26ec01675a 100644
--- a/metadata/cache/x11-apps/xkbutils-1.0.3
+++ b/metadata/cache/x11-apps/xkbutils-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xkbutils application
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xkill-1.0.3 b/metadata/cache/x11-apps/xkill-1.0.3
index 39c67e68384d..99d48f48e989 100644
--- a/metadata/cache/x11-apps/xkill-1.0.3
+++ b/metadata/cache/x11-apps/xkill-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.3.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 kill a client by its X resource
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xlsatoms-1.1.1 b/metadata/cache/x11-apps/xlsatoms-1.1.1
index 436e0e0915da..6a1bd47a247f 100644
--- a/metadata/cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/cache/x11-apps/xlsatoms-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 list interned atoms defined on server
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xlsclients-1.1.2 b/metadata/cache/x11-apps/xlsclients-1.1.2
index 7867b748e45b..948185f8bf9a 100644
--- a/metadata/cache/x11-apps/xlsclients-1.1.2
+++ b/metadata/cache/x11-apps/xlsclients-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xlsclients application
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xmodmap-1.0.7 b/metadata/cache/x11-apps/xmodmap-1.0.7
index 5cf1d2f43e03..263d086b0852 100644
--- a/metadata/cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/cache/x11-apps/xmodmap-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 utility for modifying keymaps and pointer button mappings in X
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xpr-1.0.4 b/metadata/cache/x11-apps/xpr-1.0.4
index 29ec528be5c1..8cd76a9bbff0 100644
--- a/metadata/cache/x11-apps/xpr-1.0.4
+++ b/metadata/cache/x11-apps/xpr-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xpr application
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xrandr-1.3.5 b/metadata/cache/x11-apps/xrandr-1.3.5
index aebbe95d6e2f..e20f0b4ef4e9 100644
--- a/metadata/cache/x11-apps/xrandr-1.3.5
+++ b/metadata/cache/x11-apps/xrandr-1.3.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 primitive command line interface to RandR extension
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xrefresh-1.0.4 b/metadata/cache/x11-apps/xrefresh-1.0.4
index a1d010574e13..28277b41c1bc 100644
--- a/metadata/cache/x11-apps/xrefresh-1.0.4
+++ b/metadata/cache/x11-apps/xrefresh-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 refresh all or part of an X screen
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xsetroot-1.1.0 b/metadata/cache/x11-apps/xsetroot-1.1.0
index b1747910939f..73d0c29c0436 100644
--- a/metadata/cache/x11-apps/xsetroot-1.1.0
+++ b/metadata/cache/x11-apps/xsetroot-1.1.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.1.0.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 X.Org xsetroot application
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xvinfo-1.1.1 b/metadata/cache/x11-apps/xvinfo-1.1.1
index bade53c5585f..c07266145069 100644
--- a/metadata/cache/x11-apps/xvinfo-1.1.1
+++ b/metadata/cache/x11-apps/xvinfo-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.1.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 Print out X-Video extension adaptor information
-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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xwd-1.0.5 b/metadata/cache/x11-apps/xwd-1.0.5
index 6e9033195b21..0a5a3fc78186 100644
--- a/metadata/cache/x11-apps/xwd-1.0.5
+++ b/metadata/cache/x11-apps/xwd-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 dump an image of an X window
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xwininfo-1.1.2 b/metadata/cache/x11-apps/xwininfo-1.1.2
index 166373e7eea2..5b20ca4014c2 100644
--- a/metadata/cache/x11-apps/xwininfo-1.1.2
+++ b/metadata/cache/x11-apps/xwininfo-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.2.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 window information utility for X
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-apps/xwud-1.0.4 b/metadata/cache/x11-apps/xwud-1.0.4
index 462625a0fab0..56307fafddfc 100644
--- a/metadata/cache/x11-apps/xwud-1.0.4
+++ b/metadata/cache/x11-apps/xwud-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
 http://xorg.freedesktop.org/
 MIT
 image displayer for X
-~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 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/cache/x11-base/xorg-x11-7.4-r2 b/metadata/cache/x11-base/xorg-x11-7.4-r2
index 6c1a57ce080e..320cb32026da 100644
--- a/metadata/cache/x11-base/xorg-x11-7.4-r2
+++ b/metadata/cache/x11-base/xorg-x11-7.4-r2
@@ -6,7 +6,7 @@ x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth
 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
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/x11-libs/libfm-0.1.12 b/metadata/cache/x11-libs/libfm-0.1.12
index 08ce0ca1dc5a..646b64f81187 100644
--- a/metadata/cache/x11-libs/libfm-0.1.12
+++ b/metadata/cache/x11-libs/libfm-0.1.12
@@ -1,5 +1,5 @@
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 udev? ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] )
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 udev? ( || ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] >=gnome-base/gvfs-1.6.4-r2[udisks,udev] ) )
 0
 mirror://sourceforge/pcmanfm/libfm-0.1.12.tar.gz
 
diff --git a/metadata/cache/x11-libs/qt-demo-4.8.1-r1 b/metadata/cache/x11-libs/qt-demo-4.8.1-r1
index f8e92d0fdf3c..bf6cc9c63a41 100644
--- a/metadata/cache/x11-libs/qt-demo-4.8.1-r1
+++ b/metadata/cache/x11-libs/qt-demo-4.8.1-r1
@@ -1,5 +1,5 @@
-~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] aqua? ( ~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
-~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] aqua? ( ~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1 !>x11-libs/qt-assistant-4.8.1-r9999 !<x11-libs/qt-bearer-4.8.1 !>x11-libs/qt-bearer-4.8.1-r9999 !<x11-libs/qt-core-4.8.1 !>x11-libs/qt-core-4.8.1-r9999 !<x11-libs/qt-dbus-4.8.1 !>x11-libs/qt-dbus-4.8.1-r9999 !<x11-libs/qt-declarative-4.8.1 !>x11-libs/qt-declarative-4.8.1-r9999 !<x11-libs/qt-demo-4.8.1 !>x11-libs/qt-demo-4.8.1-r9999 !<x11-libs/qt-gui-4.8.1 !>x11-libs/qt-gui-4.8.1-r9999 !<x11-libs/qt-multimedia-4.8.1 !>x11-libs/qt-multimedia-4.8.1-r9999 !<x11-libs/qt-opengl-4.8.1 !>x11-libs/qt-opengl-4.8.1-r9999 !<x11-libs/qt-openvg-4.8.1 !>x11-libs/qt-openvg-4.8.1-r9999 !<x11-libs/qt-phonon-4.8.1 !>x11-libs/qt-phonon-4.8.1-r9999 !<x11-libs/qt-qt3support-4.8.1 !>x11-libs/qt-qt3support-4.8.1-r9999 !<x11-libs/qt-script-4.8.1 !>x11-libs/qt-script-4.8.1-r9999 !<x11-libs/qt-sql-4.8.1 !>x11-libs/qt-sql-4.8.1-r9999 !<x11-libs/qt-svg-4.8.1 !>x11-libs/qt-svg-4.8.1-r9999 !<x11-libs/qt-test-4.8.1 !>x11-libs/qt-test-4.8.1-r9999 !<x11-libs/qt-webkit-4.8.1 !>x11-libs/qt-webkit-4.8.1-r9999 !<x11-libs/qt-xmlpatterns-4.8.1 !>x11-libs/qt-xmlpatterns-4.8.1-r9999
+~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
+~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1 !>x11-libs/qt-assistant-4.8.1-r9999 !<x11-libs/qt-bearer-4.8.1 !>x11-libs/qt-bearer-4.8.1-r9999 !<x11-libs/qt-core-4.8.1 !>x11-libs/qt-core-4.8.1-r9999 !<x11-libs/qt-dbus-4.8.1 !>x11-libs/qt-dbus-4.8.1-r9999 !<x11-libs/qt-declarative-4.8.1 !>x11-libs/qt-declarative-4.8.1-r9999 !<x11-libs/qt-demo-4.8.1 !>x11-libs/qt-demo-4.8.1-r9999 !<x11-libs/qt-gui-4.8.1 !>x11-libs/qt-gui-4.8.1-r9999 !<x11-libs/qt-multimedia-4.8.1 !>x11-libs/qt-multimedia-4.8.1-r9999 !<x11-libs/qt-opengl-4.8.1 !>x11-libs/qt-opengl-4.8.1-r9999 !<x11-libs/qt-openvg-4.8.1 !>x11-libs/qt-openvg-4.8.1-r9999 !<x11-libs/qt-phonon-4.8.1 !>x11-libs/qt-phonon-4.8.1-r9999 !<x11-libs/qt-qt3support-4.8.1 !>x11-libs/qt-qt3support-4.8.1-r9999 !<x11-libs/qt-script-4.8.1 !>x11-libs/qt-script-4.8.1-r9999 !<x11-libs/qt-sql-4.8.1 !>x11-libs/qt-sql-4.8.1-r9999 !<x11-libs/qt-svg-4.8.1 !>x11-libs/qt-svg-4.8.1-r9999 !<x11-libs/qt-test-4.8.1 !>x11-libs/qt-test-4.8.1-r9999 !<x11-libs/qt-webkit-4.8.1 !>x11-libs/qt-webkit-4.8.1-r9999 !<x11-libs/qt-xmlpatterns-4.8.1 !>x11-libs/qt-xmlpatterns-4.8.1-r9999
 4
 http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.1.tar.gz
 
diff --git a/metadata/cache/x11-misc/dclock-2.2.2_p4 b/metadata/cache/x11-misc/dclock-2.2.2_p4
index 262ac74c33c5..4ff208adcd73 100644
--- a/metadata/cache/x11-misc/dclock-2.2.2_p4
+++ b/metadata/cache/x11-misc/dclock-2.2.2_p4
@@ -1,9 +1,9 @@
-x11-libs/libX11 x11-libs/libXt x11-libs/libXext app-text/rman x11-misc/imake
-x11-libs/libX11 x11-libs/libXt x11-libs/libXext app-text/rman
+x11-libs/libX11 x11-libs/libXext x11-libs/libXt app-text/rman x11-misc/imake
+x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 0
 mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-4.debian.tar.gz
 
-ftp://ftp.ac-grenoble.fr/ge/Xutils/
+http://packages.qa.debian.org/d/dclock.html
 GPL-2
 Digital clock for the X window system.
 ~amd64 ~ppc ~x86
@@ -12,7 +12,7 @@ eutils multilib toolchain-funcs user
 
 
 
-2
+4
 
 compile configure install prepare
 
diff --git a/metadata/cache/x11-misc/qtnotifydaemon-1.0.14 b/metadata/cache/x11-misc/qtnotifydaemon-1.0.14
index 14722faf3ccb..597adf51dabf 100644
--- a/metadata/cache/x11-misc/qtnotifydaemon-1.0.14
+++ b/metadata/cache/x11-misc/qtnotifydaemon-1.0.14
@@ -3,7 +3,7 @@ x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 !x
 0
 mirror://sourceforge/qtnotifydaemon/qtnotifydaemon_1.0.14.orig.tar.gz
 
-http://drull.org.ru/qtnotifydaemon/ http://sourceforge.net/projects/qtnotifydaemon/
+http://sourceforge.net/projects/qtnotifydaemon/
 GPL-3
 A flexible and configurable notification daemon
 ~amd64 ~x86
diff --git a/metadata/cache/x11-misc/sisctrl-0.0.20051202 b/metadata/cache/x11-misc/sisctrl-0.0.20051202
index 757eaaa195b7..898093d7e66f 100644
--- a/metadata/cache/x11-misc/sisctrl-0.0.20051202
+++ b/metadata/cache/x11-misc/sisctrl-0.0.20051202
@@ -1,9 +1,9 @@
-virtual/pkgconfig dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-proto/xf86vidmodeproto
-dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-proto/xf86vidmodeproto
+dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-proto/xf86vidmodeproto
+dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
 0
 http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
 
-http://www.winischhofer.net/linuxsis630.shtml
+http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
 GPL-2
 tool that allows you to tune SiS drivers from X
 ~amd64 x86
@@ -12,9 +12,9 @@ eutils multilib toolchain-funcs user
 
 
 
-2
+4
 
-install prepare
+prepare
 
 
 
diff --git a/metadata/cache/x11-misc/tinymount-0.2.4 b/metadata/cache/x11-misc/tinymount-0.2.4
new file mode 100644
index 000000000000..61bba820b60a
--- /dev/null
+++ b/metadata/cache/x11-misc/tinymount-0.2.4
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4 x11-libs/qt-dbus:4 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig
+x11-libs/qt-gui:4 x11-libs/qt-dbus:4 libnotify? ( x11-libs/libnotify ) sys-fs/udisks:0
+0
+mirror://github/limansky/tinymount/tinymount-0.2.4.tar.bz2
+
+http://github.com/limansky/tinymount
+GPL-2
+Simple disk mount utility
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+debug libnotify linguas_ru
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/touchcal-0.50 b/metadata/cache/x11-misc/touchcal-0.50
new file mode 100644
index 000000000000..7d9becb06184
--- /dev/null
+++ b/metadata/cache/x11-misc/touchcal-0.50
@@ -0,0 +1,22 @@
+sys-libs/ncurses
+sys-libs/ncurses
+0
+mirror://sourceforge/touchcal/touchcal-0.50.tar.gz
+
+http://touchcal.sourceforge.net/
+GPL-2
+Touchscreen calibration utility
+~amd64 ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/xcb-2.4 b/metadata/cache/x11-misc/xcb-2.4
index 90339730980a..ab82812d24f9 100644
--- a/metadata/cache/x11-misc/xcb-2.4
+++ b/metadata/cache/x11-misc/xcb-2.4
@@ -1,9 +1,9 @@
 x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-proto/xproto motif? ( >=x11-libs/openmotif-2.3:0 )
 x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 0
-http://www.goof.com/pcg/marc/data/xcb-2.4.tar.gz
+http://oldhome.schmorp.de/marc/data/xcb-2.4.tar.gz
 
-http://www.goof.com/pcg/marc/xcb.html
+http://oldhome.schmorp.de/marc/xcb.html
 BSD
 Marc Lehmann's improved X Cut Buffers
 alpha amd64 ~ppc x86
diff --git a/metadata/cache/x11-misc/xcb-2.4-r1 b/metadata/cache/x11-misc/xcb-2.4-r1
index 90339730980a..ab82812d24f9 100644
--- a/metadata/cache/x11-misc/xcb-2.4-r1
+++ b/metadata/cache/x11-misc/xcb-2.4-r1
@@ -1,9 +1,9 @@
 x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-proto/xproto motif? ( >=x11-libs/openmotif-2.3:0 )
 x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 0
-http://www.goof.com/pcg/marc/data/xcb-2.4.tar.gz
+http://oldhome.schmorp.de/marc/data/xcb-2.4.tar.gz
 
-http://www.goof.com/pcg/marc/xcb.html
+http://oldhome.schmorp.de/marc/xcb.html
 BSD
 Marc Lehmann's improved X Cut Buffers
 alpha amd64 ~ppc x86
diff --git a/metadata/cache/x11-terms/root-tail-1.2-r2 b/metadata/cache/x11-terms/root-tail-1.2-r2
index 3f60ce496ee5..96a7c0576af2 100644
--- a/metadata/cache/x11-terms/root-tail-1.2-r2
+++ b/metadata/cache/x11-terms/root-tail-1.2-r2
@@ -1,9 +1,9 @@
 x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
 x11-libs/libXext x11-libs/libX11
 0
-http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
+http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 
-http://www.goof.com/pcg/marc/root-tail.html
+http://oldhome.schmorp.de/marc/root-tail.html
 GPL-2
 Terminal to display (multiple) log files on the root window
 amd64 ppc ppc64 x86
diff --git a/metadata/cache/x11-terms/root-tail-1.2-r3 b/metadata/cache/x11-terms/root-tail-1.2-r3
index 1c97ad83dd02..9f2ad8efaa79 100644
--- a/metadata/cache/x11-terms/root-tail-1.2-r3
+++ b/metadata/cache/x11-terms/root-tail-1.2-r3
@@ -1,9 +1,9 @@
 x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
 x11-libs/libXext x11-libs/libX11
 0
-http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
+http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 
-http://www.goof.com/pcg/marc/root-tail.html
+http://oldhome.schmorp.de/marc/root-tail.html
 GPL-2
 Terminal to display (multiple) log files on the root window
 amd64 ppc ppc64 x86
diff --git a/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r200 b/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r200
index edd492243049..2525f070544a 100644
--- a/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r200
+++ b/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r200
@@ -6,7 +6,7 @@ mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.0.tar.bz2
 http://www.xfce.org/projects/
 GPL-2
 A port of Xfce engine to GTK+-2.x
-~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 autotools base eutils fdo-mime gnome2-utils libtool multilib toolchain-funcs user xfconf
 debug
 
diff --git a/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r300 b/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r300
index 0f4170e4d774..bbe93f8b8f9e 100644
--- a/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r300
+++ b/metadata/cache/x11-themes/gtk-engines-xfce-3.0.0-r300
@@ -6,7 +6,7 @@ mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.0.tar.bz2
 http://www.xfce.org/projects/
 GPL-2
 A port of Xfce engine to GTK+-3.x
-~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 autotools base eutils fdo-mime gnome2-utils libtool multilib toolchain-funcs user xfconf
 debug
 
diff --git a/metadata/cache/x11-themes/xcursor-themes-1.0.3 b/metadata/cache/x11-themes/xcursor-themes-1.0.3
index 92f44000b0f5..21e3c9791156 100644
--- a/metadata/cache/x11-themes/xcursor-themes-1.0.3
+++ b/metadata/cache/x11-themes/xcursor-themes-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.3.tar.bz
 http://xorg.freedesktop.org/
 MIT
 X.Org cursor themes: whiteglass, redglass and handhelds
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user xorg-2
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 956097502652..37517c388d22 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 May 2012 07:37:22 +0000
+Tue, 15 May 2012 18:07:42 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 956097502652..37517c388d22 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 May 2012 07:37:22 +0000
+Tue, 15 May 2012 18:07:42 +0000
diff --git a/metadata/md5-cache/app-arch/createrepo-0.9.7 b/metadata/md5-cache/app-arch/createrepo-0.9.7
deleted file mode 100644
index 8d598ce20050..000000000000
--- a/metadata/md5-cache/app-arch/createrepo-0.9.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Creates a common metadata repository
-EAPI=2
-HOMEPAGE=http://createrepo.baseurl.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/python >=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python]
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.9.7.tar.gz
-_md5_=3fccfac710c561dc0c31e3a919a2c549
diff --git a/metadata/md5-cache/app-arch/createrepo-0.9.7-r1 b/metadata/md5-cache/app-arch/createrepo-0.9.7-r1
deleted file mode 100644
index bccacbce93b5..000000000000
--- a/metadata/md5-cache/app-arch/createrepo-0.9.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-DESCRIPTION=Creates a common metadata repository
-EAPI=3
-HOMEPAGE=http://createrepo.baseurl.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.9.7.tar.gz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=6b5e2db607f2f663400d37ae1ede015a
diff --git a/metadata/md5-cache/app-arch/createrepo-0.9.8 b/metadata/md5-cache/app-arch/createrepo-0.9.8
deleted file mode 100644
index 7f4cb619d0f4..000000000000
--- a/metadata/md5-cache/app-arch/createrepo-0.9.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Creates a common metadata repository
-EAPI=2
-HOMEPAGE=http://createrepo.baseurl.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/python >=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] >=sys-apps/yum-3.2.23
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.9.8.tar.gz
-_md5_=5da6ca4b2c5a3883dd890845451e950f
diff --git a/metadata/md5-cache/app-arch/createrepo-0.9.8-r1 b/metadata/md5-cache/app-arch/createrepo-0.9.8-r1
deleted file mode 100644
index 90350b6ace8e..000000000000
--- a/metadata/md5-cache/app-arch/createrepo-0.9.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-DESCRIPTION=Creates a common metadata repository
-EAPI=3
-HOMEPAGE=http://createrepo.baseurl.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.0[python] dev-libs/libxml2[python] >=sys-apps/yum-3.2.23 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.9.8.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9b8599c9567f094c84f22760545f0b17
diff --git a/metadata/md5-cache/app-arch/createrepo-0.9.9 b/metadata/md5-cache/app-arch/createrepo-0.9.9
new file mode 100644
index 000000000000..ed6fabab75a5
--- /dev/null
+++ b/metadata/md5-cache/app-arch/createrepo-0.9.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND==dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+DESCRIPTION=Creates a common metadata repository
+EAPI=4
+HOMEPAGE=http://createrepo.baseurl.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/urlgrabber-2.9.0 >=app-arch/rpm-4.1.1[python] dev-libs/libxml2[python] >=app-arch/deltarpm-3.6_pre20110223[python] dev-python/pyliblzma >=sys-apps/yum-3.4.3 =dev-lang/python-2.7* =dev-lang/python-2.7*[xml]
+SLOT=0
+SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.9.9.tar.gz http://dev.gentoo.org/~pacho/maintainer-needed/createrepo-0.9.9-head.patch.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=f00617edf5ba0f218a51508b1d3c23a9
diff --git a/metadata/md5-cache/app-arch/deltarpm-3.5 b/metadata/md5-cache/app-arch/deltarpm-3.5
deleted file mode 100644
index 9dae8e8ad1ec..000000000000
--- a/metadata/md5-cache/app-arch/deltarpm-3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5
-DESCRIPTION=tools to create and apply deltarpms
-EAPI=3
-HOMEPAGE=ftp://ftp.suse.com/pub/projects/deltarpm/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/deltarpm/deltarpm-3.5.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ec33360811ebdb2ca23a527edcc036f0
diff --git a/metadata/md5-cache/app-arch/deltarpm-3.6_pre20110223 b/metadata/md5-cache/app-arch/deltarpm-3.6_pre20110223
new file mode 100644
index 000000000000..85c69b2644d8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/deltarpm-3.6_pre20110223
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile prepare setup
+DEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? ( =dev-lang/python-2.7* )
+DESCRIPTION=tools to create and apply deltarpms
+EAPI=4
+HOMEPAGE=http://gitorious.org/deltarpm/deltarpm
+IUSE=python
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python? ( =dev-lang/python-2.7* )
+SLOT=0
+SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/deltarpm-git-20110223.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/deltarpm-git-20110223.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=86edbe85aa90194f77da95e66e3a1123
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r1
index f75d0e59236b..e1d112b3163d 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r1
@@ -10,4 +10,4 @@ RDEPEND=!app-benchmarks/bootchart dev-python/pycairo[svg?] dev-python/pygtk sys-
 SLOT=0
 SRC_URI=mirror://github/mmeeks/bootchart/bootchart2-0.14.2.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a4c6e489881608d00fdce0d8f96a7fbf
+_md5_=326ef142dda01fdcd5d67ad0ef7516c5
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r2 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r2
index 2aeb5b6f9267..9db3b48c1423 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r2
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.2-r2
@@ -10,4 +10,4 @@ RDEPEND=!app-benchmarks/bootchart dev-python/pycairo[svg?] dev-python/pygtk sys-
 SLOT=0
 SRC_URI=mirror://github/mmeeks/bootchart/bootchart2-0.14.2.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9f4a93eb17066e6f1dc515630eb4699b
+_md5_=5bcb89a1f03d7dd7c5f9abe76c35be83
diff --git a/metadata/md5-cache/app-doc/elisp-manual-23.4 b/metadata/md5-cache/app-doc/elisp-manual-23.4
new file mode 100644
index 000000000000..5df0348967e3
--- /dev/null
+++ b/metadata/md5-cache/app-doc/elisp-manual-23.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/xz-utils
+DESCRIPTION=The GNU Emacs Lisp Reference Manual
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/emacs/manual/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=FDL-1.3
+SLOT=23
+SRC_URI=mirror://gentoo/elisp-manual-23.4.tar.xz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=1c17b92365d272073507b3094375b2e0
diff --git a/metadata/md5-cache/app-i18n/enca-1.13-r2 b/metadata/md5-cache/app-i18n/enca-1.13-r2
index 2126e017379a..2567902afe7c 100644
--- a/metadata/md5-cache/app-i18n/enca-1.13-r2
+++ b/metadata/md5-cache/app-i18n/enca-1.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=ENCA detects the character coding of a file and converts it if desir
 EAPI=4
 HOMEPAGE=http://gitorious.org/enca
 IUSE=doc +recode
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.13.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8cc9e9b686ff29243ed22ebc22988d1a
+_md5_=8e74f4e7ed100a64624f8bf6c2c0cc8f
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.2.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
index cbb86b44ea20..65850923a31a 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-3.5.2.2-r1
@@ -3,10 +3,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=4
 HOMEPAGE=http://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* ~x86
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-3.5.2.2-r1[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
-SRC_URI=x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) )
-_md5_=c91701067c56328a5f500f369422a16c
+SRC_URI=amd64? ( kde? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/amd64-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-debug-libreoffice-kde-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-kde-java-3.5.2.2-r1.tar.xz ) ) gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-gnome-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-gnome-java-3.5.2.2-r1.tar.xz ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-debug-libreoffice-base-3.5.2.2-r1.tar.xz ) java? ( mirror://gentoo/x86-debug-libreoffice-base-java-3.5.2.2-r1.tar.xz ) ) ) )
+_md5_=ff8c240f69843b9bdfa1fd676600b43e
diff --git a/metadata/md5-cache/app-text/recode-3.6_p17-r2 b/metadata/md5-cache/app-text/recode-3.6_p17-r2
index a9b48a142e71..add732795cd7 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p17-r2
+++ b/metadata/md5-cache/app-text/recode-3.6_p17-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Convert files between various character sets
 EAPI=3
 HOMEPAGE=http://recode.progiciels-bpi.ca/
 IUSE=nls static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-17.diff.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3b93c66313e23efc68d987adcca3ae6a
+_md5_=e271544678c3e06d10328700b9735b77
diff --git a/metadata/md5-cache/app-vim/automatictexplugin-11 b/metadata/md5-cache/app-vim/automatictexplugin-11
new file mode 100644
index 000000000000..5f346f4f9189
--- /dev/null
+++ b/metadata/md5-cache/app-vim/automatictexplugin-11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a comprehensive plugin for editing LaTeX files
+EAPI=4
+HOMEPAGE=http://atp-vim.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) !app-vim/vim-latex app-vim/align app-text/wdiff >=dev-lang/python-2.7 dev-python/psutil dev-tex/latexmk dev-tex/detex virtual/tex-base || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_11.tar.gz
+_eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	af7939f5d748a2ceeff320440e8905b1
+_md5_=a85642ef0457a26ab899d6289955c5a6
diff --git a/metadata/md5-cache/dev-haskell/pango-0.12.3 b/metadata/md5-cache/dev-haskell/pango-0.12.3
new file mode 100644
index 000000000000..92b420a3e412
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pango-0.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND==dev-haskell/cairo-0.12*[profile?] =dev-haskell/glib-0.12*[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango dev-haskell/gtk2hs-buildtools doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binding to the Pango text rendering engine.
+EAPI=3
+HOMEPAGE=http://projects.haskell.org/gtk2hs/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND==dev-haskell/cairo-0.12*[profile?] =dev-haskell/glib-0.12*[profile?] dev-haskell/mtl[profile?] >=dev-lang/ghc-6.10.1 x11-libs/cairo x11-libs/pango dev-lang/ghc
+SLOT=0
+SRC_URI=http://hackage.haskell.org/packages/archive/pango/0.12.3/pango-0.12.3.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	ghc-package	f39fadb76cd4747582996e6b0d44479c	haskell-cabal	6054440acd4fac31e40a9595827325e0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3b8084aa2cc8560ef3f153ba1ca1bf4e
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.16 b/metadata/md5-cache/dev-lang/orc-0.4.16
index 8251c8229958..870fe92ee53e 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.16
+++ b/metadata/md5-cache/dev-lang/orc-0.4.16
@@ -4,9 +4,9 @@ DESCRIPTION=The Oil Runtime Compiler
 EAPI=4
 HOMEPAGE=http://code.entropywave.com/projects/orc/
 IUSE=static-libs examples
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6bd5764ad3eb13198a91fd3f36c15f92
+_md5_=d5f1ba333022a3e3e97d9750cdc692e1
diff --git a/metadata/md5-cache/dev-lang/python-2.6.8 b/metadata/md5-cache/dev-lang/python-2.6.8
index db74ff10ec59..ba639e6ca524 100644
--- a/metadata/md5-cache/dev-lang/python-2.6.8
+++ b/metadata/md5-cache/dev-lang/python-2.6.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python is an interpreted, interactive, object-oriented programming l
 EAPI=2
 HOMEPAGE=http://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.6 ) >=app-admin/eselect-python-20091230
 SLOT=2.6
 SRC_URI=http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2 mirror://gentoo/python-gentoo-patches-2.6.8-0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=50b4e7d4c93ea5520c0367abcb2832ce
+_md5_=dfb4042f8dce7e0d9b848af21634c8f0
diff --git a/metadata/md5-cache/dev-lang/python-3.1.5 b/metadata/md5-cache/dev-lang/python-3.1.5
index 3e9438a51437..c0ce205a08f9 100644
--- a/metadata/md5-cache/dev-lang/python-3.1.5
+++ b/metadata/md5-cache/dev-lang/python-3.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python is an interpreted, interactive, object-oriented programming l
 EAPI=3
 HOMEPAGE=http://www.python.org/
 IUSE=build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
 SLOT=3.1
 SRC_URI=http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tar.xz mirror://gentoo/python-gentoo-patches-3.1.5-0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9ad43a59b96df47a4474592adc9c7f67
+_md5_=5cc416d4437c99b1ecf9e98ca0b8366e
diff --git a/metadata/md5-cache/dev-lang/python-3.2.3 b/metadata/md5-cache/dev-lang/python-3.2.3
index 0be001c22fce..4a81cdd49c68 100644
--- a/metadata/md5-cache/dev-lang/python-3.2.3
+++ b/metadata/md5-cache/dev-lang/python-3.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python is an interpreted, interactive, object-oriented programming l
 EAPI=3
 HOMEPAGE=http://www.python.org/
 IUSE=build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=app-admin/python-updater
 RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
 SLOT=3.2
 SRC_URI=http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tar.xz mirror://gentoo/python-gentoo-patches-3.2.3-0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2378722074f7d853514fb2ecc68deffa
+_md5_=91d31ba77dc5779eec2dab966ad08eaa
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.0.1 b/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
index 9fb64620c3bd..339a40cde922 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.0.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.0.1.tar.gz mirror://gentoo/swi-prolog-6.0.1-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.0.1.tar.gz mirror://gentoo/swi-prolog-6.0.1-gentoo-patchset-1.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=55e7197410a22c6a34018ea3d28bea51
+_md5_=2735a1e1e49c7e33286da84a316ccf71
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.1.4 b/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
index f6efc2088c94..5eba84601c0c 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.1.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.4.tar.gz mirror://gentoo/swi-prolog-6.1.4-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-6.1.4.tar.gz mirror://gentoo/swi-prolog-6.1.4-gentoo-patchset-1.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cce79311e1586ba5fa1ebad309ea158f
+_md5_=43c842d8694110d3e6b244a0aefaf293
diff --git a/metadata/md5-cache/dev-lang/v8-3.9.24.21 b/metadata/md5-cache/dev-lang/v8-3.9.24.21
index bc63d6ccedae..ad071869f644 100644
--- a/metadata/md5-cache/dev-lang/v8-3.9.24.21
+++ b/metadata/md5-cache/dev-lang/v8-3.9.24.21
@@ -3,10 +3,10 @@ DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Google's open source JavaScript engine
 EAPI=4
 HOMEPAGE=http://code.google.com/p/v8
-KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-macos
+KEYWORDS=~amd64 x86 ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.9.24.21.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c8b19e7e4d9fd44bd368db3930486bf2
+_md5_=c1737328c1f6961acecfd8a765385c8d
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.2-r1 b/metadata/md5-cache/dev-libs/fribidi-0.19.2-r1
index 18b27aeb602f..b795c555b889 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.2-r1
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=4
 HOMEPAGE=http://fribidi.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.4:2
 SLOT=0
 SRC_URI=http://fribidi.org/download/fribidi-0.19.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=25441c299dfba07707c8c2e95062d815
+_md5_=e93f471299b505000c90b10826d0c494
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.2-r2 b/metadata/md5-cache/dev-libs/fribidi-0.19.2-r2
new file mode 100644
index 000000000000..348bee5e863b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A free implementation of the unicode bidirectional algorithm
+EAPI=4
+HOMEPAGE=http://fribidi.org/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2
+SLOT=0
+SRC_URI=http://fribidi.org/download/fribidi-0.19.2.tar.gz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=bef5732acb6a02ed5035b8ed9e2c3739
diff --git a/metadata/md5-cache/dev-libs/geoip-1.4.8 b/metadata/md5-cache/dev-libs/geoip-1.4.8
index 1505ff90773b..c8830667224a 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.4.8
+++ b/metadata/md5-cache/dev-libs/geoip-1.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entri
 EAPI=4
 HOMEPAGE=http://www.maxmind.com/geoip/api/c.shtml
 IUSE=ipv6 perl-geoipupdate static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1 GPL-2 MaxMind2
 RDEPEND=perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-perl )
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz )
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d1ff29f9f75e103c3484e24f22b645a9
+_md5_=cd6f0d1d11f07e566e38537ae86bedbe
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.83 b/metadata/md5-cache/dev-libs/libcdio-0.83
index c1a891f7ef81..9560e13eed79 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.83
+++ b/metadata/md5-cache/dev-libs/libcdio-0.83
@@ -4,10 +4,10 @@ DESCRIPTION=A library to encapsulate CD-ROM reading and control
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libcdio/
 IUSE=cddb +cxx minimal static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=cddb? ( >=media-libs/libcddb-1.0.1 ) !minimal? ( >=sys-libs/ncurses-5.7-r7 ) virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-0.83.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5465769cd1edaddcfb7f67ea17ebaa9e
+_md5_=c947242d87c09240ea7420d06c5ccc1e
diff --git a/metadata/md5-cache/dev-python/cssselect-0.6.1 b/metadata/md5-cache/dev-python/cssselect-0.6.1
new file mode 100644
index 000000000000..8d662b1b89c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cssselect-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/lxml ) dev-lang/python
+DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
+EAPI=4
+HOMEPAGE=http://packages.python.org/cssselect/ http://pypi.python.org/pypi/cssselect
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/c/cssselect/cssselect-0.6.1.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=a59bba1473c80e92d4bd6aead4b6a514
diff --git a/metadata/md5-cache/dev-python/greenlet-0.3.4-r1 b/metadata/md5-cache/dev-python/greenlet-0.3.4-r1
new file mode 100644
index 000000000000..fb4d6a9bba37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/greenlet-0.3.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=app-arch/unzip dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python
+DESCRIPTION=Lightweight in-process concurrent programming
+EAPI=4
+HOMEPAGE=http://pypi.python.org/pypi/greenlet/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/g/greenlet/greenlet-0.3.4.zip
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=e2f4d269f08f430a35317636345d7fc1
diff --git a/metadata/md5-cache/dev-python/optcomplete-1.2 b/metadata/md5-cache/dev-python/optcomplete-1.2
index d301146916b1..4a415839e7e3 100644
--- a/metadata/md5-cache/dev-python/optcomplete-1.2
+++ b/metadata/md5-cache/dev-python/optcomplete-1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Shell completion self-generator for Python
 EAPI=3
 HOMEPAGE=http://furius.ca/optcomplete/ http://pypi.python.org/pypi/optcomplete
 IUSE=examples
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ppc x86 ~x86-linux
 LICENSE=BSD
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://furius.ca/downloads/optcomplete/releases/optcomplete-1.2.tar.bz2
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=2fcfb9f82ca86c0b28d00659af7ef1de
+_md5_=f690c637b830b8b23f72766c02f6ff46
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.1 b/metadata/md5-cache/dev-python/pyquery-1.2.1
new file mode 100644
index 000000000000..9c76fdf2f2c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=>=dev-python/lxml-2.1 dev-python/cssselect >=dev-python/webob-1.2_rc1 dev-python/setuptools dev-lang/python test? ( dev-python/nose )
+DESCRIPTION=A jquery-like library for python
+EAPI=4
+HOMEPAGE=http://pypi.python.org/pypi/pyquery
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/lxml-2.1 dev-python/cssselect >=dev-python/webob-1.2_rc1 dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.1.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=5f1b6f8e9ea703304e0051900efe342e
diff --git a/metadata/md5-cache/dev-python/webob-1.2_rc1 b/metadata/md5-cache/dev-python/webob-1.2_rc1
new file mode 100644
index 000000000000..264e2be199f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/webob-1.2_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=app-arch/unzip dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python test? ( dev-python/nose )
+DESCRIPTION=WSGI request and response object
+EAPI=4
+HOMEPAGE=http://pythonpaste.org/webob/ http://pypi.python.org/pypi/WebOb
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/W/WebOb/WebOb-1.2rc1.zip
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=548f6bf3c4fa3b2cf49d827311362e19
diff --git a/metadata/md5-cache/dev-tex/biblatex-1.6 b/metadata/md5-cache/dev-tex/biblatex-1.6
index 3492b34aad70..cd5ad5da5618 100644
--- a/metadata/md5-cache/dev-tex/biblatex-1.6
+++ b/metadata/md5-cache/dev-tex/biblatex-1.6
@@ -3,10 +3,10 @@ DEPEND=dev-texlive/texlive-bibtexextra app-arch/unzip virtual/latex-base >=sys-a
 DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex
 IUSE=doc
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LPPL-1.3
 RDEPEND=dev-texlive/texlive-bibtexextra virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/biblatex-1.6.zip
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	latex-package	e7bfe03b27224512702eac009812cc50	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=db0981255e899e494818ea97699b1481
+_md5_=8966531b765ffe37d556116ebc94b79a
diff --git a/metadata/md5-cache/dev-util/catalyst-2.0.8.1 b/metadata/md5-cache/dev-util/catalyst-2.0.8.1-r1
similarity index 95%
rename from metadata/md5-cache/dev-util/catalyst-2.0.8.1
rename to metadata/md5-cache/dev-util/catalyst-2.0.8.1-r1
index 2c4495a633e3..28a81ade843d 100644
--- a/metadata/md5-cache/dev-util/catalyst-2.0.8.1
+++ b/metadata/md5-cache/dev-util/catalyst-2.0.8.1-r1
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/shash virtual/cdrtools ccache? ( dev-util/ccache ) ia64? ( sys
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-2.0.8.1.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.8.1.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a5e960fa4d6aa1ae05eca536ecbeaed6
+_md5_=5981d88de5125d8ef8ed36529d00ec79
diff --git a/metadata/md5-cache/dev-util/catalyst-2.9999 b/metadata/md5-cache/dev-util/catalyst-2.9999
index 3c71041573f4..f598f7e179a0 100644
--- a/metadata/md5-cache/dev-util/catalyst-2.9999
+++ b/metadata/md5-cache/dev-util/catalyst-2.9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/shash virtual/cdrtools ccache? ( dev-util/ccache ) ia64? ( sys-fs/dosfstools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) =dev-lang/python-2*
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=06295e4ee60bebc478c0284ebbed23ce
+_md5_=37b200ec16347258f37494f0233f752a
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 76b351a455d2..f636a1e302e6 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/shash virtual/cdrtools ccache? ( dev-util/ccache ) ia64? ( sys-fs/dosfstools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) =dev-lang/python-2*
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0ba23f7474c67837a6e4cb67415bc0af
+_md5_=d46d263aa5fdc73959e3784a01345fdd
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.3
similarity index 88%
rename from metadata/md5-cache/dev-util/gdbus-codegen-2.32.1
rename to metadata/md5-cache/dev-util/gdbus-codegen-2.32.3
index 6a34d9dfe802..cd60489c1253 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.3
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.gtk.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
-PDEPEND=>=dev-libs/glib-2.32.1:2
+PDEPEND=>=dev-libs/glib-2.32.3:2
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.1.tar.xz
+SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.3.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6070a2baf7c123758ce7bd3957a488a5
+_md5_=bd7dcb8b6b555218e6c807e30ee05e0f
diff --git a/metadata/md5-cache/games-strategy/widelands-0.15 b/metadata/md5-cache/games-strategy/widelands-0.15
deleted file mode 100644
index de7555935454..000000000000
--- a/metadata/md5-cache/games-strategy/widelands-0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-games/ggz-client-libs dev-lang/lua virtual/jpeg media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/sdl-ttf media-libs/tiff dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A game similar to Settlers 2
-EAPI=2
-HOMEPAGE=http://www.widelands.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-games/ggz-client-libs dev-lang/lua virtual/jpeg media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/sdl-ttf media-libs/tiff
-SLOT=0
-SRC_URI=http://launchpad.net/widelands/build15/build15/+download/widelands-build15-src.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3952388661869e053405219fba9d60c0
diff --git a/metadata/md5-cache/games-strategy/widelands-0.17 b/metadata/md5-cache/games-strategy/widelands-0.17
new file mode 100644
index 000000000000..389c7195ec71
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/widelands-0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A game similar to Settlers 2
+EAPI=3
+HOMEPAGE=http://www.widelands.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/lua media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-gfx media-libs/sdl-net media-libs/glew media-libs/sdl-ttf
+SLOT=0
+SRC_URI=http://launchpad.net/widelands/build17/build-17/+download/widelands-build17-src.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9e0c9ca9594037049021660823d5166a
diff --git a/metadata/md5-cache/gnome-base/gnome-2.32.1-r1 b/metadata/md5-cache/gnome-base/gnome-2.32.1-r1
index b6a42728d236..5c052c855971 100644
--- a/metadata/md5-cache/gnome-base/gnome-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-2.32.1-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=accessibility cdr cups dvdr ldap mono policykit
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.6.6[gdu]
+PDEPEND=|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )
 RDEPEND=>=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=dev-libs/libxml2-2.7.2:2 >=dev-libs/libxslt-1.1.22 >=media-libs/audiofile-0.2.7 >=x11-libs/libxklavier-5.0 >=media-libs/libart_lgpl-2.3.21 >=dev-libs/libIDL-0.8.14 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gnome-keyring-2.32.1 >=gnome-base/libgnome-keyring-2.32.0 >=app-crypt/seahorse-2.32.0 >=gnome-base/gconf-2.32.0-r1:2 >=net-libs/libsoup-2.32.1:2.4 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-extra/bug-buddy-2.32.0:2 >=gnome-base/libgnomekbd-2.32.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0:2 >=gnome-base/nautilus-2.32.1 >=media-libs/gstreamer-0.10.30.2:0.10 >=media-libs/gst-plugins-base-0.10.30.4:0.10 >=media-libs/gst-plugins-good-0.10.23:0.10 >=gnome-extra/gnome-media-2.32.0:2 <gnome-extra/gnome-media-2.91:2 >=media-sound/sound-juicer-2.32.0 >=dev-libs/totem-pl-parser-2.32.1 >=media-video/totem-2.32.0 >=media-video/cheese-2.32.0 >=media-gfx/eog-2.32.1:1 >=www-client/epiphany-2.30.6 >=app-arch/file-roller-2.32.1 >=gnome-extra/gcalctool-5.32.1 >=gnome-extra/gconf-editor-2.32.0 >=gnome-base/gdm-2.20.11 >=x11-libs/gtksourceview-2.10.5:2.0 >=app-editors/gedit-2.30.4 >=app-text/evince-2.32.0 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=dev-libs/libgweather-2.30.3:2 <dev-libs/libgweather-2.91:2 >=gnome-base/gnome-applets-2.32.0 >=gnome-base/gnome-panel-2.32.1 >=gnome-base/gnome-menus-2.30.5 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=gnome-extra/deskbar-applet-2.32.0 >=gnome-extra/hamster-applet-2.32.1 >=x11-themes/gtk-engines-2.20.2:2 >=x11-themes/gnome-backgrounds-2.32.0 >=x11-libs/vte-0.26.2:0 >=x11-terms/gnome-terminal-2.32.1 >=gnome-extra/gucharmap-2.32.1 >=gnome-extra/gnome-utils-2.32.0 >=gnome-extra/gnome-games-2.28.2 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/gnome-system-monitor-2.28.2 >=gnome-base/libgtop-2.28.2:2 >=x11-libs/startup-notification-0.10 >=gnome-extra/gnome-user-docs-2.32.0 >=gnome-extra/yelp-2.30.2 >=gnome-extra/zenity-2.32.1 >=net-analyzer/gnome-netstatus-2.28.2 >=net-analyzer/gnome-nettool-2.32.0 cdr? ( >=app-cdr/brasero-2.32.1 ) dvdr? ( >=app-cdr/brasero-2.32.1 ) >=gnome-extra/gtkhtml-3.32.1:3.14 >=mail-client/evolution-2.32.1-r1:2.0 >=gnome-extra/evolution-data-server-2.32.1-r1 >=gnome-extra/evolution-webcal-2.32.0 >=net-misc/vino-2.32.0 >=app-admin/pessulus-2.30.4 ldap? ( >=app-admin/sabayon-2.30.1 ) >=gnome-extra/gnome-screensaver-2.30.2 >=x11-misc/alacarte-0.13.2 >=gnome-extra/gnome-power-manager-2.32.0 >=net-misc/vinagre-2.30.3 >=gnome-extra/swfdec-gnome-2.30.1 accessibility? ( >=gnome-extra/libgail-gnome-1.20.3 >=gnome-extra/at-spi-1.32.0:1 >=app-accessibility/dasher-4.11 >=app-accessibility/gnome-mag-0.16.3:1 >=app-accessibility/gnome-speech-0.4.25:1 >=app-accessibility/gok-2.30.1:1 >=app-accessibility/orca-2.32.1 >=gnome-extra/mousetweaks-2.32.1 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.3 ) mono? ( >=dev-dotnet/gtk-sharp-2.12.10:2 >=app-misc/tomboy-1.4.2 ) policykit? ( gnome-extra/polkit-gnome )
 SLOT=2.0
-_md5_=46826eff5a5c614bbbcd549547a022bc
+_md5_=154047ce9651815878b6191ba6de9c29
diff --git a/metadata/md5-cache/gnome-base/gnome-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
index 30aad659302f..55e94eb5bb17 100644
--- a/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-2.32.1-r2
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=accessibility cdr cups dvdr ldap mono policykit
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.6.6[gdu]
+PDEPEND=|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )
 RDEPEND=!<x11-libs/gtk+-3.2.4-r1:3 >=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=dev-libs/libxml2-2.7.2:2 >=dev-libs/libxslt-1.1.22 >=media-libs/audiofile-0.2.7 >=x11-libs/libxklavier-5.0 >=media-libs/libart_lgpl-2.3.21 >=dev-libs/libIDL-0.8.14 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gnome-keyring-2.32.1 >=gnome-base/libgnome-keyring-2.32.0 >=app-crypt/seahorse-2.32.0 >=gnome-base/gconf-2.32.0-r1:2 >=net-libs/libsoup-2.32.1:2.4 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-extra/bug-buddy-2.32.0:2 >=gnome-base/libgnomekbd-2.32.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0:2 >=gnome-base/nautilus-2.32.1 >=media-libs/gstreamer-0.10.30.2:0.10 >=media-libs/gst-plugins-base-0.10.30.4:0.10 >=media-libs/gst-plugins-good-0.10.23:0.10 >=gnome-extra/gnome-media-2.32.0:2 <gnome-extra/gnome-media-2.91:2 >=media-sound/sound-juicer-2.32.0 >=dev-libs/totem-pl-parser-2.32.1 >=media-video/totem-2.32.0 >=media-video/cheese-2.32.0 >=media-gfx/eog-2.32.1:1 >=www-client/epiphany-2.30.6 >=app-arch/file-roller-2.32.1 >=gnome-extra/gcalctool-5.32.1 >=gnome-extra/gconf-editor-2.32.0 >=gnome-base/gdm-2.20.11 >=x11-libs/gtksourceview-2.10.5:2.0 >=app-editors/gedit-2.30.4 >=app-text/evince-2.32.0 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=dev-libs/libgweather-2.30.3:2 <dev-libs/libgweather-2.91:2 >=gnome-base/gnome-applets-2.32.0 >=gnome-base/gnome-panel-2.32.1 >=gnome-base/gnome-menus-2.30.5 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=gnome-extra/deskbar-applet-2.32.0 >=gnome-extra/hamster-applet-2.32.1 >=x11-themes/gtk-engines-2.20.2:2 >=x11-themes/gnome-backgrounds-2.32.0 >=x11-libs/vte-0.26.2:0 >=x11-terms/gnome-terminal-2.32.1 >=gnome-extra/gucharmap-2.32.1 >=gnome-extra/gnome-utils-2.32.0 >=gnome-extra/gnome-games-2.28.2 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/gnome-system-monitor-2.28.2 >=gnome-base/libgtop-2.28.2:2 >=x11-libs/startup-notification-0.10 >=gnome-extra/gnome-user-docs-2.32.0 >=gnome-extra/yelp-2.30.2 >=gnome-extra/zenity-2.32.1 >=net-analyzer/gnome-netstatus-2.28.2 >=net-analyzer/gnome-nettool-2.32.0 cdr? ( >=app-cdr/brasero-2.32.1 ) dvdr? ( >=app-cdr/brasero-2.32.1 ) >=gnome-extra/gtkhtml-3.32.1:3.14 >=mail-client/evolution-2.32.1-r1:2.0 >=gnome-extra/evolution-data-server-2.32.1-r1 >=gnome-extra/evolution-webcal-2.32.0 >=net-misc/vino-2.32.0 >=app-admin/pessulus-2.30.4 ldap? ( >=app-admin/sabayon-2.30.1 ) >=gnome-extra/gnome-screensaver-2.30.2 >=x11-misc/alacarte-0.13.2 >=gnome-extra/gnome-power-manager-2.32.0 >=net-misc/vinagre-2.30.3 >=gnome-extra/swfdec-gnome-2.30.1 accessibility? ( >=gnome-extra/libgail-gnome-1.20.3 >=gnome-extra/at-spi-1.32.0:1 >=app-accessibility/dasher-4.11 >=app-accessibility/gnome-mag-0.16.3:1 >=app-accessibility/gnome-speech-0.4.25:1 >=app-accessibility/gok-2.30.1:1 >=app-accessibility/orca-2.32.1 >=gnome-extra/mousetweaks-2.32.1 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.3 ) mono? ( >=dev-dotnet/gtk-sharp-2.12.10:2 >=app-misc/tomboy-1.4.2 ) policykit? ( gnome-extra/polkit-gnome )
 SLOT=2.0
-_md5_=b6c2455a473151c534d87cb7e1809c75
+_md5_=2ce6694b840770ce69054e66bcf67352
diff --git a/metadata/md5-cache/gnome-base/gnome-3.2.1 b/metadata/md5-cache/gnome-base/gnome-3.2.1
index 0c78728daabb..055c688298aa 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.2.1
+++ b/metadata/md5-cache/gnome-base/gnome-3.2.1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=accessibility +cdr cups +extras +fallback
 KEYWORDS=~amd64 ~x86
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.10.1[gdu]
+PDEPEND=|| ( >=gnome-base/gvfs-1.10.1[udisks] >=gnome-base/gvfs-1.10.1[gdu] )
 RDEPEND=>=gnome-base/gnome-core-libs-3.2.1[cups?] >=gnome-base/gnome-core-apps-3.2.1[cups?,bluetooth,cdr?] >=gnome-base/gdm-3.2.1 >=x11-wm/mutter-3.2.1 >=gnome-base/gnome-shell-3.2.1 >=x11-themes/gnome-backgrounds-3.2 >=x11-themes/gnome-icon-theme-extras-3.0.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.2.1 >=app-accessibility/at-spi2-core-2.2.1 >=app-accessibility/caribou-0.4.1 >=app-accessibility/orca-3.2.1 >=gnome-extra/mousetweaks-3.2.1 ) extras? ( >=gnome-base/gnome-extra-apps-3.2.1 ) fallback? ( >=gnome-base/gnome-applets-3.2.1 >=gnome-base/gnome-fallback-3.2.1 )
 SLOT=2.0
-_md5_=275712a59d5af63357e7170dfab37faf
+_md5_=b5eb44bde8b6142f5495e7d2614c913c
diff --git a/metadata/md5-cache/gnome-base/gnome-light-2.32.1 b/metadata/md5-cache/gnome-base/gnome-light-2.32.1
index bcb6f95cc1d7..28277327908b 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-2.32.1
+++ b/metadata/md5-cache/gnome-base/gnome-light-2.32.1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=+automount
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 RDEPEND=!gnome-base/gnome >=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gconf-2.32.0-r1:2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0 >=gnome-base/nautilus-2.32.1 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=gnome-base/gnome-panel-2.32.1 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1 >=x11-terms/gnome-terminal-2.32.1 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/yelp-2.30.2
 SLOT=2.0
-_md5_=297eb144bf87e2464be37fc374d3ef74
+_md5_=cc557a6428989e67e32bb513ea474fe7
diff --git a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r1 b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r1
index 968a8cd50562..e2ecc16e9d02 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r1
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=+automount
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 RDEPEND=!gnome-base/gnome >=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gconf-2.32.0-r1:2 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0 >=gnome-base/nautilus-2.32.1 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=gnome-base/gnome-panel-2.32.1 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=x11-terms/gnome-terminal-2.32.1 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/yelp-2.30.2
 SLOT=2.0
-_md5_=8c1ce37418c1e024114876216eb0abe1
+_md5_=dd537271d00c309ff95f7d9ee289a0e7
diff --git a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2 b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
index 4f95256bb2e6..b598426d0c9f 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
+++ b/metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2
@@ -5,7 +5,7 @@ HOMEPAGE=http://www.gnome.org/
 IUSE=+automount
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=as-is
-PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( >=gnome-base/gvfs-1.6.6[gdu] )
+PDEPEND=>=gnome-base/gvfs-1.6.6 automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )
 RDEPEND=!<x11-libs/gtk+-3.2.4-r1:3 !gnome-base/gnome >=dev-libs/glib-2.26.1:2 >=x11-libs/gtk+-2.22.1-r1:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=dev-libs/atk-1.32.0 >=x11-libs/pango-1.28.3 >=gnome-base/orbit-2.14.19:2 >=x11-libs/libwnck-2.30.6:1 >=x11-wm/metacity-2.30.3 >=gnome-base/gconf-2.32.0-r1:2 >=gnome-base/dconf-0.5.1-r2 >=gnome-base/libbonobo-2.24.3 >=gnome-base/libbonoboui-2.24.4 >=gnome-base/libgnome-2.32.0 >=gnome-base/libgnomecanvas-2.30.2 >=gnome-base/libglade-2.6.4:2.0 >=gnome-base/gnome-settings-daemon-2.32.1 >=gnome-base/gnome-control-center-2.32.0 >=gnome-base/nautilus-2.32.1 >=gnome-base/gnome-desktop-2.32.1:2 >=gnome-base/gnome-session-2.32.1 >=gnome-base/gnome-panel-2.32.1 >=x11-themes/gnome-icon-theme-2.31.0 >=x11-themes/gnome-themes-2.32.1-r1 >=x11-themes/gnome-themes-standard-3.0.2 >=x11-terms/gnome-terminal-2.32.1 >=gnome-base/librsvg-2.32.1:2 >=gnome-extra/yelp-2.30.2
 SLOT=2.0
-_md5_=4479e47ca8ed583419838eb423203e04
+_md5_=c3f051de484267a62aaffb2027e422e4
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
index 19c68e6fa301..3bb471c4aadc 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Adobe bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=0bec123dc6cd81b7148313597c7c5e90
+_md5_=4558971e5ea7be98cdb7e301a6a30465
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
index 998beaea6328..537e76a0ec1b 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Adobe Utopia bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=521350c0ad88805f87f00859e33d8633
+_md5_=cabb7e004a9b426968b8405d8adea3ff
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
index e91daebd35cc..8d6b1a945a76 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=b860066530da01e1fd7caa590603822b
+_md5_=a2dfbc2aa411e45fecafedea4733dbb2
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
index 3180f0f489ad..01142dac0fdf 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org arabic bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=0172757e45a7ce06dca40bcc8893a535
+_md5_=94a9402c51ed47b7ee4b9f3a787cb837
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
index cb4d1a8337e2..ceb4fb85810d 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=22fa7c630180ee1b3fb178a4ed814165
+_md5_=869647d10868665af56199d94140168c
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
index f7945f2b532b..f2e8f16a1788 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=327344a814501d68d8011024c7856de7
+_md5_=4009937f9c6e5a28fd77fa7d29ff3895
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
index e4c4029f295a..878885fc3f56 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=6043c62aea8512651cb9fe47d07ddb70
+_md5_=5b89bb66c48b418b448c52b4369530e2
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
index c828eee34fd2..2bd763f1b479 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=b651e2ec724cf8d6224ac0f4c375cc6c
+_md5_=5ab15b4b9b49821e76ef474ae27b6102
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
index 4977e839aae3..0e11e4e136e9 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=3aec9531b0f888c7c88c39a49aa82aa0
+_md5_=79280ac155f9ece7837a80128e7b93db
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
index f6526b0c9843..9da2229c740d 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bitstream bitmap fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=1d7ed357e8d88c266a9df5ba0caa4b09
+_md5_=105c64961eeb7d07e522aa1ef7db6199
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
index 390c402e5d10..21994b998869 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
+++ b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Bitstream Speedo fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=35de94d2678c353805675be346fc099f
+_md5_=a22c13117bc12d169140538902f6ac88
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
index 747c9572d576..97ff0953faf8 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Bitstream Type 1 fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=ecaae4a8d2f33e113adf8563b1511ba4
+_md5_=ab4e7c861c07106450cb215cfe3d2b0f
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
index 6bdd74579e87..7900df324485 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Cronyx cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=883f02412cdf05466fe60e1b1cde6aea
+_md5_=fef7ca147519e21ef9b8720c05ed2b16
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
index a1a71f0279a4..eea770cd9e45 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Daewoo fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=62ea161c1085054921dc22061ca5c45e
+_md5_=34afc7bde30b79781b97fc917a2e7472
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
index 675ea6a4d67e..d11e4577f978 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org JIS (japanese) fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=5c5e486be0533e42016f3cfc845454f7
+_md5_=8646373e66395a42d83cb9309cdab71a
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
index e77a8316c15c..bef1d9b7e0b9 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org misc-cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=58ad8e7e938430b42e8789050d9d5274
+_md5_=a188236bc61636994df5ce6994a06b1a
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
index c4cec745af21..62f8ba38172e 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Miscellaneous Ethiopic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=4b342d1be255cc005337ed28f1c6fc11
+_md5_=084f8ac247a2e9980749e842ca4e89b8
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
index 5a352c49fe86..6438e8cf7e3e 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Syriac fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=ee899c1b58253a1aa307d70e11c79f03
+_md5_=40339a601f6c54f34689f65d3cfe3894
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
index cb4f50b80582..d98f3bad654a 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org ClearlyU fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=2513f72ce12f4cbe58b4f5f842ba27ea
+_md5_=553f28d18a2f1aac5e80626ae4dc8c85
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
index eb0ac80fda42..cdbdf1c711f6 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Schumacher fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=7699bc810840ffbd1e7ae5b0de3d5939
+_md5_=9be0e2195fd57a75cf67939df12b2e82
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
index f62c053ba4e5..2e67fe956ce7 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Screen cyrillic fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=41d6c72cc89fabe4bae38bad8dbc550f
+_md5_=1dd548dab18f229ba2dd7d08edf8ef73
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
index 3fe1bdacff4b..b649658f00a0 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Sony fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=fed6783fd1910bd6908c985ff86c6b94
+_md5_=6dc2c29dba60c9fa5e365950999157f1
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
index 561d175fd658..807c97e3f0ab 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Sun fonts
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=203c777e6ded536da8b678975298dfcb
+_md5_=6f891cf0da2ce49c1cf10c21879962b5
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
index d0a33395c579..115bd674874d 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org Winitzki cyrillic font
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X nls
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings x11-apps/mkfontscale x11-apps/mkfontdir
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	font	9aa70ebc5cefbdd9056687b550a2fdc4	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=1208b15b4e0c37503682a860208f9695
+_md5_=1eea4da2e4e311640b0cb18d7da5cb3e
diff --git a/metadata/md5-cache/media-libs/faac-1.28-r3 b/metadata/md5-cache/media-libs/faac-1.28-r3
index 363399aec0d9..3c732078567d 100644
--- a/metadata/md5-cache/media-libs/faac-1.28-r3
+++ b/metadata/md5-cache/media-libs/faac-1.28-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
 EAPI=4
 HOMEPAGE=http://www.audiocoding.com
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MPEG-4
 RDEPEND=media-libs/libmp4v2
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1.28.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f82b2713819d1d9f002d68ebae8195a1
+_md5_=8a17e4e08ccf500069fd0b75bf7e1152
diff --git a/metadata/md5-cache/media-libs/flac-1.2.1-r4 b/metadata/md5-cache/media-libs/flac-1.2.1-r4
index b070eaa0347b..89a270c415aa 100644
--- a/metadata/md5-cache/media-libs/flac-1.2.1-r4
+++ b/metadata/md5-cache/media-libs/flac-1.2.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=free lossless audio encoder and decoder
 EAPI=2
 HOMEPAGE=http://flac.sourceforge.net
 IUSE=3dnow altivec +cxx debug ogg sse static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.1.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e925498ff6c9c7626cecc1c1ea55da81
+_md5_=c1b825b96d6b2d872ef21957c731da89
diff --git a/metadata/md5-cache/media-libs/libaacplus-2.0.2 b/metadata/md5-cache/media-libs/libaacplus-2.0.2
index 3a6203c09c22..866ac774bcb8 100644
--- a/metadata/md5-cache/media-libs/libaacplus-2.0.2
+++ b/metadata/md5-cache/media-libs/libaacplus-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=HE-AAC+ v2 library, based on the reference implementation
 EAPI=4
 HOMEPAGE=http://tipok.org.ua/node/17
 IUSE=bindist fftw static-libs
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=!media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 )
 REQUIRED_USE=!bindist
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~aballier/libaacplus-2.0.2.tar.gz http://tipok.ath.cx/downloads/media/aac+/libaacplus/libaacplus-2.0.2.tar.gz http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=908f430043e37e3db9cc2713171f5414
+_md5_=73476a57e840d4d015b35d10700a2c39
diff --git a/metadata/md5-cache/media-libs/libass-0.10.0 b/metadata/md5-cache/media-libs/libass-0.10.0
index 788c0b16e012..431e8a3ea8cb 100644
--- a/metadata/md5-cache/media-libs/libass-0.10.0
+++ b/metadata/md5-cache/media-libs/libass-0.10.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for SSA/ASS subtitles rendering
 EAPI=4
 HOMEPAGE=http://code.google.com/p/libass/
 IUSE=+enca +fontconfig harfbuzz static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.4.2 ) >=media-libs/freetype-2.2.1:2 virtual/libiconv >=dev-libs/fribidi-0.19.0 harfbuzz? ( media-libs/harfbuzz ) enca? ( app-i18n/enca )
 SLOT=0
 SRC_URI=http://libass.googlecode.com/files/libass-0.10.0.tar.xz
-_md5_=b1f90f167812221c769f69051bc362e9
+_md5_=b6ee3ee51f7dfe15fb17ce84a5c66cd7
diff --git a/metadata/md5-cache/media-libs/libcddb-1.3.2 b/metadata/md5-cache/media-libs/libcddb-1.3.2
index 86a441743d72..7eded5d91726 100644
--- a/metadata/md5-cache/media-libs/libcddb-1.3.2
+++ b/metadata/md5-cache/media-libs/libcddb-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A library for accessing a CDDB server
 EAPI=4
 HOMEPAGE=http://libcddb.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libcddb/libcddb-1.3.2.tar.bz2
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=bd6f6d601e71ce5c0013609382312d8f
+_md5_=bca2bb929d77e33df0673e9ed7be9641
diff --git a/metadata/md5-cache/media-libs/libdvdnav-4.2.0 b/metadata/md5-cache/media-libs/libdvdnav-4.2.0
index eb839c857f9a..7b04fb6602ec 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-4.2.0
+++ b/metadata/md5-cache/media-libs/libdvdnav-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libdvdread-4.2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-libs/libdvdread-4.2.0 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/libdvdread-4.2.0
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=51423d4e3652bbf849fffca1f110223b
+_md5_=205008359074750075bb312a6b5d7f14
diff --git a/metadata/md5-cache/media-libs/libdvdnav-9999 b/metadata/md5-cache/media-libs/libdvdnav-9999
index 057dfdcdd4e5..8afd9c96aa55 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-9999
+++ b/metadata/md5-cache/media-libs/libdvdnav-9999
@@ -1,9 +1,10 @@
 DEFINED_PHASES=install preinst prepare unpack
-DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+DEPEND=>=media-libs/libdvdread-9999 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 DESCRIPTION=Library for DVD navigation tools
 EAPI=4
 HOMEPAGE=http://dvdnav.mplayerhq.hu/
 LICENSE=GPL-2
+RDEPEND=>=media-libs/libdvdread-9999
 SLOT=0
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8be45b2493f4b531b243ffdda12bd39b
+_md5_=0f4f08ab6fcd014837487a3b10f0a8f4
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
index 686712523d07..c8a8506b5dea 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
@@ -4,9 +4,9 @@ DESCRIPTION=Library for playing MOD-like music files
 EAPI=4
 HOMEPAGE=http://modplug-xmms.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a4e4887e4b72ecc9a94a910b8abe2102
+_md5_=a2e52e8f155aecb75a376a176affc7df
diff --git a/metadata/md5-cache/media-libs/libmp4v2-1.9.1_p479 b/metadata/md5-cache/media-libs/libmp4v2-1.9.1_p479
index 7d3bd2b8197a..c64106b3d72b 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-1.9.1_p479
+++ b/metadata/md5-cache/media-libs/libmp4v2-1.9.1_p479
@@ -4,9 +4,9 @@ DESCRIPTION=Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard
 EAPI=4
 HOMEPAGE=http://code.google.com/p/mp4v2/
 IUSE=static-libs test utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=592ddc12a94b6f496af88cad08e417e1
+_md5_=d0e4ad3ac4adfae1c23e693e5086f0c2
diff --git a/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120217 b/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120217
index d960c5a0d24b..95d558d2f43e 100644
--- a/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120217
+++ b/metadata/md5-cache/media-libs/libpostproc-0.8.0.20120217
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=media-video/libav-0.8
+DEFINED_PHASES=configure
+DEPEND=>=media-video/libav-0.8.2-r2
 DESCRIPTION=Video post processing library
 EAPI=4
 HOMEPAGE=http://git.videolan.org/?p=libpostproc.git;a=summary
 IUSE=pic static-libs 3dnow 3dnowext altivec mmx vis
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=media-video/libav-0.8
+RDEPEND=>=media-video/libav-0.8.2-r2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lu_zero/distfiles/libpostproc-0.8.0.20120217.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=eb408ae773d5bb9ee29a84c435ddc2d3
+_md5_=4c007825902eaeb14b647898ccec798d
diff --git a/metadata/md5-cache/media-libs/libpostproc-9999 b/metadata/md5-cache/media-libs/libpostproc-9999
index e67409d0d7cc..be71a56e2f1d 100644
--- a/metadata/md5-cache/media-libs/libpostproc-9999
+++ b/metadata/md5-cache/media-libs/libpostproc-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=>=media-video/libav-0.8 dev-vcs/git
+DEFINED_PHASES=configure unpack
+DEPEND=>=media-video/libav-0.8.2-r2 dev-vcs/git
 DESCRIPTION=Video post processing library
 EAPI=4
 HOMEPAGE=http://git.videolan.org/?p=libpostproc.git;a=summary
 IUSE=pic static-libs 3dnow 3dnowext altivec mmx vis
 LICENSE=GPL-2
-RDEPEND=>=media-video/libav-0.8
+RDEPEND=>=media-video/libav-0.8.2-r2
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dd9e12febab963dede81d9b79d931e64
+_md5_=eeccd71e8abc359498bea1ea79e15e7c
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.25 b/metadata/md5-cache/media-libs/libsndfile-1.0.25
index f17a28e1c791..38fa6ce8df3d 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.25
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.25
@@ -4,10 +4,10 @@ DESCRIPTION=A C library for reading and writing files containing sampled sound
 EAPI=4
 HOMEPAGE=http://www.mega-nerd.com/libsndfile
 IUSE=alsa minimal sqlite static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1 >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.3 ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bf7e1aaa5aafa0d80c4547aa46cc3a7d
+_md5_=fbd27dcae77e0f0af2c31d8f4a7a9fbf
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1 b/metadata/md5-cache/media-libs/libtheora-1.1.1
index 6a18e247e4d4..f866f9c8ce7e 100644
--- a/metadata/md5-cache/media-libs/libtheora-1.1.1
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Theora Video Compression Codec
 EAPI=2
 HOMEPAGE=http://www.theora.org
 IUSE=doc +encode examples static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg encode? ( media-libs/libvorbis ) examples? ( media-libs/libpng media-libs/libvorbis >=media-libs/libsdl-0.11.0 )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=acc2071439e88697c89a152bbea05231
+_md5_=122888d6e4e476e8a1533566061bb1e3
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.3 b/metadata/md5-cache/media-libs/libvorbis-1.3.3
index 4a68a60b90a4..c95484362a8d 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.3
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=The Ogg Vorbis sound file format library
 EAPI=4
 HOMEPAGE=http://xiph.org/vorbis
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0a17dd68cef5b1dec92480115bf1b177
+_md5_=6ab034e8a5c07cbb84f0ed8520652413
diff --git a/metadata/md5-cache/media-libs/libvpx-1.1.0 b/metadata/md5-cache/media-libs/libvpx-1.1.0
index 2377041cf262..dd226c808908 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.1.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.1.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) doc? ( app-doc/doxygen dev-lang/php )
 DESCRIPTION=WebM VP8 Codec SDK
 EAPI=4
 HOMEPAGE=http://www.webmproject.org
 IUSE=altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=sse2? ( mmx )
 SLOT=0
 SRC_URI=http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=b1d80090185268ff7e346c9052ec6ef6
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=4f1fd7afd1f07202da9fe6d4378c3a12
diff --git a/metadata/md5-cache/media-libs/libvpx-9999 b/metadata/md5-cache/media-libs/libvpx-9999
index 3cdc67ff5e71..228cd2ad26e3 100644
--- a/metadata/md5-cache/media-libs/libvpx-9999
+++ b/metadata/md5-cache/media-libs/libvpx-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 REQUIRED_USE=sse2? ( mmx )
 SLOT=0
 _eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=3ba54694f61de4737e98d3b9f772ef1d
+_md5_=59a753a08d550e09deb4d2b74f2ad10b
diff --git a/metadata/md5-cache/media-libs/openal-1.13 b/metadata/md5-cache/media-libs/openal-1.13
index d7f7cfd4ca28..1ed7f1378406 100644
--- a/metadata/md5-cache/media-libs/openal-1.13
+++ b/metadata/md5-cache/media-libs/openal-1.13
@@ -4,10 +4,10 @@ DESCRIPTION=A software implementation of the OpenAL 3D audio API
 EAPI=3
 HOMEPAGE=http://kcat.strangesoft.net/openal.html
 IUSE=alsa debug oss portaudio pulseaudio
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=03665b24b18c098a7b3fc2f96873350c
+_md5_=d453e21bcbe5449cbc8098fbaff90da8
diff --git a/metadata/md5-cache/media-libs/opencore-amr-0.1.3 b/metadata/md5-cache/media-libs/opencore-amr-0.1.3
index 738f4b7c31cd..70a268bcdb63 100644
--- a/metadata/md5-cache/media-libs/opencore-amr-0.1.3
+++ b/metadata/md5-cache/media-libs/opencore-amr-0.1.3
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation of Adaptive Multi Rate Narrowband and Wideband speech
 EAPI=2
 HOMEPAGE=http://opencore-amr.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/opencore-amr-0.1.3.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=f9ee9b08fe2602721eef890fd7c769e7
+_md5_=5df35e78533b555be84a449dd3852d67
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11 b/metadata/md5-cache/media-libs/schroedinger-1.0.11
index 8c582e529625..70684278dd97 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.11
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=C-based libraries for the Dirac video codec
 EAPI=4
 HOMEPAGE=http://www.diracvideo.org/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.16
 SLOT=0
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5b82d0745177c60f735eccf2ad432e25
+_md5_=1d2e0f626104f73d32aaa18c7c11c396
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1 b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
index 0b438cfe1e35..81970e22b781 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Audio compression format designed for speech.
 EAPI=2
 HOMEPAGE=http://www.speex.org
 IUSE=ogg sse static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b916d26d5734fc944423204ba3b17cc8
+_md5_=04679abc7bf8e51b136b0a017bb73bc7
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-0.1.2 b/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
index 0065868de4de..231c9cd23c3d 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
+++ b/metadata/md5-cache/media-libs/vo-aacenc-0.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=VisualOn AAC encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs neon
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-aacenc-0.1.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=52835affd0b00bfd875f0f4117ddf049
+_md5_=5aa284d50abc24fad08799993a730b91
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-9999 b/metadata/md5-cache/media-libs/vo-aacenc-9999
index 2251857bbbb8..ee592765dded 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-9999
+++ b/metadata/md5-cache/media-libs/vo-aacenc-9999
@@ -7,4 +7,4 @@ IUSE=examples static-libs neon
 LICENSE=Apache-2.0
 SLOT=0
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=432bcf02cd9fec99854aae1daaa5fea2
+_md5_=0f18245d9832492a2d94704eceac4bec
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
index a6193a75d4b5..b2ae990e43f4 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=VisualOn AMR-WB encoder library
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a0ca05c83f4cfbc6e912a4cc6ad3a0ec
+_md5_=ff63af7e064a23e19f0a04a8a3ecc85a
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-9999 b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
index d1a4b4021f9b..e353f7d1ab6d 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-9999
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
@@ -7,4 +7,4 @@ IUSE=examples static-libs
 LICENSE=Apache-2.0
 SLOT=0
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e2810e3a223a0646de41ee31c75e7ad4
+_md5_=2767d5b60db4a82497e283b1ba4cee1e
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20120327 b/metadata/md5-cache/media-libs/x264-0.0.20120327
index 54c7e4ef8373..4c2de4583add 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20120327
+++ b/metadata/md5-cache/media-libs/x264-0.0.20120327
@@ -4,9 +4,9 @@ DESCRIPTION=A free library for encoding X264/AVC streams
 EAPI=4
 HOMEPAGE=http://www.videolan.org/developers/x264.html
 IUSE=10bit custom-cflags debug +interlaced pic static-libs +threads
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-2245.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a2806fce02b37789ea1c4af506e185fb
+_md5_=31f4549f25ac9a4a99f243d8aad6f33a
diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999
index dd6e21d8b6c2..13a2dccb28fd 100644
--- a/metadata/md5-cache/media-libs/x264-9999
+++ b/metadata/md5-cache/media-libs/x264-9999
@@ -7,4 +7,4 @@ IUSE=debug +threads pic static-libs
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=8869cbf7340d637534e08e4cbb9f99e5
+_md5_=634781e9d339550bd25441b7b3c286b5
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13 b/metadata/md5-cache/media-sound/gsm-1.0.13
index 97278eadbe3a..ef83a939a492 100644
--- a/metadata/md5-cache/media-sound/gsm-1.0.13
+++ b/metadata/md5-cache/media-sound/gsm-1.0.13
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lossy speech compression library and tool.
 EAPI=2
 HOMEPAGE=http://packages.qa.debian.org/libg/libgsm.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=gsm
 SLOT=0
 SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3197fc3f4d7e4f3af3337a0a12c40b1a
+_md5_=809535a008710e87a28922e63da8ca71
diff --git a/metadata/md5-cache/media-sound/lame-3.99.5 b/metadata/md5-cache/media-sound/lame-3.99.5
index c3323ca610cf..89fdd9e2fbc8 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.5
+++ b/metadata/md5-cache/media-sound/lame-3.99.5
@@ -4,10 +4,10 @@ DESCRIPTION=LAME Ain't an MP3 Encoder
 EAPI=4
 HOMEPAGE=http://lame.sourceforge.net/
 IUSE=debug mmx mp3rtp sndfile static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b86c8c4f25b5d4cca4e47cadfa2bdd46
+_md5_=0fb93dedd29eb88797e9d075caa24fb6
diff --git a/metadata/md5-cache/media-video/dirac-1.0.2 b/metadata/md5-cache/media-video/dirac-1.0.2
index 120f785a6ed4..563939c7854b 100644
--- a/metadata/md5-cache/media-video/dirac-1.0.2
+++ b/metadata/md5-cache/media-video/dirac-1.0.2
@@ -4,9 +4,9 @@ DESCRIPTION=Open Source video codec
 EAPI=4
 HOMEPAGE=http://dirac.sourceforge.net/
 IUSE=debug doc mmx static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e3098509a958792139200682ccbb06cd
+_md5_=d7efd375a0f107565e032edcc3289b56
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10 b/metadata/md5-cache/media-video/ffmpeg-0.10
deleted file mode 100644
index 65d04e2ac272..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( net-libs/gnutls ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
-EAPI=4
-HOMEPAGE=http://ffmpeg.org/
-IUSE=aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon iwmmxt
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( net-libs/gnutls ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart
-REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) test? ( encode zlib )
-SLOT=0
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e787114a08bb44c4ead1c9632820330e
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.3 b/metadata/md5-cache/media-video/ffmpeg-0.10.3
index 964b0072ed4c..1b79e3205354 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.3
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=4
 HOMEPAGE=http://ffmpeg.org/
 IUSE=aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffeval +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( media-libs/libass ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=deee193fb0a51136f76742eb4a34b81c
+_md5_=e54ceda7d2ec45ddaa68bb6025e4a25d
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.7.8 b/metadata/md5-cache/media-video/ffmpeg-0.7.8
deleted file mode 100644
index f447beff8f03..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-0.7.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20110426 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) ieee1394? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
-EAPI=2
-HOMEPAGE=http://ffmpeg.org/
-IUSE=+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic +qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib video_cards_nvidia
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) celt? ( >=media-libs/celt-0.11.1 ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20110426 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart
-SLOT=0
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.7.8.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=604dc372a34eebab68260b17e16d9687
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 212aad1dd2de..e9e256f7a96f 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -9,4 +9,4 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ass? ( me
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode zlib )
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=74cf9bdb9d52fea6685d7110713be638
+_md5_=39cb9901957d530baa19980565e987a6
diff --git a/metadata/md5-cache/media-video/kdenlive-0.9 b/metadata/md5-cache/media-video/kdenlive-0.9
new file mode 100644
index 000000000000..413966a3e96f
--- /dev/null
+++ b/metadata/md5-cache/media-video/kdenlive-0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/qjson >=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE.
+EAPI=4
+HOMEPAGE=http://www.kdenlive.org/
+IUSE=debug semantic-desktop linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_uk linguas_zh linguas_zh_CN linguas_zh_TW +handbook aqua
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/qjson >=media-libs/mlt-0.7.8[ffmpeg,sdl,xml,melt,qt4,kde] virtual/ffmpeg[encode,sdl,X] >=kde-base/kdelibs-4.4:4[aqua=,semantic-desktop?] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_he? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) >=x11-libs/qt-opengl-4.7.0:4 dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/stable/kdenlive/0.9/src/kdenlive-0.9.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=53373e990fecd65358c20b18b35770ea
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index ac63f4848b22..dd26ee8cfe06 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.4 ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+DEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) ieee1394? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) ssl? ( virtual/pkgconfig ) test? ( sys-devel/bc ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
 DESCRIPTION=Complete solution to record, convert and stream audio and video.
 EAPI=4
 HOMEPAGE=http://libav.org/
-IUSE=+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
+IUSE=aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
 LICENSE=LGPL-2.1 gpl? ( GPL-3 )
-RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) dirac? ( media-video/dirac ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) rtmp? ( >=media-video/rtmpdump-2.4 ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio ) encode? ( aac? ( media-libs/vo-aacenc ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) test? ( encode zlib )
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=daa5b0de54836272ff215e39982bf930
+_md5_=9ebfcccc75ef88837d9e2d7d3f7dabef
diff --git a/metadata/md5-cache/media-video/rtmpdump-2.4 b/metadata/md5-cache/media-video/rtmpdump-2.4
index 533a399c4638..fc6fc50f2ae6 100644
--- a/metadata/md5-cache/media-video/rtmpdump-2.4
+++ b/metadata/md5-cache/media-video/rtmpdump-2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Open source command-line RTMP client intended to stream audio or vid
 EAPI=4
 HOMEPAGE=http://rtmpdump.mplayerhq.hu/
 IUSE=gnutls polarssl ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=ssl? ( gnutls? ( net-libs/gnutls ) polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) ) !gnutls? ( !polarssl? ( dev-libs/openssl ) ) ) sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=83ceb9afdae62731032e32001670d1a7
+_md5_=37964be524224c4c0a7263236d57c44b
diff --git a/metadata/md5-cache/media-video/vlc-2.0.0 b/metadata/md5-cache/media-video/vlc-2.0.0
deleted file mode 100644
index ca7fdcfc7267..000000000000
--- a/metadata/md5-cache/media-video/vlc-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=VLC media player - Video player and streamer
-EAPI=4
-HOMEPAGE=http://www.videolan.org/vlc/
-IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
-REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat postproc swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
-SLOT=0
-SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.0/vlc-2.0.0.tar.xz mirror://gentoo/vlc-patches-101.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2b708ff4a31ecef555eec45fe2a21bc5
diff --git a/metadata/md5-cache/media-video/vlc-2.0.9999 b/metadata/md5-cache/media-video/vlc-2.0.9999
index 054c75d86f2b..89816f1b1e48 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.9999
+++ b/metadata/md5-cache/media-video/vlc-2.0.9999
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.videolan.org/vlc/
 IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
-REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
+REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-101.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6b07c71600b426d06c5e27b9a56b4896
+_md5_=a879842759c0bc8d9c9e7eb4679f521a
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 2dd829f8d3b3..a247cec776d6 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+DEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=4
 HOMEPAGE=http://www.videolan.org/vlc/
-IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi
+IUSE=a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec +avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sqlite sse svg +swscale switcher taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xv zvbi
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
-REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
+RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
+REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) avcodec? ( ffmpeg ) avformat? ( ffmpeg ) swscale? ( ffmpeg ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0
 SRC_URI=mirror://gentoo/vlc-patches-101.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9cadfdad08f118200346c95a3370b201
+_md5_=bf6c89457feb4c036e95d1795c2345ca
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
index 6b937f97c8cf..3420fa184081 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/tcl-8.3[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-t
 SLOT=0
 SRC_URI=mirror://sourceforge/sguil/sguil-server-0.8.0.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bd22acf97c3a9824d28edf2413a41705
+_md5_=f29532d96020bf566b0b0a2eeebbc4ec
diff --git a/metadata/md5-cache/net-irc/atheme-services-6.0.11 b/metadata/md5-cache/net-irc/atheme-services-6.0.11
new file mode 100644
index 000000000000..67f2c4eae335
--- /dev/null
+++ b/metadata/md5-cache/net-irc/atheme-services-6.0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DESCRIPTION=A portable and secure set of open-source and modular IRC services
+EAPI=4
+HOMEPAGE=http://atheme.net/
+IUSE=cracklib largenet ldap nls +pcre perl profile ssl
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=BSD
+RDEPEND=dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
+SLOT=0
+SRC_URI=http://atheme.net/downloads/atheme-services-6.0.11.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=160ed0c198568413cea1b961085237d8
diff --git a/metadata/md5-cache/net-irc/atheme-services-7.0.0 b/metadata/md5-cache/net-irc/atheme-services-7.0.2
similarity index 53%
rename from metadata/md5-cache/net-irc/atheme-services-7.0.0
rename to metadata/md5-cache/net-irc/atheme-services-7.0.2
index 805747015599..3b1f0a140d79 100644
--- a/metadata/md5-cache/net-irc/atheme-services-7.0.0
+++ b/metadata/md5-cache/net-irc/atheme-services-7.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+DEPEND=>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) virtual/pkgconfig dev-lang/perl[-build]
 DESCRIPTION=A portable and secure set of open-source and modular IRC services
 EAPI=4
 HOMEPAGE=http://atheme.net/
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-libs/libmowgli-2.0.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 SLOT=0
-SRC_URI=http://atheme.net/downloads/atheme-services-7.0.0.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=aa89c50750d56dcde950ba061ef1a80e
+SRC_URI=http://atheme.net/downloads/atheme-services-7.0.2.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=8f5181f8c533b9e5c96aca3fb7efd8fb
diff --git a/metadata/md5-cache/net-libs/miniupnpc-1.6-r1 b/metadata/md5-cache/net-libs/miniupnpc-1.6-r1
index 0e785621be33..ee4891773fa7 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-1.6-r1
+++ b/metadata/md5-cache/net-libs/miniupnpc-1.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=sys-apps/lsb-release
+DEPEND=kernel_linux? ( sys-apps/lsb-release )
 DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=4
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.6.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=cae7d879ba93617055e7852809506525
+_md5_=a76efea552f4cee65fb91defd34f5332
diff --git a/metadata/md5-cache/net-misc/bfgminer-2.4.1 b/metadata/md5-cache/net-misc/bfgminer-2.4.1
new file mode 100644
index 000000000000..b91fbb041d8d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bfgminer-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) opencl? ( virtual/opencl ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+DESCRIPTION=Modular Bitcoin CPU/GPU/FPGA miner in C
+EAPI=4
+HOMEPAGE=https://bitcointalk.org/index.php?topic=78192.0
+IUSE=+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
+REQUIRED_USE=|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+SLOT=0
+SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/2.4.1/bfgminer-2.4.1.tbz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=1fc117ce2a65f4ff8e29abff9f2ef2f9
diff --git a/metadata/md5-cache/net-misc/cgminer-2.4.0 b/metadata/md5-cache/net-misc/cgminer-2.4.0
index c9e337f54634..38cd3c1aa3e7 100644
--- a/metadata/md5-cache/net-misc/cgminer-2.4.0
+++ b/metadata/md5-cache/net-misc/cgminer-2.4.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
 REQUIRED_USE=|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
 SLOT=0
-SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-2.4.0.tar.bz2
+SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-2.4/cgminer-2.4.0.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=33edb3b303d3508f689d60682780b3ed
+_md5_=1518a21ac532f6ff6a0d0472ca3a1457
diff --git a/metadata/md5-cache/net-misc/cgminer-2.4.1 b/metadata/md5-cache/net-misc/cgminer-2.4.1
new file mode 100644
index 000000000000..b6375ba71301
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cgminer-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 ) virtual/pkgconfig sys-apps/sed adl? ( x11-libs/amd-adl-sdk ) sse2? ( >=dev-lang/yasm-1.0.1 ) sse4? ( >=dev-lang/yasm-1.0.1 )
+DESCRIPTION=Bitcoin CPU/GPU/FPGA miner in C
+EAPI=4
+HOMEPAGE=https://bitcointalk.org/index.php?topic=28402.0
+IUSE=+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses ) dev-libs/jansson opencl? ( virtual/opencl ) udev? ( sys-fs/udev ) ztex? ( dev-libs/libusb:1 )
+REQUIRED_USE=|| ( bitforce cpumining icarus opencl ztex ) adl? ( opencl ) altivec? ( cpumining ppc ppc64 ) padlock? ( cpumining || ( amd64 x86 ) ) sse2? ( cpumining || ( amd64 x86 ) ) sse4? ( cpumining amd64 )
+SLOT=0
+SRC_URI=http://ck.kolivas.org/apps/cgminer/cgminer-2.4.1.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ebf24b9a8e4fd2c2f2ab92ca5b5bf11c
diff --git a/metadata/md5-cache/net-nntp/tin-2.0.1 b/metadata/md5-cache/net-nntp/tin-2.0.1
new file mode 100644
index 000000000000..a757d6402c97
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/tin-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu ) virtual/pkgconfig
+DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
+EAPI=4
+HOMEPAGE=http://www.tin.org/
+IUSE=cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu )
+SLOT=0
+SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/v2.0/tin-2.0.1.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dcad06a8642e743dd0e7459f09fd5c3a
diff --git a/metadata/md5-cache/net-print/cups-pdf-3.0_beta1 b/metadata/md5-cache/net-print/cups-pdf-3.0_beta1
new file mode 100644
index 000000000000..a46f2b7bcd33
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-pdf-3.0_beta1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=net-print/cups app-text/ghostscript-gpl
+DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files.
+EAPI=4
+HOMEPAGE=http://www.cups-pdf.de/
+IUSE=+ppds
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups app-text/ghostscript-gpl
+SLOT=0
+SRC_URI=http://www.cups-pdf.de/src/cups-pdf_3.0beta1.tar.gz
+_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=d8613d2b9bad4fb768a01b03b29ff533
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.3-r2 b/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.3-r2
deleted file mode 100644
index 98083a45eb55..000000000000
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-0.7.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-libs/libnl ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) wimax? ( !net-wireless/libeap ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
-EAPI=2
-HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
-IUSE=dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wimax wps kernel_linux kernel_FreeBSD
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=|| ( GPL-2 BSD )
-RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( || ( >net-wireless/madwifi-ng-tools-0.9.3 net-wireless/madwifi-old ) ) dev-libs/libnl ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) wimax? ( !net-wireless/libeap ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) )
-SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=0f49fe296ed4a335dc76e96839915fc0
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-1.0 b/metadata/md5-cache/net-wireless/wpa_supplicant-1.0
new file mode 100644
index 000000000000..ec7dbf966041
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 ) dev-libs/libnl:1.1 ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
+EAPI=4
+HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
+IUSE=dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=|| ( GPL-2 BSD )
+RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 ) dev-libs/libnl:1.1 ) !kernel_linux? ( net-libs/libpcap ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) readline? ( sys-libs/ncurses sys-libs/readline ) ssl? ( dev-libs/openssl ) !ssl? ( gnutls? ( net-libs/gnutls ) ) !ssl? ( !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager )
+SLOT=0
+SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-1.0.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=59b3607d69f7bb8e600c1fada408e614
diff --git a/metadata/md5-cache/sci-physics/root-5.32.03 b/metadata/md5-cache/sci-physics/root-5.32.03
new file mode 100644
index 000000000000..acd481a31f73
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-5.32.03
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/xz-utils >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre media-libs/freetype media-libs/giflib media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg virtual/shadow X? ( media-libs/ftgl media-libs/glew x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) xft? ( x11-libs/libXft ) ) afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c[curl] ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) graphviz? ( media-gfx/graphviz ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) xrootd? ( net-libs/xrootd ) virtual/pkgconfig python? ( =dev-lang/python-2* )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=4
+HOMEPAGE=http://root.cern.ch/
+IUSE=+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=virtual/fortran app-arch/xz-utils >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre media-libs/freetype media-libs/giflib media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/jpeg virtual/shadow X? ( media-libs/ftgl media-libs/glew x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-svg:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) xft? ( x11-libs/libXft ) ) afs? ( net-fs/openafs ) avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c[curl] ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) graphviz? ( media-gfx/graphviz ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) xrootd? ( net-libs/xrootd ) reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd ) python? ( =dev-lang/python-2* )
+REQUIRED_USE=!X? ( !opengl !qt4 !xft )
+SLOT=0
+SRC_URI=ftp://root.cern.ch/root/root_v5.32.03.source.tar.gz doc? ( ftp://root.cern.ch/root/doc/Users_Guide_5_26.pdf math? ( ftp://root.cern.ch/root/doc/RooFit_Users_Manual_2.91-33.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.03.pdf ) )
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	fortran-2	368b82ae80c1184988a9d651e6efcbd0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5a61f911736f74e25fcd63de49248dce
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-0.8.4 b/metadata/md5-cache/sys-apps/gptfdisk-0.8.4
index 7ef62fdcab6f..298452b844ad 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-0.8.4
+++ b/metadata/md5-cache/sys-apps/gptfdisk-0.8.4
@@ -3,10 +3,10 @@ DEPEND=dev-libs/icu dev-libs/popt sys-libs/ncurses
 DESCRIPTION=gdisk - GPT partition table manipulator for Linux
 EAPI=4
 HOMEPAGE=http://www.rodsbooks.com/gdisk/
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/icu dev-libs/popt sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-0.8.4.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=02981c531e92ba30d799c7d12648cd51
+_md5_=ced5fab44069779871e239ae33e88b6a
diff --git a/metadata/md5-cache/sys-boot/yaboot-1.3.17-r1 b/metadata/md5-cache/sys-boot/yaboot-1.3.17-r1
index c899cda41dcb..16dd365b24fa 100644
--- a/metadata/md5-cache/sys-boot/yaboot-1.3.17-r1
+++ b/metadata/md5-cache/sys-boot/yaboot-1.3.17-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PPC Bootloader
 EAPI=2
 HOMEPAGE=http://yaboot.ozlabs.org
 IUSE=ibm
-KEYWORDS=-* ~ppc -ppc64
+KEYWORDS=-* ppc -ppc64
 LICENSE=GPL-2
 RDEPEND=!ibm? ( sys-fs/hfsutils sys-fs/hfsplusutils sys-fs/mac-fdisk )
 SLOT=0
 SRC_URI=http://yaboot.ozlabs.org/releases/yaboot-1.3.17.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=739feb3d9b718ee2c9ef0c35173ed7fc
+_md5_=cf1867b14988049bd962e9de98d2ffff
diff --git a/metadata/md5-cache/sys-boot/yaboot-static-1.3.17 b/metadata/md5-cache/sys-boot/yaboot-static-1.3.17
index 7aa81bae594f..a1c7d1af6fe2 100644
--- a/metadata/md5-cache/sys-boot/yaboot-static-1.3.17
+++ b/metadata/md5-cache/sys-boot/yaboot-static-1.3.17
@@ -3,10 +3,10 @@ DEPEND=!sys-boot/yaboot sys-apps/powerpc-utils
 DESCRIPTION=Static yaboot ppc boot loader for machines with open firmware
 HOMEPAGE=http://penguinppc.org/projects/yaboot/
 IUSE=ibm
-KEYWORDS=-* ~ppc64
+KEYWORDS=-* ppc64
 LICENSE=GPL-2
 RDEPEND=!ibm? ( sys-fs/hfsutils sys-fs/hfsplusutils sys-fs/mac-fdisk )
 SLOT=0
 SRC_URI=mirror://gentoo/yaboot-static-1.3.17.tbz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8dc8643898170989709d73ff6d3a8526
+_md5_=24bf5ad789bb3764ec41c5fc959923c0
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.4-r2 b/metadata/md5-cache/sys-fs/udisks-1.0.4-r2
index 1d0c79f6c551..ca17addb15e2 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.0.4-r2
+++ b/metadata/md5-cache/sys-fs/udisks-1.0.4-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 >=dev-libs/libatasmart-0.
 SLOT=0
 SRC_URI=http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0e222baa95afdb2099998c77f108e35b
+_md5_=ee8d4ff76a0c17a5447c17c05ef097bc
diff --git a/metadata/md5-cache/sys-fs/udisks-1.94.0 b/metadata/md5-cache/sys-fs/udisks-1.94.0
deleted file mode 100644
index 998a3a35c2f8..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-1.94.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.32.0 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug doc +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) sys-apps/acl virtual/eject
-SLOT=2
-SRC_URI=http://udisks.freedesktop.org/releases/udisks-1.94.0.tar.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8d9b6242cf66ba0514d568aec8ae3ca1
diff --git a/metadata/md5-cache/sys-fs/udisks-1.96.0 b/metadata/md5-cache/sys-fs/udisks-1.96.0
deleted file mode 100644
index 203dc1a71bf8..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-1.96.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug doc crypt +gptfdisk +introspection systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject crypt? ( sys-fs/cryptsetup ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-SLOT=2
-SRC_URI=http://udisks.freedesktop.org/releases/udisks-1.96.0.tar.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a583f16dd8aeee2288d0960a69020821
diff --git a/metadata/md5-cache/sys-fs/udisks-1.97.0 b/metadata/md5-cache/sys-fs/udisks-1.97.0-r1
similarity index 91%
rename from metadata/md5-cache/sys-fs/udisks-1.97.0
rename to metadata/md5-cache/sys-fs/udisks-1.97.0-r1
index bbee6177f1fc..6b42b50d98c4 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.97.0
+++ b/metadata/md5-cache/sys-fs/udisks-1.97.0-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
 IUSE=debug doc crypt +gptfdisk +introspection systemd
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/acl introspection? ( >=dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject crypt? ( sys-fs/cryptsetup ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
 SLOT=2
 SRC_URI=http://udisks.freedesktop.org/releases/udisks-1.97.0.tar.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=59a3f6fd60ec55517d865cd58030ffc7
+_md5_=dea9c29e81884604a11e17c15c49725c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r100 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r100
deleted file mode 100644
index ea4cc4e723fa..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r100
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-102.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b62e8ac6a2de5e245f1a6d29c22f111e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r101 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r101
deleted file mode 100644
index 54fe1b508b9e..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r101
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r101
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-103.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1a98a424870db6b248c64cde6a4a722e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r102 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r102
deleted file mode 100644
index bd1509c82226..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r102
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r102
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-104.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=793cc230dea5a26d58f0b29441dcfe7a
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r103 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r103
deleted file mode 100644
index d7314f6fb8d1..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r103
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r103
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-105.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=306a1bc4ddca19681e20b08a1cef9b48
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.15 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.15
deleted file mode 100644
index c0462344ebef..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.2.15
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.15-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-13.base.tar.bz2 mirror://gentoo/genpatches-3.2-13.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9263aab88b09d1e5ac104d9103642339
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16
deleted file mode 100644
index 7cc68b4c54e9..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.2.16
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ca9f0e9c4bbdc3f7b1fab7762927f47d
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r1
deleted file mode 100644
index 56f4e957d466..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.2.16-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1b76848832a7581d60d71a028a4a1a80
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r2
deleted file mode 100644
index 29edfc73a653..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.16-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.2.16-r2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=283d3de73173049614e7f41511cfe132
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.2
deleted file mode 100644
index 16219916d60b..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.3)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.3.2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.2-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-3.base.tar.bz2 mirror://gentoo/genpatches-3.3-3.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5d6ece6df8bc2dd914672fd949487a6f
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.3
deleted file mode 100644
index 5931c175e71c..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.3)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.3.3
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.3-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-4.base.tar.bz2 mirror://gentoo/genpatches-3.3-4.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=79f45c79f6ae913b50f92666997c4692
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.4
deleted file mode 100644
index 0ea380d629de..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.3)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.3.4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.4-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=09725bf82e96b807d30aee744b5c3c8c
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.3.5
deleted file mode 100644
index 2f92a1299dcc..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Hardened kernel sources (kernel series 3.3)
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-RESTRICT=binchecks strip
-SLOT=3.3.5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.5-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	kernel-2	4ad25895a12c475dde98376a2e743827	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0559de9e6e93893500ec49544b5f0213
diff --git a/metadata/md5-cache/virtual/ffmpeg-0.10.2-r1 b/metadata/md5-cache/virtual/ffmpeg-0.10.2-r1
index c93ff36ecb59..6f9b833294fb 100644
--- a/metadata/md5-cache/virtual/ffmpeg-0.10.2-r1
+++ b/metadata/md5-cache/virtual/ffmpeg-0.10.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual package for FFmpeg implementation
 EAPI=4
 IUSE=X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( >=media-video/ffmpeg-0.10.2[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] >=media-video/libav-0.8.1[X=,encode=,jpeg2k=,mp3=,sdl=,theora=,threads=,truetype=,vaapi=,vdpau=,x264=] )
 SLOT=0
-_md5_=dcf84faac1ed6ea065008e4a09dda3d0
+_md5_=5af1eeb05e1b21b28f4d003e8700cd9e
diff --git a/metadata/md5-cache/virtual/monodoc-2.11 b/metadata/md5-cache/virtual/monodoc-2.11
new file mode 100644
index 000000000000..35f5983ec634
--- /dev/null
+++ b/metadata/md5-cache/virtual/monodoc-2.11
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for monodoc
+KEYWORDS=~amd64 ~ppc ~x86
+PROPERTIES=virtual
+RDEPEND==dev-lang/mono-2.11*
+SLOT=0
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=510820e7bf8624f514a4a0eda938e1fb
diff --git a/metadata/md5-cache/www-client/chromium-19.0.1084.46 b/metadata/md5-cache/www-client/chromium-19.0.1084.46
index bc62c493246b..4e80109b1447 100644
--- a/metadata/md5-cache/www-client/chromium-19.0.1084.46
+++ b/metadata/md5-cache/www-client/chromium-19.0.1084.46
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.9.13 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-19.0.1084.46.tar.bz2
 _eclasses_=chromium	7fa8b89b813dd73fc3fbb50a89b05383	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=69a5be31dadcdc8e175e34c9fe9b671f
+_md5_=7fad1fac1d1f49e53e2abca8466f4a56
diff --git a/metadata/md5-cache/www-client/midori-0.4.4 b/metadata/md5-cache/www-client/midori-0.4.4
deleted file mode 100644
index 8831fb4e21eb..000000000000
--- a/metadata/md5-cache/www-client/midori-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=A lightweight web browser based on WebKitGTK+
-EAPI=4
-HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
-IUSE=doc gnome libnotify nls +unique
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1 MIT
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.4.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	waf-utils	ae7a766a544bf00157bc3f3c061c9111
-_md5_=3aaf6b9e30d7f64cb6211dc0c0bf8b27
diff --git a/metadata/md5-cache/www-client/midori-0.4.5 b/metadata/md5-cache/www-client/midori-0.4.6
similarity index 94%
rename from metadata/md5-cache/www-client/midori-0.4.5
rename to metadata/md5-cache/www-client/midori-0.4.6
index c4477cd5191d..7f75f420312b 100644
--- a/metadata/md5-cache/www-client/midori-0.4.5
+++ b/metadata/md5-cache/www-client/midori-0.4.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1 MIT
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
-SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.5.tar.bz2
+SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.6.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	waf-utils	ae7a766a544bf00157bc3f3c061c9111
-_md5_=046f5ebacc2cf9a37aecbb5e992b9ab4
+_md5_=e817c070d83eb7d2a2e2ff5a2c4e88cc
diff --git a/metadata/md5-cache/www-client/midori-9999 b/metadata/md5-cache/www-client/midori-9999
index 3a262bed3527..c25bce6f29e8 100644
--- a/metadata/md5-cache/www-client/midori-9999
+++ b/metadata/md5-cache/www-client/midori-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads] dev-vcs/git
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.16 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads] dev-vcs/git
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=4
 HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 )
 SLOT=0
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	waf-utils	ae7a766a544bf00157bc3f3c061c9111
-_md5_=080a8de355e165e9b3a49898241b5c60
+_md5_=b9b5eecaafef1f026856c3a9b69589d6
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.2.3 b/metadata/md5-cache/www-servers/uwsgi-1.2.3
index 2278409baed3..a9e2c465637f 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.2.3
+++ b/metadata/md5-cache/www-servers/uwsgi-1.2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	addbdf6cce5024ac93ad2084ad5e1d2d	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	php-ext-source-r2	16faeec04ef5acbba2af3cab7f8966d3	python	36d7e2b7aa4dce62364c72eec96610cf	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f42e9d721e7410623cac1a6e1957a22f
+_md5_=f0c1755dd172f46d2826de13ef8950a2
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.3 b/metadata/md5-cache/x11-apps/appres-1.0.3
index 4c68cc015c0d..2dde7baad252 100644
--- a/metadata/md5-cache/x11-apps/appres-1.0.3
+++ b/metadata/md5-cache/x11-apps/appres-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=
 DESCRIPTION=list X application resource database
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/appres-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=020dbf97281275851a4712afe64ae6e8
+_md5_=7c95ab2763d470683edbc5ba814eb512
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.6 b/metadata/md5-cache/x11-apps/bitmap-1.0.6
index 00c1519f7189..cb7e8a2a2565 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/x
 DESCRIPTION=X.Org bitmap application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=6dd2f59665fa601341a95413a120549c
+_md5_=e88ced4ee285bbe558144e1c435eca99
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.0.7 b/metadata/md5-cache/x11-apps/sessreg-1.0.7
index 79f5a6b69cf4..eaa2d4498c5a 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.0.7
+++ b/metadata/md5-cache/x11-apps/sessreg-1.0.7
@@ -3,9 +3,9 @@ DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/auto
 DESCRIPTION=manage utmp/wtmp entries for non-init clients
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=01efc7bc3e8967c270c629c9a8c52d29
+_md5_=226c4548a97991ffeeb2703e07f783b9
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
index eafd2471c4af..5b8ac71dcd2e 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11
 DESCRIPTION=Controls the keyboard layout of a running X server.
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=193988aff522bd0aac8a264f9c74512c
+_md5_=6c3a99c6e946d74a70fac2de828df956
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.5 b/metadata/md5-cache/x11-apps/smproxy-1.0.5
index ec8c0974e2f2..22605768ac3f 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.5
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.11.1:1.11 ) >=
 DESCRIPTION=Session Manager Proxy
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.5.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=da501630ddd2b39d620951063e002e2e
+_md5_=8662dca33843c16c7f6a5f2af00cdfcc
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.4 b/metadata/md5-cache/x11-apps/x11perf-1.5.4
index fbddaa8462e1..156b9894c281 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.4
+++ b/metadata/md5-cache/x11-apps/x11perf-1.5.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-l
 DESCRIPTION=X rendering operation stress test utility
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/x11perf-1.5.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=692c0a7f70af7bdd4f3ee5357d177de8
+_md5_=a95c894c13390c0a53facad7bfa577ee
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.1.2 b/metadata/md5-cache/x11-apps/xbacklight-1.1.2
index 53880ebd0e4c..2855e59e4ab8 100644
--- a/metadata/md5-cache/x11-apps/xbacklight-1.1.2
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.1.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libXrandr-1.2 x11-libs/libX11 || ( >=sys-devel/automake-1.11.1
 DESCRIPTION=Sets backlight level using the RandR 1.2 BACKLIGHT output property
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.2 x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=b6e4ef137a4bf6bdb84649667730000a
+_md5_=a2b90972d3e29bfb6f9d2187f0b98823
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
index 2a68491c2e3b..e9ea15752984 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoc
 DESCRIPTION=Device Color Characterization utility for X Color Management System
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=02e64a805606f6934cb8b8c5b1184d9a
+_md5_=062e1b74f31da447b431e4e62b9dfae7
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0
index 09cf4efcf13b..16ac38760418 100644
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0
+++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Display information utility for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dga dmx xinerama
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdpyinfo-1.3.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=3c221f3308241e1e75af7e5142fd8b39
+_md5_=fbad01a8d06c424934b5c6cfa19e6857
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
index 02d562ecc11c..8a0382ed4bee 100644
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 virtual/opengl x11-proto/glproto || ( >=sys-devel/automak
 DESCRIPTION=query configuration information of DRI drivers
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=17fc27666168d578760e35ecf0f3984a
+_md5_=74431fd39ed34e1bfdd4e854f0c030b0
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.0 b/metadata/md5-cache/x11-apps/xev-1.2.0
index 42ad6874a89e..61346266a994 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.0
+++ b/metadata/md5-cache/x11-apps/xev-1.2.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/auto
 DESCRIPTION=print contents of X events
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-interix ~x86-linux ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=b377b58c6434df7b95842d86dec2e229
+_md5_=31de584af32c14ffbf5d3b58248148a6
diff --git a/metadata/md5-cache/x11-apps/xf86dga-1.0.3 b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
index 0ee8c731cd6b..573541e8fb08 100644
--- a/metadata/md5-cache/x11-apps/xf86dga-1.0.3
+++ b/metadata/md5-cache/x11-apps/xf86dga-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1 x11-proto/xf86dgaproto || ( >=
 DESCRIPTION=test program for the XFree86-DGA extension
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 >=x11-libs/libXxf86dga-1.1
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xf86dga-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=38da74b667ac622d8bb7f9fdad27c2a6
+_md5_=98f22a71c3efe508cdcfd1351ae68eb2
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.5 b/metadata/md5-cache/x11-apps/xgamma-1.0.5
index 9536052b62ce..106bd9c29046 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.5
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys
 DESCRIPTION=Alter a monitor's gamma correction through the X server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=099eba8c465d80e3ed6629e521fe4d5d
+_md5_=ebc194295e5d3db5f41d454e399eb44d
diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.4 b/metadata/md5-cache/x11-apps/xinput-1.5.4
index 27245e1c2262..9e73d8de37d9 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.5.4
+++ b/metadata/md5-cache/x11-apps/xinput-1.5.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto
 DESCRIPTION=Utility to set XInput device parameters
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=0831391e0bc9bbb179b056ee1efa4e03
+_md5_=f05c5910f618748b64cb8aaf0b2fbbc0
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.3 b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
index 1f8c61cd88b1..bd85c6b14afc 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/auto
 DESCRIPTION=XKB event daemon
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=51a72b45738bfb27eb13e105f43b3b9c
+_md5_=a2c84808452d86cac8ab1cbd0560c946
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.3 b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
index f47a72119092..0fc792753c20 100644
--- a/metadata/md5-cache/x11-apps/xkbutils-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-proto/xproto x11-proto
 DESCRIPTION=X.Org xkbutils application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbutils-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=8abb8bb738ed5fb33bfdf0a563c65ef1
+_md5_=04439941e3419cc4e952fef83ee0e9bf
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.3 b/metadata/md5-cache/x11-apps/xkill-1.0.3
index b2379c7c9588..60d0e223a72b 100644
--- a/metadata/md5-cache/x11-apps/xkill-1.0.3
+++ b/metadata/md5-cache/x11-apps/xkill-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu || ( >=sys-devel/automake-1.11.1:1.11 ) >
 DESCRIPTION=kill a client by its X resource
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkill-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=239b8da4e63315a29e3d6d599b12bebc
+_md5_=94c818fada6fefc8383076bae5c8615e
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
index 2b2d53c378b6..631c26786b3b 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoc
 DESCRIPTION=list interned atoms defined on server
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libxcb
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=63bf93fde9c07d8c6567f75c1859154e
+_md5_=cf6a367cfeecb41b0ef6ca5c1e859093
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.2 b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
index 7258233ac1d9..6cb27cad4a3f 100644
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.2
+++ b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake
 DESCRIPTION=X.Org xlsclients application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsclients-1.1.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=211be1116cc5980d88a9e36362c6a192
+_md5_=070cd315d548dfcd94ccbf9899348d9c
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.7 b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
index b6531d1133dd..72e9df2b2580 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoc
 DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=5bc6d4c05a86b8c84f30af3d50ad5fc6
+_md5_=e28cb0e7012812a32f61fb33460e0f8c
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.4 b/metadata/md5-cache/x11-apps/xpr-1.0.4
index 338b49d0848e..4690ca1f78a7 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.4
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >
 DESCRIPTION=X.Org xpr application
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=e700f046181f506e3a3d9bfcec6d9001
+_md5_=b640d70b152f4fe998a9c9e8f51a9474
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.3.5 b/metadata/md5-cache/x11-apps/xrandr-1.3.5
index 214f40fe3ddf..87c52844c496 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.3.5
+++ b/metadata/md5-cache/x11-apps/xrandr-1.3.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11 || ( >=sys-d
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.3 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.5.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=f43d2f417da10604e6674016abff6d09
+_md5_=f4cafe1bb7206a5c3fd1353eedc5d0c4
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.4 b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
index 76a1afd2f1f9..2b2687156c95 100644
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.4
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoc
 DESCRIPTION=refresh all or part of an X screen
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrefresh-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=1c21df09e6250440038425660139be95
+_md5_=4d15e7c5ee862c2a6f5e1687cb926eb0
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.0 b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
index 23ffb18be9ef..34556d0e2359 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.0
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor ||
 DESCRIPTION=X.Org xsetroot application
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xsetroot-1.1.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=48f3613feb09557452a7fe3a396138a7
+_md5_=56f1e434b4f1262572e611be7f98621e
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.1 b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
index d09323e2f05f..bb32c59bff1f 100644
--- a/metadata/md5-cache/x11-apps/xvinfo-1.1.1
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXv x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=
 DESCRIPTION=Print out X-Video extension adaptor information
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXv x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvinfo-1.1.1.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=4f9a68a0960ab8310fc74e37c815be51
+_md5_=f9a4a37368e0aae3c9966ef964e321ef
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.5 b/metadata/md5-cache/x11-apps/xwd-1.0.5
index e8afe4e65658..1cd39658de92 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.5
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libxkbfile x11-proto/xproto || (
 DESCRIPTION=dump an image of an X window
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=db777bb395be710d5bf5f503e679eb24
+_md5_=2b4f6206814f8a132e6658bd1e720eae
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.2 b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
index aa2eed5143a8..245bbadc9038 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.2
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libxcb-1.6 x11-libs/libX11 >=x11-proto/xproto-7.0.17 || ( >=sy
 DESCRIPTION=window information utility for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.1.2.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=3e6b7c04b165e2f1917c01ed6e97baf4
+_md5_=ab3d1ffe3634a88013f8d605d4f5de97
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.4 b/metadata/md5-cache/x11-apps/xwud-1.0.4
index e3b403cee58d..c490e059f23e 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoc
 DESCRIPTION=image displayer for X
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=5d84d9419758b0f7ad833235211699f1
+_md5_=eb6011e6326b2502aeaa04bbeda866ec
diff --git a/metadata/md5-cache/x11-base/xorg-x11-7.4-r2 b/metadata/md5-cache/x11-base/xorg-x11-7.4-r2
index 4b6c2abe0737..221e52e92c2b 100644
--- a/metadata/md5-cache/x11-base/xorg-x11-7.4-r2
+++ b/metadata/md5-cache/x11-base/xorg-x11-7.4-r2
@@ -3,9 +3,9 @@ DEPEND=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/i
 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
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~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/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_=8277aadde713a796d7cf100e1a434e91
+_md5_=04dfc4eca9edaaff978618c065b0573d
diff --git a/metadata/md5-cache/x11-libs/libfm-0.1.12 b/metadata/md5-cache/x11-libs/libfm-0.1.12
index b1693c7d8a5d..21b70d4fc7b0 100644
--- a/metadata/md5-cache/x11-libs/libfm-0.1.12
+++ b/metadata/md5-cache/x11-libs/libfm-0.1.12
@@ -6,8 +6,8 @@ HOMEPAGE=http://pcmanfm.sourceforge.net/
 IUSE=debug demo udev
 KEYWORDS=~alpha amd64 arm ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 udev? ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] )
+RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2 udev? ( || ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] >=gnome-base/gvfs-1.6.4-r2[udisks,udev] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcmanfm/libfm-0.1.12.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=de2f6e5245aaad60b05b948e2734b7c9
+_md5_=fc54d6cae889d437f3b834f30966abda
diff --git a/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1 b/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
index 55145e268013..1a2459d76cfa 100644
--- a/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
+++ b/metadata/md5-cache/x11-libs/qt-demo-4.8.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] aqua? ( ~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
+DEPEND=~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
 DESCRIPTION=Demonstration module and examples for the Qt toolkit
 EAPI=4
 HOMEPAGE=http://qt-project.org/ http://qt.nokia.com/
 IUSE=dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns aqua debug pch +exceptions c++0x qpa
 KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] aqua? ( ~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1 !>x11-libs/qt-assistant-4.8.1-r9999 !<x11-libs/qt-bearer-4.8.1 !>x11-libs/qt-bearer-4.8.1-r9999 !<x11-libs/qt-core-4.8.1 !>x11-libs/qt-core-4.8.1-r9999 !<x11-libs/qt-dbus-4.8.1 !>x11-libs/qt-dbus-4.8.1-r9999 !<x11-libs/qt-declarative-4.8.1 !>x11-libs/qt-declarative-4.8.1-r9999 !<x11-libs/qt-demo-4.8.1 !>x11-libs/qt-demo-4.8.1-r9999 !<x11-libs/qt-gui-4.8.1 !>x11-libs/qt-gui-4.8.1-r9999 !<x11-libs/qt-multimedia-4.8.1 !>x11-libs/qt-multimedia-4.8.1-r9999 !<x11-libs/qt-opengl-4.8.1 !>x11-libs/qt-opengl-4.8.1-r9999 !<x11-libs/qt-openvg-4.8.1 !>x11-libs/qt-openvg-4.8.1-r9999 !<x11-libs/qt-phonon-4.8.1 !>x11-libs/qt-phonon-4.8.1-r9999 !<x11-libs/qt-qt3support-4.8.1 !>x11-libs/qt-qt3support-4.8.1-r9999 !<x11-libs/qt-script-4.8.1 !>x11-libs/qt-script-4.8.1-r9999 !<x11-libs/qt-sql-4.8.1 !>x11-libs/qt-sql-4.8.1-r9999 !<x11-libs/qt-svg-4.8.1 !>x11-libs/qt-svg-4.8.1-r9999 !<x11-libs/qt-test-4.8.1 !>x11-libs/qt-test-4.8.1-r9999 !<x11-libs/qt-webkit-4.8.1 !>x11-libs/qt-webkit-4.8.1-r9999 !<x11-libs/qt-xmlpatterns-4.8.1 !>x11-libs/qt-xmlpatterns-4.8.1-r9999
+RDEPEND=~x11-libs/qt-assistant-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-core-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-gui-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-script-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-sql-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ~x11-libs/qt-svg-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ~x11-libs/qt-test-4.8.1:4[aqua=,c++0x=,debug=,qpa=] dbus? ( ~x11-libs/qt-dbus-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) declarative? ( ~x11-libs/qt-declarative-4.8.1:4[aqua=,c++0x=,debug=,qpa=,webkit?] ) kde? ( media-libs/phonon[aqua=] ) !kde? ( || ( ~x11-libs/qt-phonon-4.8.1:4[aqua=,c++0x=,debug=,qpa=] media-libs/phonon[aqua=] ) ) multimedia? ( ~x11-libs/qt-multimedia-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) opengl? ( ~x11-libs/qt-opengl-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) openvg? ( ~x11-libs/qt-openvg-4.8.1:4[aqua=,c++0x=,debug=,qpa=,qt3support?] ) qt3support? ( ~x11-libs/qt-qt3support-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) webkit? ( ~x11-libs/qt-webkit-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) xmlpatterns? ( ~x11-libs/qt-xmlpatterns-4.8.1:4[aqua=,c++0x=,debug=,qpa=] ) !<x11-libs/qt-assistant-4.8.1 !>x11-libs/qt-assistant-4.8.1-r9999 !<x11-libs/qt-bearer-4.8.1 !>x11-libs/qt-bearer-4.8.1-r9999 !<x11-libs/qt-core-4.8.1 !>x11-libs/qt-core-4.8.1-r9999 !<x11-libs/qt-dbus-4.8.1 !>x11-libs/qt-dbus-4.8.1-r9999 !<x11-libs/qt-declarative-4.8.1 !>x11-libs/qt-declarative-4.8.1-r9999 !<x11-libs/qt-demo-4.8.1 !>x11-libs/qt-demo-4.8.1-r9999 !<x11-libs/qt-gui-4.8.1 !>x11-libs/qt-gui-4.8.1-r9999 !<x11-libs/qt-multimedia-4.8.1 !>x11-libs/qt-multimedia-4.8.1-r9999 !<x11-libs/qt-opengl-4.8.1 !>x11-libs/qt-opengl-4.8.1-r9999 !<x11-libs/qt-openvg-4.8.1 !>x11-libs/qt-openvg-4.8.1-r9999 !<x11-libs/qt-phonon-4.8.1 !>x11-libs/qt-phonon-4.8.1-r9999 !<x11-libs/qt-qt3support-4.8.1 !>x11-libs/qt-qt3support-4.8.1-r9999 !<x11-libs/qt-script-4.8.1 !>x11-libs/qt-script-4.8.1-r9999 !<x11-libs/qt-sql-4.8.1 !>x11-libs/qt-sql-4.8.1-r9999 !<x11-libs/qt-svg-4.8.1 !>x11-libs/qt-svg-4.8.1-r9999 !<x11-libs/qt-test-4.8.1 !>x11-libs/qt-test-4.8.1-r9999 !<x11-libs/qt-webkit-4.8.1 !>x11-libs/qt-webkit-4.8.1-r9999 !<x11-libs/qt-xmlpatterns-4.8.1 !>x11-libs/qt-xmlpatterns-4.8.1-r9999
 SLOT=4
 SRC_URI=http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.1.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-build	dbf69badc127af2a51a82419352ce831	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7cc5ab7ffcb5cd8560831acaea8aeda5
+_md5_=9f83d9945e0a2f36e7e8511fcbaf7d89
diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p4 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p4
index d8e913425850..4a6c074cf4dc 100644
--- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p4
+++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext app-text/rman x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt app-text/rman x11-misc/imake
 DESCRIPTION=Digital clock for the X window system.
-EAPI=2
-HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
+EAPI=4
+HOMEPAGE=http://packages.qa.debian.org/d/dclock.html
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext app-text/rman
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-4.debian.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=acdb55cded404849040537cd3efe5b30
+_md5_=94e46e9fa0cf556d4674663c2f9fc7ac
diff --git a/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14 b/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14
index bd07a1233d5c..37eaf2592eda 100644
--- a/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14
+++ b/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
 DESCRIPTION=A flexible and configurable notification daemon
 EAPI=4
-HOMEPAGE=http://drull.org.ru/qtnotifydaemon/ http://sourceforge.net/projects/qtnotifydaemon/
+HOMEPAGE=http://sourceforge.net/projects/qtnotifydaemon/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
 SLOT=0
 SRC_URI=mirror://sourceforge/qtnotifydaemon/qtnotifydaemon_1.0.14.orig.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=3b095ba894a6c2a542f6d8f628738d8e
+_md5_=50c87d31f6e89976fb96ea4a5107adaf
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
index 18f619448ebd..d678ca2fc3c3 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/pkgconfig dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-proto/xf86vidmodeproto
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-proto/xf86vidmodeproto
 DESCRIPTION=tool that allows you to tune SiS drivers from X
-EAPI=2
-HOMEPAGE=http://www.winischhofer.net/linuxsis630.shtml
+EAPI=4
+HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-proto/xf86vidmodeproto
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=75d6612aebb240f3455181ff4474e1e2
+_md5_=901cc9d5fe4bcf69dbeb30ec073137ca
diff --git a/metadata/md5-cache/x11-misc/tinymount-0.2.4 b/metadata/md5-cache/x11-misc/tinymount-0.2.4
new file mode 100644
index 000000000000..3fcba3f2ac79
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tinymount-0.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/qt-gui:4 x11-libs/qt-dbus:4 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig
+DESCRIPTION=Simple disk mount utility
+EAPI=4
+HOMEPAGE=http://github.com/limansky/tinymount
+IUSE=debug libnotify linguas_ru
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-dbus:4 libnotify? ( x11-libs/libnotify ) sys-fs/udisks:0
+SLOT=0
+SRC_URI=mirror://github/limansky/tinymount/tinymount-0.2.4.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=4217fcd040f689b23eacd26afabea706
diff --git a/metadata/md5-cache/x11-misc/touchcal-0.50 b/metadata/md5-cache/x11-misc/touchcal-0.50
new file mode 100644
index 000000000000..1596ba1c9a9f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/touchcal-0.50
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses
+DESCRIPTION=Touchscreen calibration utility
+EAPI=4
+HOMEPAGE=http://touchcal.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=mirror://sourceforge/touchcal/touchcal-0.50.tar.gz
+_md5_=c94c2c6083e91c0d1536233b0b6d8382
diff --git a/metadata/md5-cache/x11-misc/xcb-2.4 b/metadata/md5-cache/x11-misc/xcb-2.4
index aa0acb8de3db..99d259da1847 100644
--- a/metadata/md5-cache/x11-misc/xcb-2.4
+++ b/metadata/md5-cache/x11-misc/xcb-2.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install
 DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-proto/xproto motif? ( >=x11-libs/openmotif-2.3:0 )
 DESCRIPTION=Marc Lehmann's improved X Cut Buffers
 EAPI=2
-HOMEPAGE=http://www.goof.com/pcg/marc/xcb.html
+HOMEPAGE=http://oldhome.schmorp.de/marc/xcb.html
 IUSE=motif
 KEYWORDS=alpha amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 SLOT=0
-SRC_URI=http://www.goof.com/pcg/marc/data/xcb-2.4.tar.gz
+SRC_URI=http://oldhome.schmorp.de/marc/data/xcb-2.4.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=8b36f7702dc93db48a2f71c6efb13698
+_md5_=fdf1d7afc570747aed4655837e7838d3
diff --git a/metadata/md5-cache/x11-misc/xcb-2.4-r1 b/metadata/md5-cache/x11-misc/xcb-2.4-r1
index 8118481e1e82..de273720c805 100644
--- a/metadata/md5-cache/x11-misc/xcb-2.4-r1
+++ b/metadata/md5-cache/x11-misc/xcb-2.4-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install
 DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-proto/xproto motif? ( >=x11-libs/openmotif-2.3:0 )
 DESCRIPTION=Marc Lehmann's improved X Cut Buffers
 EAPI=2
-HOMEPAGE=http://www.goof.com/pcg/marc/xcb.html
+HOMEPAGE=http://oldhome.schmorp.de/marc/xcb.html
 IUSE=motif
 KEYWORDS=alpha amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-libs/libXext
 SLOT=0
-SRC_URI=http://www.goof.com/pcg/marc/data/xcb-2.4.tar.gz
+SRC_URI=http://oldhome.schmorp.de/marc/data/xcb-2.4.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=aeeaa50e4b04eb0e64cd85e956c2730b
+_md5_=61af04b896f8c1d1c74239c374cffdc8
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r2 b/metadata/md5-cache/x11-terms/root-tail-1.2-r2
index a99194cb6612..532673ec216e 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r2
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
 DESCRIPTION=Terminal to display (multiple) log files on the root window
-HOMEPAGE=http://www.goof.com/pcg/marc/root-tail.html
+HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
 IUSE=kde debug
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
-SRC_URI=http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
+SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=34e76713654b730b3d4e806bc135b578
+_md5_=6c80bce2ea69d62c92098256e6cd64d3
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r3 b/metadata/md5-cache/x11-terms/root-tail-1.2-r3
index 49044c3cc146..283e56d82ede 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r3
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
 DESCRIPTION=Terminal to display (multiple) log files on the root window
 EAPI=2
-HOMEPAGE=http://www.goof.com/pcg/marc/root-tail.html
+HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
 IUSE=kde debug
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
-SRC_URI=http://www.goof.com/pcg/marc/data/root-tail-1.2.tar.gz
+SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2fa146e2fdab400db896575381593e1d
+_md5_=6cdf6baf4e464f1881d1339c2c51cbdf
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r200 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r200
index 9a794a9feb25..a7dc8cad7777 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r200
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r200
@@ -4,10 +4,10 @@ DESCRIPTION=A port of Xfce engine to GTK+-2.x
 EAPI=4
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-2.20:2
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xfconf	71f221eb949e06646b95347566d982df
-_md5_=018b807a2359e83dcd6b990a9c6da98a
+_md5_=9463ab7fd995191f56a6f2f9b8e32c28
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r300 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r300
index 59d3a5e25648..fed957d8d3ee 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r300
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.0-r300
@@ -4,10 +4,10 @@ DESCRIPTION=A port of Xfce engine to GTK+-3.x
 EAPI=4
 HOMEPAGE=http://www.xfce.org/projects/
 IUSE=debug
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.2:3
 SLOT=3
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xfconf	71f221eb949e06646b95347566d982df
-_md5_=4453a7bef8d6f1b9331d9aec771d7f45
+_md5_=b143ec3262c10d3fc40cc94819c4fa53
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
index 34b29659ccf4..b889e0d431f7 100644
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor x11-apps/xcursorgen
 DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.3.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=e46944236a11b4a583af2d8a35ba0052
+_md5_=d00b55db68e3d06b4177b5a36683c5ab
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fe751aff0780..83e0879282fe 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 May 2012 07:37:24 +0000
+Tue, 15 May 2012 18:07:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8b7bd7a7bf95..9abf9a7754d0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 15 07:37:22 UTC 2012
+Tue May 15 18:07:42 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3cefcbe278dd..ac7a8e8a2c74 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 May 2012 08:00:01 +0000
+Tue, 15 May 2012 18:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e3d9749afea6..c88e8bf3a4b6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1337067301 Tue May 15 07:35:01 2012 UTC
+1337105101 Tue May 15 18:05:01 2012 UTC
diff --git a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
index 0031f65c2faa..2d6bd9f1cb55 100644
--- a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-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/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild,v 1.1 2012/04/30 15:25:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild,v 1.2 2012/05/15 14:39:35 jer Exp $
 
 EAPI=4
 
@@ -40,7 +40,7 @@ src_prepare(){
 		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
 		-e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \
 		|| die "sed failed"
-	sed -i sguild \
+	sed -i server/sguild \
 		-e 's:set VERSION "SGUIL-0.6.0":set VERSION "SGUIL-0.6.0p1":' \
 		|| die "sed failed"
 }
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 8072626d132f..e51564d4c183 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,3 +1,4 @@
 DIST atheme-services-6.0.10.tar.bz2 897748 RMD160 e7e1e606cb29c426568d462f6afab4709a1c2124 SHA1 7b38b5f99cf0f2dab6c19557514cc5a6a8ca0d35 SHA256 9a2b3954316d29ae0cd546edc9c2b6169bae448f982dbd76ca3efd84c271d0c8
-DIST atheme-services-7.0.0.tar.bz2 1058631 RMD160 09ab3d5f7edcc74416e0044bda9cd5885d562011 SHA1 6ce077437396e201766b35c48d42647e728a8120 SHA256 d02d4a3a3a3fe244e4c49d68a0734ed76a6f4560545bc23f06bf696dc0b109cc
+DIST atheme-services-6.0.11.tar.bz2 859123 RMD160 c01d835e6401e97f67d7647959b59b38297e9b1f SHA1 e6cb8156583c9daa4619cfee5e5e1cd8a38b7b2d SHA256 762bc717d4710d135f8654025c34c4fc431a6a8cf7345e994fbe800fa78a9f74
 DIST atheme-services-7.0.1.tar.bz2 1052229 RMD160 e2cc66e92456daf54bdcc5288efcedebd0c3dd5f SHA1 9616a6651a06f18d2b2c85e64c85be524643a917 SHA256 bc42b736e3a90c9e07ca1b0085e1dcadf7139d74453664f55aa8d963a3f79064
+DIST atheme-services-7.0.2.tar.bz2 1050575 RMD160 28ba758ef0dd60b31fe6261eb18b9c7a2eea46f7 SHA1 4cf363a067f8d9b0b01c999127748fa3995ad037 SHA256 a5eeb853b7d6206e4a01dd52a35f14e4a255cae95aa75d66c1e0ffe70625a2e0
diff --git a/net-irc/atheme-services/atheme-services-6.0.11.ebuild b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
new file mode 100644
index 000000000000..98023fb67a85
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-6.0.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.11.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic perl-module prefix
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND="dev-libs/libmowgli:0
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.8-configure-disable.patch
+	eautoconf
+
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli || die
+
+	# Get useful information into build.log
+	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}
diff --git a/net-irc/atheme-services/atheme-services-7.0.0.ebuild b/net-irc/atheme-services/atheme-services-7.0.2.ebuild
similarity index 90%
rename from net-irc/atheme-services/atheme-services-7.0.0.ebuild
rename to net-irc/atheme-services/atheme-services-7.0.2.ebuild
index 325b91255a01..ddf9b3e20735 100644
--- a/net-irc/atheme-services/atheme-services-7.0.0.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0.ebuild,v 1.2 2012/05/03 06:27:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.2.ebuild,v 1.1 2012/05/15 08:31:15 jdhore Exp $
 
 EAPI=4
 
-inherit autotools eutils flag-o-matic perl-module
+inherit eutils flag-o-matic perl-module
 
 DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 HOMEPAGE="http://atheme.net/"
@@ -42,19 +42,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix broken version detection
-	sed -i -e 's/2.0.0-alpha1/2.0.0/' configure.ac || die
-	eautoconf
-
 	# fix docdir
 	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
 
 	# basic logging config directive fix
 	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
 
-	# Fix a bug with compilation of the perl stuff.
-	epatch "$FILESDIR"/${P}-perl-build-fix.patch
-
 	# QA against bundled libs
 	rm -rf libmowgli-2 || die
 }
diff --git a/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch b/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch
deleted file mode 100644
index 07b523e07cb8..000000000000
--- a/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 79f41f4e7647335beca977d852c6c83abebcc2bd Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: Tue, 3 Jan 2012 01:47:31 +0000
-Subject: [PATCH] Add --with-cracklib/--without-cracklib ./configure options and only pass -lcrack when compiling nickserv/cracklib module.
-
-Being able to disable cracklib at ./configure time fixes an automagic
-dependency (https://bugs.gentoo.org/397401 with original patch from
-kensington). Only linking against cracklib when necessary hopefully
-makes compilation and loading of modules slightly more efficient.
----
- configure                 |   27 ++++++++++++++++++++++++++-
- configure.ac              |   16 +++++++++++++++-
- extra.mk.in               |    1 +
- modules/nickserv/Makefile |   10 ++++++++++
- 4 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 63540aa..ee8d554 100755
-diff --git a/configure.ac b/configure.ac
-index 83c4aeb..a6d8b6e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,8 +95,22 @@ AC_SEARCH_LIBS(crypt, crypt, [POSIX_CRYPTC="posix.c"])
- AC_SUBST(POSIX_CRYPTC)
- 
- CRACKLIB_C=""
--AC_SEARCH_LIBS(FascistCheck, crack, [CRACKLIB_C="cracklib.c"])
-+CRACKLIB_LIBS=""
-+AC_ARG_WITH([cracklib],
-+	[AS_HELP_STRING([--with-cracklib], [Compile cracklib nickserv submodule for checking password strength.])],
-+	[],
-+	[with_cracklib="auto"])
-+AS_IF([test "x$with_cracklib" != "xno"],
-+	[LIBS_save="$LIBS"
-+	AC_SEARCH_LIBS([FascistCheck], [crack],
-+		[CRACKLIB_C="cracklib.c"
-+		AS_IF([test "x$ac_cv_search_FascistCheck" != "xnone required"],
-+			[CRACKLIB_LIBS="$ac_cv_search_FascistCheck"])],
-+		[AS_IF([test "x$with_cracklib" != "xauto"],
-+			[AC_MSG_ERROR([--with-cracklib was specified but cracklib could not be found.])])])
-+	LIBS="$LIBS_save"])
- AC_SUBST(CRACKLIB_C)
-+AC_SUBST([CRACKLIB_LIBS])
- 
- AC_ARG_WITH([ldap],
- 	[AS_HELP_STRING([--without-ldap],[Disable building ldap auth module.])],
-diff --git a/extra.mk.in b/extra.mk.in
-index cc6af70..2d01345 100644
---- a/extra.mk.in
-+++ b/extra.mk.in
-@@ -123,4 +123,5 @@ EGREP ?= @EGREP@
- VERSION ?= @VERSION@
- prefix ?= @prefix@
- CRACKLIB_C ?= @CRACKLIB_C@
-+CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
- CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
-diff --git a/modules/nickserv/Makefile b/modules/nickserv/Makefile
-index 060f708..d2f7c4e 100644
---- a/modules/nickserv/Makefile
-+++ b/modules/nickserv/Makefile
-@@ -68,3 +68,13 @@ BASE_SRCS =			\
- SRCS = ${BASE_SRCS} ${EXTRA_SRCS}
- 
- CPPFLAGS	+= -I../../include
-+
-+# Custom rule for cracklib.c which is the only module to ever need
-+# -lcrack.
-+cracklib$(PLUGIN_SUFFIX): cracklib.c
-+	${COMPILE_STATUS}
-+	if ${CC} -MMD -MP ${CFLAGS} ${PLUGIN_CFLAGS} ${CPPFLAGS} ${PLUGIN_LDFLAGS} ${LDFLAGS} -o $@ ${CRACKLIB_C} ${LIBS} ${CRACKLIB_LIBS}; then \
-+		${COMPILE_OK}; \
-+	else \
-+		${COMPILE_FAILED}; \
-+	fi
--- 
-1.7.3.4
-
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch b/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
deleted file mode 100644
index 196034e4ef0d..000000000000
--- a/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/scripting/perl/Makefile b/modules/scripting/perl/Makefile
-index b7e4dbd..bce7584 100644
---- a/modules/scripting/perl/Makefile
-+++ b/modules/scripting/perl/Makefile
-@@ -12,7 +12,7 @@ include ../../../buildsys.mk
- 
- plugindir = $(MODDIR)/modules/scripting
- 
--CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR='"$(plugindir)"'
-+CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR=\"$(plugindir)\"
- CFLAGS += $(PLUGIN_CFLAGS)
- LDFLAGS += $(PLUGIN_LDFLAGS) $(PERL_LIBS)
- LIBS +=	-L../../../libathemecore -lathemecore ${LDFLAGS_RPATH}
diff --git a/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild b/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
index a423a77e2721..9dc5f4164d9d 100644
--- a/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.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/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild,v 1.5 2012/05/10 06:26:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild,v 1.6 2012/05/15 12:28:34 naota Exp $
 
 EAPI=4
 
@@ -12,12 +12,12 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="static-libs"
 
 RESTRICT="test"
 
-DEPEND="sys-apps/lsb-release"
+DEPEND="kernel_linux? ( sys-apps/lsb-release )"
 RDEPEND=""
 
 src_prepare() {
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 523cf208d4a9..e2607e79370d 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -2,3 +2,4 @@ DIST bfgminer-2.3.4.tbz2 2843960 RMD160 a2f8ee3c1c71178b99d7b50cb9b83fdc5a0ada36
 DIST bfgminer-2.3.5.tbz2 4651226 RMD160 f75d1d069bf88b8b5d6cb7fce97bf24cac1f88ca SHA1 667bb6a5889697c4ca8ca10ef987e21f7a1c178f SHA256 3221ece01af059fbf6ce2d3fe33d85901ac8d9aed898fb044fe3af325fcced9c
 DIST bfgminer-2.3.6.tbz2 4651689 RMD160 7b3f8d56f7b9bc1fa19825a4c77abcbe307a74c3 SHA1 beecf2d2afc124f4bdb55619002305d48aa5177e SHA256 e55b50cc2e1e77de09a5debfdffabe05fa82307c8b93fabf914823f27e24cf78
 DIST bfgminer-2.4.0.tbz2 4652292 RMD160 059c2ec44a493d0dedf30748c0d06aaac8ee5f20 SHA1 cebb22e38833a8cbbd5b9362e329120337e2c927 SHA256 671451c3df528dd7656fbe2653b71c1b088391799bd3a5f52a193ad4debd025a
+DIST bfgminer-2.4.1.tbz2 4654229 RMD160 54cc68cd3ada8c6c9a793aa5616527402f526026 SHA1 6650301e7bb6e77174f8022646172eb3eaabff1d SHA256 7434c99033362651d56abb0315aeabb2c6a5544fa4241d82b2c64db4b9254cd4
diff --git a/net-misc/bfgminer/bfgminer-2.4.1.ebuild b/net-misc/bfgminer/bfgminer-2.4.1.ebuild
new file mode 100644
index 000000000000..959508956489
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-2.4.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.4.1.ebuild,v 1.1 2012/05/15 08:57:30 blueness Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin CPU/GPU/FPGA miner in C"
+HOMEPAGE="https://bitcointalk.org/index.php?topic=78192.0"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE="
+	|| ( bitforce cpumining icarus opencl ztex )
+	adl? ( opencl )
+	altivec? ( cpumining ppc ppc64 )
+	padlock? ( cpumining || ( amd64 x86 ) )
+	sse2? ( cpumining || ( amd64 x86 ) )
+	sse4? ( cpumining amd64 )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses
+	)
+	dev-libs/jansson
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		dev-libs/libusb:1
+	)
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	sys-apps/sed
+	adl? (
+		x11-libs/amd-adl-sdk
+	)
+	opencl? (
+		virtual/opencl
+	)
+	sse2? (
+		>=dev-lang/yasm-1.0.1
+	)
+	sse4? (
+		>=dev-lang/yasm-1.0.1
+	)
+"
+
+src_prepare() {
+	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
+	ln -s /usr/include/ADL/* ADL_SDK/
+}
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	if ! use altivec; then
+		sed -i 's/-faltivec//g' configure
+	else
+		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
+	fi
+	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
+	if use sse2; then
+		if use amd64; then
+			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
+		else
+			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
+		fi
+	fi
+	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
+	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable bitforce) \
+		$(use_enable cpumining) \
+		$(use_enable icarus) \
+		$(use_with ncurses curses) \
+		$(use_enable opencl) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
+	if use opencl; then
+		# sanitize directories
+		sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/bfgminer/opencl"'"~' config.h
+	fi
+	if use ztex; then
+		sed -i 's~bitstreams/~'"${EPREFIX}"'/usr/lib/bfgminer/ztex/~' libztex.c
+	fi
+}
+
+src_install() {
+	dobin bfgminer
+	dodoc AUTHORS NEWS README
+	if use opencl; then
+		insinto /usr/lib/bfgminer/opencl
+		doins *.cl
+	fi
+	if use ztex; then
+		insinto /usr/lib/bfgminer/ztex
+		doins bitstreams/*.bit
+	fi
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c
+	fi
+}
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 1ba0a4b8757e..458ae4168f53 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -2,3 +2,4 @@ DIST cgminer-2.3.4.tar.bz2 2702979 RMD160 d399e63f9c50d3807939a3aeee1efe20a25b02
 DIST cgminer-2.3.5.tar.bz2 4470889 RMD160 49f349ca8e506534426ed0d957b8709f3b50d272 SHA1 4496eaddc08708bbe3e2672a644c6ff0cbbf59fc SHA256 da526ee646c0142af84534ce4d1984cd45f0a62cf5f1c1832f0df771fedfdccd
 DIST cgminer-2.3.6.tar.bz2 4471825 RMD160 9496c804574d25fd3c79c313d12bd3cbfba44c1e SHA1 4b08cbc2cf5b4e3d1c89dc651e7b8aa8cb76e1d5 SHA256 792c8a2be9f6e8e6e182a6d6459a6becd5263a05e5dedc315b5665a2e0fa105c
 DIST cgminer-2.4.0.tar.bz2 4473741 RMD160 92789ad524bcd432b6e1957251f8ae93be3f78f3 SHA1 5a8acef5be358a794b42aeb139ea7a37c5ab74e5 SHA256 30a0c018094c93b1f915b67f5cad8cd935838e1ffac862aa6d05ee37f3fbb387
+DIST cgminer-2.4.1.tar.bz2 4476025 RMD160 a636e7d0a573c6d6ca4ad667f69f6df339ce81ee SHA1 80fd856484ce311916c071c647bac337395ad2b9 SHA256 41a9aebc13d55358b96bc7cb2b428edf81f61be79918022d2979dee68c71413a
diff --git a/net-misc/cgminer/cgminer-2.4.0.ebuild b/net-misc/cgminer/cgminer-2.4.0.ebuild
index 1ed515a2e593..e55f505c290e 100644
--- a/net-misc/cgminer/cgminer-2.4.0.ebuild
+++ b/net-misc/cgminer/cgminer-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.4.0.ebuild,v 1.1 2012/05/05 15:16:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.4.0.ebuild,v 1.2 2012/05/15 08:45:37 blueness Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
 HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-2.4/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/cgminer/cgminer-2.4.1.ebuild b/net-misc/cgminer/cgminer-2.4.1.ebuild
new file mode 100644
index 000000000000..32391813b85f
--- /dev/null
+++ b/net-misc/cgminer/cgminer-2.4.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.4.1.ebuild,v 1.1 2012/05/15 08:45:37 blueness Exp $
+
+EAPI="4"
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
+HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE="
+	|| ( bitforce cpumining icarus opencl ztex )
+	adl? ( opencl )
+	altivec? ( cpumining ppc ppc64 )
+	padlock? ( cpumining || ( amd64 x86 ) )
+	sse2? ( cpumining || ( amd64 x86 ) )
+	sse4? ( cpumining amd64 )
+"
+
+DEPEND="
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses
+	)
+	dev-libs/jansson
+	opencl? (
+		virtual/opencl
+	)
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		dev-libs/libusb:1
+	)
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	sys-apps/sed
+	adl? (
+		x11-libs/amd-adl-sdk
+	)
+	sse2? (
+		>=dev-lang/yasm-1.0.1
+	)
+	sse4? (
+		>=dev-lang/yasm-1.0.1
+	)
+"
+
+src_prepare() {
+	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
+	ln -s /usr/include/ADL/* ADL_SDK/
+}
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	if ! use altivec; then
+		sed -i 's/-faltivec//g' configure
+	else
+		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
+	fi
+	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
+	if use sse2; then
+		if use amd64; then
+			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
+		else
+			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
+		fi
+	fi
+	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
+	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable adl) \
+		$(use_enable bitforce) \
+		$(use_enable cpumining) \
+		$(use_enable icarus) \
+		$(use_with ncurses curses) \
+		$(use_enable opencl) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
+	if use opencl; then
+		# sanitize directories
+		sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer/opencl"'"~' config.h
+	fi
+	if use ztex; then
+		sed -i 's~bitstreams/~'"${EPREFIX}"'/usr/lib/cgminer/ztex/~' libztex.c
+	fi
+}
+
+src_install() {
+	dobin cgminer
+	dodoc AUTHORS NEWS README
+	if use opencl; then
+		insinto /usr/lib/cgminer/opencl
+		doins *.cl
+	fi
+	if use ztex; then
+		insinto /usr/lib/cgminer/ztex
+		doins bitstreams/*.bit
+	fi
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c
+	fi
+}
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index b7acd1ff8ba1..ecdbc4318d33 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -2,3 +2,4 @@ DIST tin-1.8.3.tar.bz2 1437604 RMD160 7e165eccb099cfc8aae073781a5642266321dd3e S
 DIST tin-1.9.4.tar.bz2 1526534 RMD160 6a85e47ea06f2e86f2b8f688df137432ecb7c4e9 SHA1 e1f5ff2f04923137f43119b144f8a20e733eea23 SHA256 9d56a210709f91b1faafc0c6cb564c62b9e4443fe8704aaedbdafe0895508ef7
 DIST tin-1.9.6.tar.bz2 1752467 RMD160 284fe48668dfe3e20dd69b82834405792ec50aae SHA1 a5d843ab938f6380a9d92fa95b5a2267999f958b SHA256 b4475d67e28752bc03e1a20c4040b5161cb2708d79f1f849d4dd5f1ed166a11d
 DIST tin-2.0.0.tar.bz2 1761102 RMD160 a1347953f4f8858c7c1756c41587ac7e9975e236 SHA1 7a11cc65476c9969fc7a86bea2f4041e3db504a9 SHA256 0af6ddcd4c30179ddf8704f575c6f00bbab58751bb5fd5af4d8a35b258e6bdd7
+DIST tin-2.0.1.tar.bz2 1758848 RMD160 744ef16c7ce83971213b2ae2d26fac3c48a91eaa SHA1 bf54c04c114a194d54431240f31e3c7b80b0d790 SHA256 eb4c1e46defb66f02eb64daa0929414c6363d9d4d74ec2458cfc6e781de89b1f
diff --git a/net-nntp/tin/tin-2.0.1.ebuild b/net-nntp/tin/tin-2.0.1.ebuild
new file mode 100644
index 000000000000..cd6fb738a7b5
--- /dev/null
+++ b/net-nntp/tin/tin-2.0.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-2.0.1.ebuild,v 1.1 2012/05/15 16:16:56 jer Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs versionator
+
+DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
+HOMEPAGE="http://www.tin.org/"
+SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode"
+
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/uulib
+	gpg? ( app-crypt/gnupg )
+	idn? ( net-dns/libidn )
+	mime? ( net-mail/metamail )
+	net-misc/urlview
+	nls? ( sys-devel/gettext )
+	sasl? ( virtual/gsasl )
+	socks5? ( net-proxy/dante )
+	sys-libs/ncurses[unicode?]
+	unicode? ( dev-libs/icu )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not strip
+	sed -i src/Makefile.in -e '388s|-s ||g' || die "sed src/Makefile.in failed"
+}
+
+src_configure() {
+	if use evil || use cancel-locks; then
+		sed -i -e"s/# -DEVIL_INSIDE/-DEVIL_INSIDE/" src/Makefile.in
+	fi
+
+	if use forgery
+	then
+		sed -i -e"s/^CPPFLAGS.*/& -DFORGERY/" src/Makefile.in
+	fi
+
+	local screen="ncurses"
+	use unicode && screen="ncursesw"
+
+	use etiquette || myconf="${myconf} --disable-etiquette"
+
+	tc-export CC
+
+	econf \
+		--with-pcre=/usr \
+		--enable-nntp-only \
+		--enable-prototypes \
+		--disable-echo \
+		--disable-mime-strict-charset \
+		--with-coffee  \
+		--with-screen=${screen} \
+		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		$(use_enable gpg pgp-gpg) \
+		$(use_enable nls) \
+		$(use_enable cancel-locks) \
+		$(use_with mime metamail /usr) \
+		$(use_with spell ispell /usr) \
+		$(use_with socks5 socks) $(use_with socks5) \
+		${myconf}
+}
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	default
+
+	# File collision?
+	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
+
+	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
+	use doc && dodoc doc/{*.sample,*.txt}
+
+	insinto /etc/tin
+	doins doc/tin.defaults
+}
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 1ab91a78baf7..13ab954245a5 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1 +1,2 @@
 DIST cups-pdf_2.6.1.tar.gz 33315 RMD160 ebb7ed5192ff91201e2ef9d87d8f24c1c7a393cc SHA1 6806f0004dfed5216625ab60cfe307ded23c2f6a SHA256 04e17eb563dceea048e1a435edcbcf52faa5288f85e8390cd64d702edb6745f1
+DIST cups-pdf_3.0beta1.tar.gz 38040 RMD160 5a02aab08a110954c03b2dddbde315ba17789fa0 SHA1 ab44fff6b375b56b6730f78e88d02c267ec4b3ba SHA256 d8f30740e0092e7b53cd228d9ddae8085bde744b5e63064bf79ad0c3e3ebe578
diff --git a/net-print/cups-pdf/cups-pdf-3.0_beta1.ebuild b/net-print/cups-pdf/cups-pdf-3.0_beta1.ebuild
new file mode 100644
index 000000000000..1cebfe7edf6e
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-3.0_beta1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-3.0_beta1.ebuild,v 1.2 2012/05/15 16:54:24 ssuominen Exp $
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files."
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ppds"
+
+RDEPEND="net-print/cups
+	app-text/ghostscript-gpl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-${PV/_}
+
+src_compile() {
+	pushd src >/dev/null
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
+	popd >/dev/null
+}
+
+src_install() {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	insinto /usr/share/cups/model
+	if use ppds; then
+		doins extra/CUPS-PDF_opt.ppd
+	else
+		doins extra/CUPS-PDF_noopt.ppd
+	fi
+
+	dodoc ChangeLog README
+
+	dodoc -r contrib
+}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index dc9d1f16b541..072974909874 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1 +1,2 @@
 DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443
+DIST wpa_supplicant-1.0.tar.gz 1948417 RMD160 12cb2feb513815127773cfe88197b99f8ec720fd SHA1 22ce2a70863ee47768808453066b635293804e64 SHA256 91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-dbus-path-fix.patch
new file mode 100644
index 000000000000..976d71b0ec39
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-dbus-path-fix.patch
@@ -0,0 +1,20 @@
+diff -aurp a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:00:03.048545044 +0000
++++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:01:19.759550509 +0000
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
+ SystemdService=wpa_supplicant.service
+diff -aurp a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:00:03.048545044 +0000
++++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:01:28.727551913 +0000
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
+ SystemdService=wpa_supplicant.service
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch
new file mode 100644
index 000000000000..bbff73e13d42
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch
@@ -0,0 +1,60 @@
+diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
+--- a/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:28:37.616150164 +0000
++++ b/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:30:21.904157611 +0000
+@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru
+ 	const struct wpa_dbus_property_desc *dsc;
+ 	int i = 0;
+ 
+-	if (iface == NULL)
++	if (iface == NULL || path == NULL)
+ 		return;
+ 
+ 	dbus_connection_get_object_path_data(iface->con, path,
+diff -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
+--- a/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:28:29.502149373 +0000
++++ b/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:30:48.859162441 +0000
+@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res
+ 	DBusMessage *_signal;
+ 
+ 	/* Do nothing if the control interface is not turned on */
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
+@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch
+ 	if (wpa_s->global == NULL)
+ 		return;
+ 	iface = wpa_s->global->dbus;
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	/* Only send signal if state really changed */
+@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning
+ 	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
+ 
+ 	/* Do nothing if the control interface is not turned on */
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
+@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred
+ 	if (wpa_s->global == NULL)
+ 		return;
+ 	iface = wpa_s->global->dbus;
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
+@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific
+ 	if (wpa_s->global == NULL)
+ 		return;
+ 	iface = wpa_s->global->dbus;
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch
new file mode 100644
index 000000000000..c84e51dfdecd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.0-generate-libeap-peer.patch
@@ -0,0 +1,347 @@
+diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
+--- a/src/eap_peer/eap_methods.c	2012-05-15 08:23:17.151386999 +0000
++++ b/src/eap_peer/eap_methods.c	2012-05-15 08:23:57.403389760 +0000
+@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_
+ 
+ 
+ /**
++ * eap_peer_register_methods - Register all known EAP peer methods
++ *
++ * This function is called at program start to register all compiled
++ * in EAP peer methods.
++ */
++int eap_peer_register_methods(void)
++{
++	int ret = 0;
++
++#ifdef EAP_MD5
++	if (ret == 0)
++		ret = eap_peer_md5_register();
++#endif /* EAP_MD5 */
++
++#ifdef EAP_TLS
++	if (ret == 0)
++		ret = eap_peer_tls_register();
++#endif /* EAP_TLS */
++
++#ifdef EAP_MSCHAPv2
++	if (ret == 0)
++		ret = eap_peer_mschapv2_register();
++#endif /* EAP_MSCHAPv2 */
++
++#ifdef EAP_PEAP
++	if (ret == 0)
++		ret = eap_peer_peap_register();
++#endif /* EAP_PEAP */
++
++#ifdef EAP_TTLS
++	if (ret == 0)
++		ret = eap_peer_ttls_register();
++#endif /* EAP_TTLS */
++
++#ifdef EAP_GTC
++	if (ret == 0)
++		ret = eap_peer_gtc_register();
++#endif /* EAP_GTC */
++
++#ifdef EAP_OTP
++	if (ret == 0)
++		ret = eap_peer_otp_register();
++#endif /* EAP_OTP */
++
++#ifdef EAP_SIM
++	if (ret == 0)
++		ret = eap_peer_sim_register();
++#endif /* EAP_SIM */
++
++#ifdef EAP_LEAP
++	if (ret == 0)
++		ret = eap_peer_leap_register();
++#endif /* EAP_LEAP */
++
++#ifdef EAP_PSK
++	if (ret == 0)
++		ret = eap_peer_psk_register();
++#endif /* EAP_PSK */
++
++#ifdef EAP_AKA
++	if (ret == 0)
++		ret = eap_peer_aka_register();
++#endif /* EAP_AKA */
++
++#ifdef EAP_AKA_PRIME
++	if (ret == 0)
++		ret = eap_peer_aka_prime_register();
++#endif /* EAP_AKA_PRIME */
++
++#ifdef EAP_FAST
++	if (ret == 0)
++		ret = eap_peer_fast_register();
++#endif /* EAP_FAST */
++
++#ifdef EAP_PAX
++	if (ret == 0)
++		ret = eap_peer_pax_register();
++#endif /* EAP_PAX */
++
++#ifdef EAP_SAKE
++	if (ret == 0)
++		ret = eap_peer_sake_register();
++#endif /* EAP_SAKE */
++
++#ifdef EAP_GPSK
++	if (ret == 0)
++		ret = eap_peer_gpsk_register();
++#endif /* EAP_GPSK */
++
++#ifdef EAP_WSC
++	if (ret == 0)
++		ret = eap_peer_wsc_register();
++#endif /* EAP_WSC */
++
++#ifdef EAP_IKEV2
++	if (ret == 0)
++		ret = eap_peer_ikev2_register();
++#endif /* EAP_IKEV2 */
++
++#ifdef EAP_VENDOR_TEST
++	if (ret == 0)
++		ret = eap_peer_vendor_test_register();
++#endif /* EAP_VENDOR_TEST */
++
++#ifdef EAP_TNC
++	if (ret == 0)
++		ret = eap_peer_tnc_register();
++#endif /* EAP_TNC */
++
++	return ret;
++}
++
++
++/**
+  * eap_peer_unregister_methods - Unregister EAP peer methods
+  *
+  * This function is called at program termination to unregister all EAP peer
+diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
+--- a/src/eap_peer/eap_methods.h	2012-05-15 08:23:17.151386999 +0000
++++ b/src/eap_peer/eap_methods.h	2012-05-15 08:23:57.404389735 +0000
+@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na
+ const char * eap_get_name(int vendor, EapType type);
+ size_t eap_get_names(char *buf, size_t buflen);
+ char ** eap_get_names_as_string_array(size_t *num);
++int eap_peer_register_methods(void);
+ void eap_peer_unregister_methods(void);
+ 
+ #else /* IEEE8021X_EAPOL */
+diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc
+--- a/src/eap_peer/libeap0.pc	1970-01-01 00:00:00.000000000 +0000
++++ b/src/eap_peer/libeap0.pc	2012-05-15 08:23:57.404389735 +0000
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include/eap_peer
++
++Name: libeap0
++Description: EAP Peer Library API
++Version: 0.7.2
++Libs: -L${libdir} -leap
++Cflags: -I${includedir}
+diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile
+--- a/src/eap_peer/Makefile	2012-05-15 08:23:17.152386964 +0000
++++ b/src/eap_peer/Makefile	2012-05-15 08:23:57.403389760 +0000
+@@ -1,11 +1,186 @@
+-all:
+-	@echo Nothing to be made.
++LIBEAP_NAME = libeap
++LIBEAP_CURRENT = 0
++LIBEAP_REVISION = 0
++LIBEAP_AGE = 0
++
++LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE)
++LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT)
++
++.PHONY: all clean install uninstall
++
++all: $(LIBEAP)
++
++ifndef CC
++CC=gcc
++endif
++
++ifndef CFLAGS
++CFLAGS = -MMD -O0 -Wall -g
++endif
++
++CONFIG_TLS=openssl
++
++INCLUDE_INSTALL_DIR=/usr/include/eap_peer
++
++# Got to use override all across the board, otherwise a 'make
++# CFLAGS=XX' will kill us because the command line's CFLAGS will
++# overwrite Make's and we'll loose all the infrastructure it sets.
++override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common
++
++# at least for now, need to include config_ssid.h and config_blob.h from
++# wpa_supplicant directory
++override CFLAGS += -I ../../wpa_supplicant
++
++OBJS_both += ../utils/common.o
++OBJS_both += ../utils/os_unix.o
++OBJS_both += ../utils/wpa_debug.o
++OBJS_both += ../utils/base64.o
++OBJS_both += ../utils/wpabuf.o
++OBJS_both += ../crypto/md5.o
++OBJS_both += ../crypto/sha1.o
++OBJS_both += ../crypto/sha1-tlsprf.o
++OBJS_both += ../crypto/aes-encblock.o
++OBJS_both += ../crypto/aes-wrap.o
++OBJS_both += ../crypto/aes-ctr.o
++OBJS_both += ../crypto/aes-eax.o
++OBJS_both += ../crypto/aes-omac1.o
++OBJS_both += ../crypto/ms_funcs.o
++OBJS_both += ../crypto/sha256.o
++
++
++OBJS_both += ../eap_common/eap_peap_common.o
++OBJS_both += ../eap_common/eap_psk_common.o
++OBJS_both += ../eap_common/eap_pax_common.o
++OBJS_both += ../eap_common/eap_sake_common.o
++OBJS_both += ../eap_common/eap_gpsk_common.o
++OBJS_both += ../eap_common/chap.o
++
++OBJS_peer += ../eap_peer/eap_tls.o
++OBJS_peer += ../eap_peer/eap_peap.o
++OBJS_peer += ../eap_peer/eap_ttls.o
++OBJS_peer += ../eap_peer/eap_md5.o
++OBJS_peer += ../eap_peer/eap_mschapv2.o
++OBJS_peer += ../eap_peer/mschapv2.o
++OBJS_peer += ../eap_peer/eap_otp.o
++OBJS_peer += ../eap_peer/eap_gtc.o
++OBJS_peer += ../eap_peer/eap_leap.o
++OBJS_peer += ../eap_peer/eap_psk.o
++OBJS_peer += ../eap_peer/eap_pax.o
++OBJS_peer += ../eap_peer/eap_sake.o
++OBJS_peer += ../eap_peer/eap_gpsk.o
++OBJS_peer += ../eap_peer/eap.o
++OBJS_peer += ../eap_common/eap_common.o
++OBJS_peer += ../eap_peer/eap_methods.o
++OBJS_peer += ../eap_peer/eap_tls_common.o
++
++override CFLAGS += -DEAP_TLS
++override CFLAGS += -DEAP_PEAP
++override CFLAGS += -DEAP_TTLS
++override CFLAGS += -DEAP_MD5
++override CFLAGS += -DEAP_MSCHAPv2
++override CFLAGS += -DEAP_GTC
++override CFLAGS += -DEAP_OTP
++override CFLAGS += -DEAP_LEAP
++override CFLAGS += -DEAP_PSK
++override CFLAGS += -DEAP_PAX
++override CFLAGS += -DEAP_SAKE
++override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
++override CFLAGS += -DEAP_TLS_FUNCS
++
++override CFLAGS += -DIEEE8021X_EAPOL
++
++ifeq ($(CONFIG_TLS), openssl)
++override CFLAGS += -DEAP_TLS_OPENSSL
++OBJS_both += ../crypto/tls_openssl.o
++OBJS_both += ../crypto/crypto_openssl.o
++LIBS += -lssl -lcrypto
++override CFLAGS += -DINTERNAL_SHA256
++endif
++
++ifeq ($(CONFIG_TLS), internal)
++OBJS_both += ../crypto/tls_internal.o
++OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o
++OBJS_both += ../tls/tlsv1_cred.o
++OBJS_both += ../tls/asn1.o ../../tls/x509v3.o
++OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o
++
++OBJS_peer += ../tls/tlsv1_client.o
++OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o
++override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
++
++OBJS_server += ../tls/tlsv1_server.o
++OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o
++override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
++
++override CFLAGS += -DCONFIG_TLS_INTERNAL
++override CFLAGS += -DCONFIG_CRYPTO_INTERNAL
++override CFLAGS += -DCONFIG_INTERNAL_X509
++override CFLAGS += -DINTERNAL_AES
++override CFLAGS += -DINTERNAL_SHA1
++override CFLAGS += -DINTERNAL_SHA256
++override CFLAGS += -DINTERNAL_MD5
++override CFLAGS += -DINTERNAL_MD4
++override CFLAGS += -DINTERNAL_DES
++ifdef CONFIG_INTERNAL_LIBTOMMATH
++override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
++else
++LIBS += -ltommath
++endif
++endif
++
++ifndef LDO
++LDO=$(CC)
++endif
++
++
++OBJS_lib=$(OBJS_both) $(OBJS_peer)
++
++ #$(OBJS_server)
++
++override CFLAGS  += -fPIC -DPIC
++LDFLAGS += -shared
++
++$(LIBEAP): $(OBJS_lib)
++	$(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS)
++
++
++UTIL_HEADERS = ../utils/includes.h ../utils/common.h \
++	../utils/wpabuf.h ../utils/build_config.h \
++	../utils/os.h ../utils/wpa_debug.h
++COMMON_HEADERS = ../common/defs.h 
++EAP_COMMON_HEADERS = ../eap_common/eap_defs.h 
++MAIN_HEADERS = eap.h eap_methods.h eap_config.h
++CRYPTO_HEADERS =  ../crypto/tls.h  
++
++install: 
++
++	mkdir -p $(DESTDIR)/usr/lib
++#	copy the lib file to std lib location
++	cp $(LIBEAP) $(DESTDIR)/usr/lib
++	ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so
++	ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0
++
++#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
++	mkdir -p \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common
++	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common
++	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
++	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
++
++	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
++	cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig
++
++uninstall: 
++
++	rm $(DESTDIR)/usr/lib/$(LIBEAP)
++	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
++	rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
+ 
+ clean:
+-	rm -f *~ *.o *.so *.d
++	rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib)
+ 
+-install:
+-	if ls *.so >/dev/null 2>&1; then \
+-		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
+-		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
+-	; fi
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild
similarity index 71%
rename from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild
index 1d119043663e..b0fb9ba8dcca 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r2.ebuild,v 1.7 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.1 2012/05/15 09:25:39 gurligebis Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit eutils toolchain-funcs qt4-r2
+inherit eutils toolchain-funcs qt4-r2 systemd multilib
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -12,26 +12,28 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wimax wps kernel_linux kernel_FreeBSD"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( ||
-			( >net-wireless/madwifi-ng-tools-0.9.3
-			net-wireless/madwifi-old )
-		)
-		dev-libs/libnl
+		madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 )
+		dev-libs/libnl:1.1
 	)
 	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-svg:4 )
-	readline? ( sys-libs/ncurses sys-libs/readline )
-	wimax? ( !net-wireless/libeap )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+	)
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
 	ssl? ( dev-libs/openssl )
 	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
+	!ssl? ( !gnutls? ( dev-libs/libtommath ) )
+	selinux? ( sec-policy/selinux-networkmanager )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -66,15 +68,29 @@ src_prepare() {
 		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
 		wpa_supplicant.conf || die
 
-	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
+	if use dbus; then
+		epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
+	fi
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
 
 	if use wimax; then
 		cd "${WORKDIR}/${P}"
 		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
 	fi
 
 	# bug (320097)
-	epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
+	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
+	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
+	# bug (374089)
+	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
 }
 
 src_configure() {
@@ -178,38 +194,48 @@ src_configure() {
 	# Enable mitigation against certain attacks against TKIP
 	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
 
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	#if has_version ">=dev-libs/libnl-2.0"; then
+	#	echo "CONFIG_LIBNL20=y" >> .config
+	#fi
+
 	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
 		eqmake4 wpa_gui.pro
+		popd > /dev/null
 	fi
 }
 
 src_compile() {
 	einfo "Building wpa_supplicant"
-	emake || die "emake failed"
+	emake
 
 	if use wimax; then
-		emake -C ../src/eap_peer clean || die "emake failed"
-		emake -C ../src/eap_peer || die "emake failed"
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
 	fi
 
 	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
 		einfo "Building wpa_gui"
-		emake || die "wpa_gui compilation failed"
+		emake
+		popd > /dev/null
 	fi
 }
 
 src_install() {
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
 
 	# baselayout-1 compat
 	if has_version "<sys-apps/baselayout-2.0.0"; then
 		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
 		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
+		dosym /usr/bin/wpa_cli /bin/wpa_cli
 	fi
 
 	if has_version ">=sys-apps/openrc-0.5.0"; then
@@ -221,29 +247,32 @@ src_install() {
 	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
 
 	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
+		wpa_supplicant.conf
 
-	doman doc/docbook/*.{5,8} || die "doman failed"
+	doman doc/docbook/*.{5,8}
 
 	if use qt4 ; then
 		into /usr
-		dobin wpa_gui-qt4/wpa_gui || die
-		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
 		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
 	fi
 
-	if use wimax; then
-		emake DESTDIR="${D}" -C ../src/eap_peer install || die
-	fi
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
 
 	if use dbus ; then
-		cd "${S}"/dbus
+		pushd "${S}"/dbus > /dev/null
 		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
 		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service || die
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
 		keepdir /var/run/wpa_supplicant
+		popd > /dev/null
 	fi
+
+	# systemd stuff
+	systemd_dounit "${FILESDIR}"/wpa_supplicant.service
+	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
 }
 
 pkg_postinst() {
@@ -266,4 +295,17 @@ pkg_postinst() {
 		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
 		einfo "You should re-emerge ${PN} after upgrading these packages."
 	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
 }
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 84ecf8d08bcc..c2989d208d76 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.82 2012/05/13 14:40:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.83 2012/05/15 11:28:28 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# UDisks2 untested wrt http://bugs.gentoo.org/412801
+gnome-base/gvfs udisks
 
 # Davide Pesavento <pesa@gentoo.org> (2 May 2012)
 # Requires Qt 4.8, which is not keyworded on alpha.
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 674b62e8dd0b..c0806690a033 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -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/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.207 2012/05/13 20:49:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.211 2012/05/15 14:41:46 aballier Exp $
 
 # Mask useflags that require deps with missing keywords.
 # Anyone is allowed and _very welcome_ to add masks there.
@@ -30,6 +30,9 @@ dev-db/postgresql-base ldap
 # dev-lang/php:5.3
 dev-libs/ossp-uuid php
 
+# dev-lang/php
+media-libs/libvpx doc
+
 # sys-auth/pam_krb5
 sys-auth/pambase pam_krb5
 
@@ -57,6 +60,9 @@ media-gfx/imagemagick raw
 # >=kde-base/kdelibs-4
 dev-vcs/subversion kde
 
+# >=media-libs/portaudio-19_pre
+media-libs/openal portaudio
+
 # dev-libs/cyrus-sasl
 dev-vcs/subversion sasl
 
@@ -94,6 +100,18 @@ gnome-base/gconf policykit
 
 # media-sound/pulseaudio
 media-libs/libsdl pulseaudio
+media-libs/openal pulseaudio
+media-video/ffmpeg pulseaudio
+
+# >=x11-libs/libva-0.32
+media-video/ffmpeg vaapi
+virtual/ffmpeg vaapi
+
+# >=media-libs/xvid-1.1.0
+media-video/ffmpeg xvid
+
+# media-plugins/frei0r-plugins
+media-video/ffmpeg frei0r
 
 # media-libs/nas
 media-libs/libsdl nas
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 17ee4a38b98b..20cada2d69fa 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.10 2011/12/07 19:23:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.11 2012/05/15 17:22:55 floppym Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -43,3 +43,8 @@ VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nouveau nv r128 radeon savage
 # 2006/12/22 - Danny van Dyk <kugelfang@gentoo.org>
 # Default for ALSA_CARDS USE_EXPAND variable.
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# 2012/05/15 - Mike Gilbert <floppym@gentoo.org>
+# Default PYTHON_TARGETS should include python-3 for arches where it is stable.
+# See bug 415575.
+PYTHON_TARGETS="python3_2"
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 3b68f40adf7f..9046b6de2272 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/make.defaults,v 1.4 2009/01/26 18:43:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/make.defaults,v 1.5 2012/05/15 17:27:01 floppym Exp $
 
 ARCH="hppa"
 ACCEPT_KEYWORDS="hppa"
@@ -16,3 +16,8 @@ USE="cups foomaticdb fortran gdbm gpm imlib libwww spell xml2 firefox xulrunner"
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# 2012/05/15 - Mike Gilbert <floppym@gentoo.org>
+# Default PYTHON_TARGETS should include python-3 for arches where it is stable.
+# See bug 415575.
+PYTHON_TARGETS="python3_2"
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index acec19abfc87..5ad8d5a85a86 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.76 2012/05/13 14:40:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.77 2012/05/15 11:29:37 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# UDisks2 untested wrt http://bugs.gentoo.org/412801
+gnome-base/gvfs udisks
 
 # Mike Frysinger <vapier@gentoo.org> (10 May 2012)
 # We only want java available for unstable ebuilds, but we can't do that
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index e3fd6d910685..67bdbe40a996 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/make.defaults,v 1.2 2008/04/10 19:53:17 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/make.defaults,v 1.3 2012/05/15 17:32:56 floppym Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -19,3 +19,8 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx trident voodoo"
 # 2006/12/06 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for PowerPC sound driver
 ALSA_CARDS="aoa aoa-fabric-layout aoa-onyx aoa-soundbus aoa-soundbus-i2s aoa-tas aoa-toonie powermac usb-audio via82xx"
+
+# 2012/05/15 - Mike Gilbert <floppym@gentoo.org>
+# Default PYTHON_TARGETS should include python-3 for arches where it is stable.
+# See bug 415575.
+PYTHON_TARGETS="python3_2"
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index 86d63ae19383..c2a64b0e0d20 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/make.defaults,v 1.7 2011/03/18 22:09:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/make.defaults,v 1.8 2012/05/15 17:32:56 floppym Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -31,3 +31,8 @@ CHOST_ppc="powerpc-unknown-linux-gnu"
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
+
+# 2012/05/15 - Mike Gilbert <floppym@gentoo.org>
+# Default PYTHON_TARGETS should include python-3 for arches where it is stable.
+# See bug 415575.
+PYTHON_TARGETS="python3_2"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index e7a942442dda..b620b3f71901 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.98 2012/05/13 14:40:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.99 2012/05/15 11:30:26 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# UDisks2 untested wrt http://bugs.gentoo.org/412801
+gnome-base/gvfs udisks
 
 # Pacho Ramos <pacho@gentoo.org> (07 May 2012)
 # libhid is not keyworded
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index e757056b4d06..4b8ec1d8e1e5 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.6 2010/08/23 21:16:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.7 2012/05/15 17:35:13 floppym Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -19,3 +19,8 @@ VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nouveau nv r128 radeon savage
 # 2006/12/21 - Andrej Kacian <ticho@gentoo.org>
 # Defaults for audio drivers
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# 2012/05/15 - Mike Gilbert <floppym@gentoo.org>
+# Default PYTHON_TARGETS should include python-3 for arches where it is stable.
+# See bug 415575.
+PYTHON_TARGETS="python3_2"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 9141534a2106..33f4b4a05f93 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -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/profiles/base/make.defaults,v 1.80 2012/05/04 20:43:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.81 2012/05/15 14:24:07 floppym Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -108,3 +108,7 @@ PYTHONDONTWRITEBYTECODE="1"
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
 # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
 BOOTSTRAP_USE="cxx unicode"
+
+# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
+# Default target(s) for python-distutils-ng.eclass
+PYTHON_TARGETS="python2_7"
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index dbc7ba244bcb..934ce39d0afd 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -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/profiles/default/bsd/package.use.mask,v 1.22 2012/05/12 20:28:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.23 2012/05/15 12:27:18 aballier Exp $
 
 # Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
 # No dev-util/source-highlight or media-sound/lilypond here, yet (bug #356069, bug #344289)
@@ -77,3 +77,6 @@ kde-base/solid bluetooth wicd
 
 # Needs DirectFB which is linux only
 media-libs/xine-lib fusion
+
+# needs udev
+kde-base/kdelibs udisks upower
diff --git a/profiles/package.mask b/profiles/package.mask
index a468ebe7ecb6..b7cfa3d9f9c1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13756 2012/05/15 06:50:16 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13759 2012/05/15 13:16:50 mpagano 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
@@ -31,6 +31,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Pagano <mpagano@gentoo.org> (15 May 2012)
+# Mask for testing
+>=app-portage/portpeek-2.0.24
+
 # Naohiro Aota <naota@gentoo.org> (07 May 2012)
 # Dead upstream.
 # Removal in 30 days - bug 415735
@@ -174,6 +178,9 @@ media-tv/linuxtv-dvb
 # Alistair Bush <ali_bush@gentoo.org> (10 May 2012)
 # Mask alpha version of mono for testing
 =dev-lang/mono-2.11.1
+=dev-lang/mono-tools-2.11
+=virtual/monodoc-2.11
+
 
 # Sebastian Pipping <sping@gentoo.org> (09 May 2012)
 # 0.6 introduced severe bug (0.5.2 unaffected)
@@ -434,11 +441,6 @@ sys-auth/tcb
 # Causes font corruption, bug #409593.
 =x11-libs/cairo-1.12*
 
-# Markos Chandras <hwoarang@gentoo.org> (24 Mar 2012)
-# Does not seem to work. No upstream
-# Bug #396067, removal in 60 days
-app-arch/createrepo
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (22 Mar 2012)
 # Even its author admits that it's an ugly hack. Crashes e.g.
 # firefox with kde-4.8. Unmask at your own risk.
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 214fb4fc1d2d..f1bfc566f21a 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.22 2012/04/16 08:38:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.23 2012/05/15 12:10:31 ssuominen Exp $
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit dbus dts dvd dvdr emboss encode exif fam firefox flac gdu gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev unicode usb wxwidgets X xcb x264 xml xulrunner xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit dbus dts dvd dvdr emboss encode exif fam firefox flac gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xulrunner xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 47f72fb8b62c..f7fe86f5afcd 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.18 2012/03/15 08:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.19 2012/05/15 12:10:31 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# Replaced by USE="udisks" in make.defaults. Remove this line after
+# >=gnome-base/gvfs-1.12 has stabilized.
+<gnome-base/gvfs-1.12 gdu
 
 # Jeremy Olexa <darkside@gentoo.org> (07 Oct 2011)
 # Required by mesa, ultimately by xorg-server (every desktop) bug 385843
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9cd30a8dbee7..d2b0ea5d83b4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3077,7 +3077,6 @@ media-video/ffmpeg:mmxext - Enables mmx2 support
 media-video/ffmpeg:network - Enables network streaming support
 media-video/ffmpeg:openssl - Enables dev-libs/openssl support. Adds support for encrypted network protocols (TLS/HTTPS).
 media-video/ffmpeg:pic - Force shared libraries to be built as PIC (this is slower)
-media-video/ffmpeg:qt-faststart - Build and install qt-faststart application
 media-video/ffmpeg:rtmp - Enable Real Time Messaging Protocol using librtmp
 media-video/ffmpeg:schroedinger - Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).
 media-video/ffmpeg:ssse3 - Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)
@@ -5458,7 +5457,7 @@ www-servers/uwsgi:json - Support json as a configuration file format.
 www-servers/uwsgi:nagios - Add nagios-friendly logging output (see http://projects.unbit.it/uwsgi/wiki/Nagios).
 www-servers/uwsgi:rrdtool - Enable support for writing requests data in RRD files.
 www-servers/uwsgi:rsyslog - Support direct logging to a app-admin/rsyslog socket (without going through the syslog interface).
-www-servers/uwsgi:spooler - Build a plugin which gives a spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).
+www-servers/uwsgi:spooler - Build a plugin which gives a network spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).
 www-servers/uwsgi:yaml - Support yaml as a configuration file format.
 www-servers/uwsgi:zeromq - Enable logging and deployment via ZeroMQ.
 www-servers/varnish:tools - Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c2f207350585..c014dd1391c1 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -8,3 +8,4 @@ DIST root_v5.26.00e.source.tar.gz 28922785 RMD160 692312a1984279255e32c96a0a79b9
 DIST root_v5.26.00g.source.tar.gz 29356003 RMD160 92d967cfa1859441da896bdaf58badb269b1747d SHA1 ce354c11d58beac567062c0f2036a0cfaf8936f3 SHA256 d8ae10f492239d58e49b09a6269b1fe9657d50afe3827246991df66a79e67c74
 DIST root_v5.28.00h.source.tar.gz 31654844 RMD160 b4ad8b71b833a1a1b7826b7b29c186504fb9a18c SHA1 5cd8c02ba2a1e84f11295c91b95a0f455ec016d8 SHA256 2adc46c70a01761215b5f685fb0ca4c62e03a3b53165a459ed72190627242651
 DIST root_v5.32.02.source.tar.gz 55519485 RMD160 0700dbb56adebd07c4e667fa9f78f7a75f59e511 SHA1 f0aa091d9544a0a4215eb085ffa720498ca73e54 SHA256 5f14f50e4489cd74b3c5bdfbfff8379c6aaaf83d3ace3318c62964be6fdc38a2
+DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6
diff --git a/sci-physics/root/root-5.32.03.ebuild b/sci-physics/root/root-5.32.03.ebuild
new file mode 100644
index 000000000000..898368b9390d
--- /dev/null
+++ b/sci-physics/root/root-5.32.03.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03.ebuild,v 1.1 2012/05/15 17:43:07 bicatali Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk"
+	ESVN_OPTIONS="--non-interactive --trust-server-cert"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DOC_PV=5_26
+ROOFIT_DOC_PV=2.91-33
+TMVA_DOC_PV=4.03
+PATCH_PV=5.28.00b
+PATCH_PV2=5.32.00
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="http://root.cern.ch/"
+SRC_URI="${SRC_URI}
+	doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf
+		math? (
+			ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
+			http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
+	+math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+
+CDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/cfortran-4.4-r2
+	dev-libs/libpcre
+	media-libs/freetype
+	media-libs/giflib
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg
+	virtual/shadow
+	X? (
+		media-libs/ftgl
+		media-libs/glew
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		|| (
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
+		)
+		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps )
+		qt4? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-qt3support:4
+			x11-libs/qt-svg:4
+			x11-libs/qt-webkit:4
+			x11-libs/qt-xmlpatterns:4 )
+		xft? ( x11-libs/libXft )
+		)
+	afs? ( net-fs/openafs )
+	avahi? ( net-dns/avahi )
+	clarens? ( dev-libs/xmlrpc-c[curl] )
+	emacs? ( virtual/emacs )
+	fits? ( sci-libs/cfitsio )
+	fftw? ( sci-libs/fftw:3.0 )
+	graphviz? ( media-gfx/graphviz )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	ruby? (
+			dev-lang/ruby
+			dev-ruby/rubygems )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	xrootd? ( net-libs/xrootd )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	virtual/fortran
+	${CDEPEND}
+	reflex? ( dev-cpp/gccxml )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="!X? ( !opengl !qt4 !xft )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python_pkg_setup
+	echo
+	elog "There are extra options on packages not yet in Gentoo:"
+	elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus,"
+	elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
+	elog "You can use the env variable EXTRA_ECONF variable for this."
+	elog "For example, for SRP, you would set: "
+	elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\""
+	echo
+	enewgroup rootd
+	enewuser rootd -1 -1 /var/spool/rootd rootd
+
+	if use math; then
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
+		elif use mpi; then
+			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-asneeded.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
+		"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch
+
+	# make sure we use system libs and headers
+	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
+	rm -rf graf2d/asimage/src/libAfterImage || die
+	rm -rf graf3d/ftgl/{inc,src} || die
+	rm -rf graf2d/freetype/src || die
+	rm -rf graf3d/glew/{inc,src} || die
+	rm -rf core/pcre/src || die
+	rm -rf math/unuran/src/unuran-*.tar.gz || die
+	LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
+
+	# In Gentoo, libPythia6 is called libpythia6
+	# libungif is called libgif,
+	# iodbc is in /usr/include/iodbc
+	# pg_config.h is checked instead of libpq-fe.h
+	sed -i \
+		-e 's:libPythia6:libpythia6:g' \
+		-e 's:ungif:gif:g' \
+		-e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
+		-e 's:libpq-fe.h:pg_config.h:' \
+		configure || die "adjusting configure for Gentoo failed"
+
+	# prefixify the configure script
+	sed -i \
+		-e 's:/usr:${EPREFIX}/usr:g' \
+		configure || die "prefixify configure failed"
+
+	# QTDIR only used for qt3 in gentoo, and configure looks for it.
+	unset QTDIR
+}
+
+src_configure() {
+	# the configure script is not the standard autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--etcdir="${EPREFIX}"/etc/root \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \
+		--testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \
+		--with-cc=$(tc-getCC) \
+		--with-cxx=$(tc-getCXX) \
+		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
+		--with-afs-shared=yes \
+		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
+		--disable-builtin-afterimage \
+		--disable-builtin-freetype \
+		--disable-builtin-ftgl \
+		--disable-builtin-glew \
+		--disable-builtin-pcre \
+		--disable-builtin-zlib \
+		--disable-builtin-lzma \
+		--disable-cling \
+		--enable-astiff \
+		--enable-exceptions	\
+		--enable-explicitlink \
+		--enable-gdml \
+		--enable-memstat \
+		--enable-shadowpw \
+		--enable-shared	\
+		--enable-soversion \
+		--enable-table \
+		--fail-on-missing \
+		$(use_enable X x11) \
+		$(use_enable X asimage) \
+		$(use_enable afs) \
+		$(use_enable avahi bonjour) \
+		$(use_enable clarens) \
+		$(use_enable clarens peac) \
+		$(use_enable fits fitsio) \
+		$(use_enable fftw fftw3) \
+		$(use_enable graphviz gviz) \
+		$(use_enable kerberos krb5) \
+		$(use_enable ldap) \
+		$(use_enable math gsl-shared) \
+		$(use_enable math genvector) \
+		$(use_enable math mathmore) \
+		$(use_enable math minuit2) \
+		$(use_enable math roofit) \
+		$(use_enable math tmva) \
+		$(use_enable math unuran) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable opengl) \
+		$(use_enable postgres pgsql) \
+		$(use_enable prefix rpath) \
+		$(use_enable pythia6) \
+		$(use_enable pythia8) \
+		$(use_enable python) \
+		$(use_enable qt4 qt) \
+		$(use_enable qt4 qtgsi) \
+		$(use_enable reflex cintex) \
+		$(use_enable reflex) \
+		$(use_enable ruby) \
+		$(use_enable ssl) \
+		$(use_enable xft) \
+		$(use_enable xml) \
+		$(use_enable xrootd) \
+		${EXTRA_ECONF} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
+}
+
+doc_install() {
+	cd "${S}"
+	if use doc; then
+		einfo "Installing user's guides"
+		dodoc "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf
+		use math && dodoc \
+			"${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \
+			"${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
+	fi
+
+	if use examples; then
+		# these should really be taken care of by the root make install
+		insinto /usr/share/doc/${PF}/examples/tutorials/tmva
+		doins -r tmva/test
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
+
+daemon_install() {
+	cd "${S}"
+	local daemons="rootd proofd"
+	dodir /var/spool/rootd
+	fowners rootd:rootd /var/spool/rootd
+	dodir /var/spool/rootd/{pub,tmp}
+	fperms 1777 /var/spool/rootd/{pub,tmp}
+
+	for i in ${daemons}; do
+		newinitd "${FILESDIR}"/${i}.initd ${i}
+		newconfd "${FILESDIR}"/${i}.confd ${i}
+	done
+	if use xinetd; then
+		insinto /etc/xinetd
+		doins etc/daemons/{rootd,proofd}.xinetd
+	fi
+}
+
+desktop_install() {
+	cd "${S}"
+	sed -e 's,@prefix@,/usr,' \
+		build/package/debian/root-system-bin.desktop.in > root.desktop
+	domenu root.desktop
+	doicon "${S}"/build/package/debian/root-system-bin.png
+
+	insinto /usr/share/icons/hicolor/48x48/mimetypes
+	doins build/package/debian/application-x-root.png
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doicon build/package/debian/root-system-bin.xpm
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
+	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
+	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
+	doenvd 99root
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${ED}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
+
+	doc_install
+	daemon_install
+	desktop_install
+
+	# Cleanup of files either already distributed or unused on Gentoo
+	rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die
+	rm "${ED}"usr/share/root/fonts/LICENSE || die
+	pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null
+	rm -f posix/mktypes dll_stl/setup \
+		G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die
+	rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die
+	rm -f "${ED}"/etc/root/proof/*.sample || die
+	rm -rf "${ED}"/etc/root/daemons || die
+	popd > /dev/null
+	# these should be in PATH
+	mv "${ED}"etc/root/proof/utils/pq2/pq2* \
+		"${ED}"usr/bin/ || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_optimize /usr/$(get_libdir)/root
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	use python && python_mod_cleanup /usr/$(get_libdir)/root
+}
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
index 69df451fc8e4..4cb0b5e8fe5c 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.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/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild,v 1.4 2012/04/20 17:27:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild,v 1.5 2012/05/15 11:24:51 ssuominen Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/icu
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.17.ebuild
index 3306cdfdaa53..c3bbe357cf56 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17.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/yaboot-static/yaboot-static-1.3.17.ebuild,v 1.1 2012/02/24 15:18:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.17.ebuild,v 1.2 2012/05/15 15:19:03 josejx Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://penguinppc.org/projects/yaboot/"
 SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc64"
+KEYWORDS="-* ppc64"
 IUSE="ibm"
 DEPEND="!sys-boot/yaboot
 		sys-apps/powerpc-utils"
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild
index c751a7f44dbc..8cf06536b7c1 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild,v 1.2 2012/05/02 06:20:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r1.ebuild,v 1.3 2012/05/15 15:17:48 josejx Exp $
 
 EAPI=2
 
@@ -11,7 +11,7 @@ SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
 HOMEPAGE="http://yaboot.ozlabs.org"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~ppc -ppc64"
+KEYWORDS="-* ppc -ppc64"
 IUSE="ibm"
 
 DEPEND="sys-apps/powerpc-utils
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index d45c0f0d54b7..1c86f08ff243 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,4 +1,2 @@
 DIST udisks-1.0.4.tar.gz 719889 RMD160 163a8046fcc7f30d48b8272859ab0d09a88f179a SHA1 10d2acfd6e6ff4c8d9d962af1fb1856a885e3219 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
-DIST udisks-1.94.0.tar.bz2 590375 RMD160 0e3832294b3ddb12a05ec251b66d1bb8c9088204 SHA1 6c76488776edbc5671a4b03a37ed61dac451211e SHA256 e58193c2f2f4fba030b6dd684708352b1eccf6826843e42899a26fef4249b0bc
-DIST udisks-1.96.0.tar.bz2 620783 RMD160 b4611ab36175cbe08277d5d7aacffb590cd586ae SHA1 2b13cc2d83b3f90c2a8bba2cb66246affe58273a SHA256 2818f431044905aa0301c2078adc2b734ec47697a2666985fd485b95f5460423
 DIST udisks-1.97.0.tar.bz2 634652 RMD160 6f5d6c1d76904704ac0372053b1e540c78ed699f SHA1 3b99b4203168f8035ad6a373d6eedcbf17f984ff SHA256 132e569d1b565a74c481d37ba27977c9aa9f5254baf79b2763898c9fa35a4ceb
diff --git a/sys-fs/udisks/udisks-1.0.4-r2.ebuild b/sys-fs/udisks/udisks-1.0.4-r2.ebuild
index 2f4d0f6f429f..a21a4c87658d 100644
--- a/sys-fs/udisks/udisks-1.0.4-r2.ebuild
+++ b/sys-fs/udisks/udisks-1.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r2.ebuild,v 1.4 2012/05/04 19:09:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r2.ebuild,v 1.5 2012/05/15 12:57:42 ssuominen Exp $
 
 EAPI=4
 inherit eutils bash-completion-r1 linux-info
@@ -23,6 +23,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
 	>=sys-block/parted-3
 	|| ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] )
 	>=sys-fs/lvm2-2.02.66"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/util-linux-2.20.1-r2
 	virtual/eject
diff --git a/sys-fs/udisks/udisks-1.94.0.ebuild b/sys-fs/udisks/udisks-1.94.0.ebuild
deleted file mode 100644
index 53e4c280b9a3..000000000000
--- a/sys-fs/udisks/udisks-1.94.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.94.0.ebuild,v 1.5 2012/05/13 09:49:18 ssuominen Exp $
-
-EAPI=4
-inherit eutils bash-completion-r1 linux-info systemd
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug doc +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32.0
-	>=sys-auth/polkit-0.104-r1
-	>=dev-libs/libatasmart-0.18
-	|| ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-# sys-apps/acl -> src/udiskslinuxfilesystem.c -> setfacl #412377
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/acl
-	virtual/eject"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-	doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-		)"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# CONFIG_TMPFS_POSIX_ACL required for setfacl /run usage wrt #412377
-	if use amd64 || use x86; then
-		CONFIG_CHECK="~TMPFS_POSIX_ACL ~USB_SUSPEND ~!IDE"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.x-ntfs-3g.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	dobashcomp tools/udisksctl-bash-completion.sh
-
-	find "${ED}" -type f -name '*.la' -exec rm -f {} +
-
-	keepdir /media
-	keepdir /var/lib/udisks2 #383091
-}
diff --git a/sys-fs/udisks/udisks-1.96.0.ebuild b/sys-fs/udisks/udisks-1.97.0-r1.ebuild
similarity index 89%
rename from sys-fs/udisks/udisks-1.96.0.ebuild
rename to sys-fs/udisks/udisks-1.97.0-r1.ebuild
index 9f3a94a58372..9102437a7a6c 100644
--- a/sys-fs/udisks/udisks-1.96.0.ebuild
+++ b/sys-fs/udisks/udisks-1.97.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/sys-fs/udisks/udisks-1.96.0.ebuild,v 1.3 2012/05/13 09:49:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.97.0-r1.ebuild,v 1.2 2012/05/15 12:57:42 ssuominen Exp $
 
 EAPI=4
 inherit eutils bash-completion-r1 linux-info systemd
@@ -11,7 +11,7 @@ SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="debug doc crypt +gptfdisk +introspection systemd"
 
 COMMON_DEPEND=">=dev-libs/glib-2.32
@@ -22,7 +22,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32
 	introspection? ( >=dev-libs/gobject-introspection-1.30 )
 	systemd? ( >=sys-apps/systemd-44 )"
 # gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/util-linux-2.20.1-r2
 	>=sys-block/parted-3
@@ -85,6 +85,9 @@ src_install() {
 
 	find "${ED}" -type f -name '*.la' -exec rm -f {} +
 
-	keepdir /media
 	keepdir /var/lib/udisks2 #383091
 }
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+}
diff --git a/sys-fs/udisks/udisks-1.97.0.ebuild b/sys-fs/udisks/udisks-1.97.0.ebuild
deleted file mode 100644
index ca3fce350c88..000000000000
--- a/sys-fs/udisks/udisks-1.97.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.97.0.ebuild,v 1.2 2012/05/13 09:49:18 ssuominen Exp $
-
-EAPI=4
-inherit eutils bash-completion-r1 linux-info systemd
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc crypt +gptfdisk +introspection systemd"
-
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=sys-auth/polkit-0.104-r1
-	>=dev-libs/libatasmart-0.18
-	|| ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] )
-	virtual/acl
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	systemd? ( >=sys-apps/systemd-44 )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	crypt? ( sys-fs/cryptsetup )
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig
-	doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-		)"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.x-ntfs-3g.patch
-
-	if ! use systemd; then
-		sed -i -e 's:libsystemd-login:&sSuOmInEnWaShErE:' configure || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	dobashcomp tools/udisksctl-bash-completion.sh
-
-	find "${ED}" -type f -name '*.la' -exec rm -f {} +
-
-	keepdir /media
-	keepdir /var/lib/udisks2 #383091
-}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index bf9c14e6aa54..e5b2ea712f2b 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -36,19 +36,9 @@ DIST genpatches-3.2-5.base.tar.bz2 28499 RMD160 bd19317c1d3e5c427a49a6f46a6e2063
 DIST genpatches-3.2-5.extras.tar.bz2 17208 RMD160 8324da51ce71afb0d375f34b0dd05209079bd7a3 SHA1 c2f4e029aebbc0ae82221aa2643de06a2d08cbd8 SHA256 7f60ab18e2965d024b7a36327577bcc771061f2cfac221ed475a6fd6b2ab89c7
 DIST genpatches-3.3-2.base.tar.bz2 73356 RMD160 5be0ce79f2a2e8bbc400cb97187f626c178ad1bc SHA1 59c17d98653693ab09d8244a3f563e81b941e8ef SHA256 d93d8d2072187eb4f47b548ac6f33496ba6daf5f85352bd9db0389b7eaf431d5
 DIST genpatches-3.3-2.extras.tar.bz2 17199 RMD160 684b8ee4cdfd826c5713b96c8929d3b88fe72a9d SHA1 ab2111a4ffcf5b32479895007f39c6a77fd749cc SHA256 9c8fdc2671f1a66b5e473f35e2e49febc825d7383c009a5b626f44d872130cf4
-DIST genpatches-3.3-3.base.tar.bz2 98532 RMD160 1262f2ee064270a041fed96b8e0be249b4a7e3fa SHA1 37e1bd756f38cac1d7c253cfa15e6e1acb24d805 SHA256 9282f9fbe502f8a6fe5e2bc10b179e431c8ade7205419c23babe4a1c9031b7be
-DIST genpatches-3.3-3.extras.tar.bz2 17205 RMD160 eb3141c66ffb16282c2e2ef0fb5227a13172464d SHA1 4376fe5995aaa058cdd9081c003aeef56d099b5e SHA256 9356a196eb8aa74110165bc9d04674785693393c34f4a088d60bb0091ceb1bdc
-DIST genpatches-3.3-4.base.tar.bz2 116802 RMD160 32b9f8eb85089656f6a1e3904c0e4d9a67c6ab3e SHA1 a3640ee1f0259c844f7df0996b3b676bde9026a8 SHA256 b3c879514259fac9775763fe562c4e6e1c283c50131646dc7d5c26fe15d98976
-DIST genpatches-3.3-4.extras.tar.bz2 17205 RMD160 eb3141c66ffb16282c2e2ef0fb5227a13172464d SHA1 4376fe5995aaa058cdd9081c003aeef56d099b5e SHA256 9356a196eb8aa74110165bc9d04674785693393c34f4a088d60bb0091ceb1bdc
-DIST genpatches-3.3-5.base.tar.bz2 138337 RMD160 b467091a5b1242da46280e2190aa0cb0fe0f9571 SHA1 afad24b7484163c2de116065bf4f2a97ec4e8b71 SHA256 6b9f19e91db0b2f612be6a3815be4ebcd2193ca3afefdc62de3302576838ee07
-DIST genpatches-3.3-5.extras.tar.bz2 17205 RMD160 eb3141c66ffb16282c2e2ef0fb5227a13172464d SHA1 4376fe5995aaa058cdd9081c003aeef56d099b5e SHA256 9356a196eb8aa74110165bc9d04674785693393c34f4a088d60bb0091ceb1bdc
 DIST genpatches-3.3-6.base.tar.bz2 159919 RMD160 dc0098f7bca982371293992e59dfbadfe201714c SHA1 9b60161fc26849d9c5761321402e8eabecf22df3 SHA256 4dcd1ebef4f0cd788f2db247b448657936a4ab9109843057489191ccf004e5da
 DIST genpatches-3.3-6.extras.tar.bz2 17205 RMD160 eb3141c66ffb16282c2e2ef0fb5227a13172464d SHA1 4376fe5995aaa058cdd9081c003aeef56d099b5e SHA256 9356a196eb8aa74110165bc9d04674785693393c34f4a088d60bb0091ceb1bdc
 DIST hardened-patches-2.6.32-101.extras.tar.bz2 715485 RMD160 35bb68757ace5b9f3484aed44847957055f522ce SHA1 8b39fc7a300322383b866330afc2a931601f6cdb SHA256 77cb90e2df56d632396680bcf08c8e61a78d2ad9421a30d20e9ae05b4b764a18
-DIST hardened-patches-2.6.32-102.extras.tar.bz2 730887 RMD160 4489af5599dd0808c9793be52eea3eaad2788f34 SHA1 8833620cb2ee11c233964ebe2573a0b2d8b95283 SHA256 7a981efa1f639a355b4d55fe701cfe9fb4b70b4b3980ae9d900ccf36bff3eb2e
-DIST hardened-patches-2.6.32-103.extras.tar.bz2 729592 RMD160 84702569d70d663941c672e2886fd97d40f5d6a4 SHA1 80cbcf9c69fc3a597bef17e575511c1857e40bd8 SHA256 8538ad540e2c0a3b7fcb74136b711f7b00e7411322b366d6801d68066e2f4429
-DIST hardened-patches-2.6.32-104.extras.tar.bz2 727802 RMD160 7bdf546d084767b9aade813477c274cacf9b433c SHA1 4e58a39a3fbf29f3f60d99d452d55900700594bb SHA256 3c1ea83c24fb26747847998e3c4a6bbe87e5688fb7da810aa2f5c5b33234a650
-DIST hardened-patches-2.6.32-105.extras.tar.bz2 732530 RMD160 3aae4ff98adac15da4c3ca2720025852973f17a9 SHA1 c0dab4296d4d38f73177555fa953c5d7abe8449f SHA256 6a0345f556971e83d9601c1c53ff56710b7f273551e877d0f55bcb1802031dd2
 DIST hardened-patches-2.6.32-106.extras.tar.bz2 735391 RMD160 00107a5ab1321c84a524bb7f372233123493b089 SHA1 447f7e60ef6c9ed241ad41f81bc8b69afa16d202 SHA256 0acdebfd11c765240c5b004aeb7a3866d095f0ce018fc7ed5ece99009eb328a5
 DIST hardened-patches-2.6.32-12.extras.tar.bz2 338946 RMD160 ce283b495ee2f009d36b94aca840f6519fbe9bb6 SHA1 56da715d64c6e2c50e292b19d27006d82118a337 SHA256 bfa5e7d9653b793b2bd88c40b8b52464fe39e1e098f1c5bc95d8476247fd288f
 DIST hardened-patches-2.6.32-45.extras.tar.bz2 378165 RMD160 f3a607fe2ee0afa3709524b29a2bf8cc89b82e31 SHA1 aff7340024bd53ae2237721dba1c489419da1f8f SHA256 04dd316b257644c104c7660a649abcd48a11fff59e7773988ace8e0da49b930c
@@ -64,17 +54,9 @@ DIST hardened-patches-3.1.5-1.extras.tar.bz2 514517 RMD160 f4e68b456311300765c07
 DIST hardened-patches-3.2.11-1.extras.tar.bz2 504890 RMD160 be00ee149bb33bbeeaf0c9fa67fc1449704cb4ce SHA1 58ff19b7025356eff2395a5513f06df7f5138cbe SHA256 ee4fc083bc137b76f9d017b63497732c7e6985b16eedb1b6fcad1837411e684a
 DIST hardened-patches-3.2.12-1.extras.tar.bz2 542355 RMD160 2850f14f5a0d927fa91679ba35f24cacad2a86b4 SHA1 e5fec0610fc8be7a1bdd696e9219c87ee7f03bfb SHA256 029f8ac2e79541fb881b7f0fe38bf5b1e575b14037fb8b260806660b1964085a
 DIST hardened-patches-3.2.14-2.extras.tar.bz2 542543 RMD160 a620d227a4c90afb8a44780b682379640c37b47b SHA1 7a77ab7082de85f4534061a8ab3c3c61e23eb352 SHA256 55d32402fc607adc57cc636a7a345689a3c38f2085825360b6c6dab473cd1068
-DIST hardened-patches-3.2.15-1.extras.tar.bz2 557748 RMD160 61f8e718f162d7784d7f2791140252fda2d3aa7b SHA1 4dc1f30e8c79ab6ef4bf4897e5af893f4c029061 SHA256 bd6ef904e6ce3bc735b7efe8c27c314632ccb3223cfc7505f60f3c9b4d071959
-DIST hardened-patches-3.2.16-1.extras.tar.bz2 545434 RMD160 cdb782bd9e214ee96f2da1f79dd94c9e6322fe1f SHA1 ef61d3772dc5fbec835a3e5a480fddfd98ce6bd2 SHA256 bc47746d4f9ffe1a9fffeff0359741ebf300cbb05fed4a38ce694bda31c97aa7
-DIST hardened-patches-3.2.16-2.extras.tar.bz2 545919 RMD160 5665f1e0a533ecf4875bb59a5b19b9d3d601d8c6 SHA1 2e94eadde7c40e44b85d75ab6fe728bdab5d6517 SHA256 c867441fdce83f1beb9b7c00a0e07f87f4ea8d3f0585e30acc669db0c531a084
-DIST hardened-patches-3.2.16-3.extras.tar.bz2 548778 RMD160 43a4ec89d63fdf3b0074214f4ad28d80312341ef SHA1 21c718d8715c3ddc61d1077ba0314947ee46b490 SHA256 e3a192241a26ad780378aece9594b460705f3d7976a2281db46f913512adb8b7
 DIST hardened-patches-3.2.17-1.extras.tar.bz2 598007 RMD160 4881b20ba3dfdba7349341240da8714d63433a3f SHA1 3562daf4d0b1359a8fe4d1adf773161337f62dec SHA256 4860c7b9183f5ade11961f09362776421ba3dab85286eeae02fdc2a0f61da31f
 DIST hardened-patches-3.2.2-2.extras.tar.bz2 549864 RMD160 13c1c5229cadf18c08a0836154e42b704886e4c3 SHA1 5084934b7e1b910866b3aba55372366b13df5f43 SHA256 ac5a31186deea2324442f0989bc897548d018d0fbd2fa1abcc7cd846b3271a19
 DIST hardened-patches-3.3.1-2.extras.tar.bz2 500269 RMD160 d231e4eaed49b723db2bcec445778557cb047857 SHA1 1d3266778b055f6bd6b411cc773306349b5bea20 SHA256 75ea80a16ec21285208d328468a4ed3f6e4956118e423f72dbcfd472b57da53d
-DIST hardened-patches-3.3.2-1.extras.tar.bz2 540706 RMD160 1b5f0f776e9093c2f191dfee2d40bce84b3ad2d5 SHA1 eca1e1e3ea32cfb8f91b4e03a970393b0a3c8441 SHA256 f099850b20c66660b60cabb752d87abf172d2ab036a7d269b693ce01982eea48
-DIST hardened-patches-3.3.3-1.extras.tar.bz2 540950 RMD160 01f113f5307054e55444c91cb51a63d5ad0babd6 SHA1 24879e75a1358a6ca33732ba9b4fcfa8ebfc8c08 SHA256 ae6ca31393ef9822f727b9227b5a95c2b3bd65a4cf227ba66c15f50278ab4a23
-DIST hardened-patches-3.3.4-1.extras.tar.bz2 540167 RMD160 4b34ed1cdaa6aaf9d4588a11c2c640c68167dd7b SHA1 b7fe5f3058250c2ce059c3d873ef2b4592eff042 SHA256 e8099ea1f1998c675b319106a59890839af2d99631358b864c13c5290dcae890
-DIST hardened-patches-3.3.5-1.extras.tar.bz2 570633 RMD160 a95dfd0a54e87a9fb506ed80c27e92c1f5a676b4 SHA1 c058eef7bd940740b07a8eafbd677f9d51e9c92f SHA256 934532c1a7ad3d16292c7210d995d28ea19dc233962ddd562dcee139c09839bc
 DIST hardened-patches-3.3.6-1.extras.tar.bz2 554371 RMD160 70859746c163defcdb63234a72726978a4531ec9 SHA1 2316fa6df563bac83282726222b1c136e88add4b SHA256 6b8a8395997307a040031d46ca273a81cc69118f74c8f271aa6fe280b96fe7c7
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r100.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r100.ebuild
deleted file mode 100644
index c0907dfe1c24..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r100.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r100.ebuild,v 1.1 2012/04/18 01:45:20 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-102"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level.  Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r101.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r101.ebuild
deleted file mode 100644
index 8f2b6b2088e5..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r101.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r101.ebuild,v 1.1 2012/04/24 23:51:34 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-103"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level.  Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r102.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r102.ebuild
deleted file mode 100644
index 98aea800c49f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r102.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r102.ebuild,v 1.1 2012/05/02 10:24:31 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-104"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level.  Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r103.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r103.ebuild
deleted file mode 100644
index 960e3d6ee79d..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r103.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r103.ebuild,v 1.1 2012/05/08 21:33:42 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-105"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level.  Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.15.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.15.ebuild
deleted file mode 100644
index 215d55a43e26..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.15.ebuild,v 1.1 2012/04/18 01:48:38 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="13"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.16-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.16-r1.ebuild
deleted file mode 100644
index 786b8a3286d3..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.16-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.16-r1.ebuild,v 1.1 2012/05/02 10:26:43 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.16-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.16-r2.ebuild
deleted file mode 100644
index 41cae18c51f9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.16-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.16-r2.ebuild,v 1.1 2012/05/08 21:36:19 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.16.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.16.ebuild
deleted file mode 100644
index a6e0da1e71b9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.16.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.16.ebuild,v 1.1 2012/04/24 23:54:17 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.3.2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.3.2.ebuild
deleted file mode 100644
index 3a893aa9a84e..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.3.2.ebuild,v 1.1 2012/04/18 01:51:34 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.3.3.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.3.3.ebuild
deleted file mode 100644
index d51d2ee97dce..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.3.3.ebuild,v 1.1 2012/04/24 23:56:51 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="4"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.3.4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.3.4.ebuild
deleted file mode 100644
index b4f9404b9945..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.3.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.3.4.ebuild,v 1.1 2012/05/02 10:29:55 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.3.5.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.3.5.ebuild
deleted file mode 100644
index 3e95fad45d21..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.3.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.3.5.ebuild,v 1.1 2012/05/08 21:39:00 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="1800_nohz-load-acct-fix.patch 4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}*"
-	ewarn
-}
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index e3ed9aef85a5..3da251faf8ac 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.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/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.5 2012/04/22 12:20:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.6 2012/05/15 14:42:08 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
diff --git a/virtual/monodoc/monodoc-2.11.ebuild b/virtual/monodoc/monodoc-2.11.ebuild
new file mode 100644
index 000000000000..721973b3b843
--- /dev/null
+++ b/virtual/monodoc/monodoc-2.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/monodoc/monodoc-2.11.ebuild,v 1.1 2012/05/15 09:27:46 ali_bush Exp $
+
+inherit versionator
+
+DESCRIPTION="Virtual for monodoc"
+HOMEPAGE=""
+SRC_URI=""
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND="=dev-lang/mono-$(get_version_component_range 1-2)*"
+DEPEND=""
+#To-be-finalized
+PROPERTIES="virtual"
diff --git a/www-client/chromium/chromium-19.0.1084.46.ebuild b/www-client/chromium/chromium-19.0.1084.46.ebuild
index 7101aa3d9a05..f70b62dc8aca 100644
--- a/www-client/chromium/chromium-19.0.1084.46.ebuild
+++ b/www-client/chromium/chromium-19.0.1084.46.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/chromium/chromium-19.0.1084.46.ebuild,v 1.2 2012/05/15 06:44:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-19.0.1084.46.ebuild,v 1.3 2012/05/15 16:49:02 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -18,7 +18,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
 
 RDEPEND="app-arch/bzip2
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 5bfed67a8c82..b41f4cd350e3 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,2 @@
 DIST midori-0.4.3.tar.bz2 928660 RMD160 97f7244d6c5cfc38920407440fbf7e36498b9fc4 SHA1 8e2f5630382ff2069847cf244898a8058e3a55b0 SHA256 fca4a0eab03358f20d7700069dbf2faaf8fa5c11aaad97f4208aea608f4bed9f
-DIST midori-0.4.4.tar.bz2 939294 RMD160 20dd9f0f9d540543553e2dd7dccca592b8acef4b SHA1 ead09b6ceb9cadc4c22761490cbf9914346b7ee0 SHA256 fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2
-DIST midori-0.4.5.tar.bz2 950950 RMD160 33b7269804d02f27f482a91c85ed804411e392e0 SHA1 173dd0ebe1cb8e3525c1905065db8f8c2d5fee97 SHA256 7b57cf3ebb56eef586351f2ae9f71ec9683aedff0b79a071b70b811d9876ff84
+DIST midori-0.4.6.tar.bz2 978570 RMD160 4f55a332579426c91406617d554ff59570d60f8a SHA1 68a41fef15dde865f7cf4579c0dfbd0bae0cccc5 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea
diff --git a/www-client/midori/midori-0.4.4.ebuild b/www-client/midori/midori-0.4.4.ebuild
deleted file mode 100644
index 3af9508623f6..000000000000
--- a/www-client/midori/midori-0.4.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.4.ebuild,v 1.1 2012/03/09 14:33:47 ssuominen Exp $
-
-EAPI=4
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-PV_vala_version=0.14
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="doc gnome libnotify nls +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:3 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
-	dev-util/intltool
-	gnome-base/librsvg
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -P valac-${PV_vala_version})" \
-	waf-utils_src_configure \
-		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
-		--enable-addons \
-		$(use_enable nls) \
-		--enable-gtk3
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/midori/midori-0.4.5.ebuild b/www-client/midori/midori-0.4.6.ebuild
similarity index 97%
rename from www-client/midori/midori-0.4.5.ebuild
rename to www-client/midori/midori-0.4.6.ebuild
index 84afd9d22b84..9b716c0bd440 100644
--- a/www-client/midori/midori-0.4.5.ebuild
+++ b/www-client/midori/midori-0.4.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-client/midori/midori-0.4.5.ebuild,v 1.2 2012/04/15 15:04:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6.ebuild,v 1.1 2012/05/15 14:33:23 ssuominen Exp $
 
 EAPI=4
 
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index a76e8091774f..66e7412050d0 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-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/www-client/midori/midori-9999.ebuild,v 1.41 2012/04/15 15:04:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.42 2012/05/15 15:16:48 ssuominen Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ fi
 
 inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
 
-PV_vala_version=0.14
+PV_vala_version=0.16
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 17879e900564..ea1725dd8407 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -8,6 +8,9 @@
 	<maintainer>
 		<email>sterkrig@home.se</email>
 	</maintainer>
+	<maintainer>
+		<email>ultrabug@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name='carbon'>Enable support for sending statistics to a carbon server (see http://projects.unbit.it/uwsgi/wiki/Carbon).</flag>
 		<flag name='erlang'>Let the uWSGI server as as an Erlang C-Node and exchange messages and rpc with Erlang nodes. Together with the USE=python this enables erlang support in python (see the mappings table in http://projects.unbit.it/uwsgi/wiki/ErlangIntegration).</flag>
@@ -16,7 +19,7 @@
 		<flag name='nagios'>Add nagios-friendly logging output (see http://projects.unbit.it/uwsgi/wiki/Nagios).</flag>
 		<flag name='rrdtool'>Enable support for writing requests data in RRD files.</flag>
 		<flag name='rsyslog'>Support direct logging to a <pkg>app-admin/rsyslog</pkg> socket (without going through the syslog interface).</flag>
-		<flag name='spooler'>Build a plugin which gives a spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).</flag>
+		<flag name='spooler'>Build a plugin which gives a network spooler (see http://projects.unbit.it/uwsgi/wiki/Spooler).</flag>
 		<flag name='yaml'>Support yaml as a configuration file format.</flag>
 		<flag name='zeromq'>Enable logging and deployment via ZeroMQ.</flag>
 	</use>
diff --git a/www-servers/uwsgi/uwsgi-1.2.3.ebuild b/www-servers/uwsgi/uwsgi-1.2.3.ebuild
index 91387919b83d..e9b7454b6d9b 100644
--- a/www-servers/uwsgi/uwsgi-1.2.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.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/www-servers/uwsgi/uwsgi-1.2.3.ebuild,v 1.1 2012/05/15 06:45:08 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3.ebuild,v 1.3 2012/05/15 11:32:55 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
@@ -143,7 +143,7 @@ event = auto
 timer = auto
 filemonitor = auto
 
-embed_files = 
+embed_files =
 
 embed_config =
 [python]
diff --git a/x11-apps/appres/appres-1.0.3.ebuild b/x11-apps/appres/appres-1.0.3.ebuild
index a907a31ca763..674401097de8 100644
--- a/x11-apps/appres/appres-1.0.3.ebuild
+++ b/x11-apps/appres/appres-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-1.0.3.ebuild,v 1.9 2011/02/14 23:03:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-1.0.3.ebuild,v 1.10 2012/05/15 14:22:37 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-apps/bitmap/bitmap-1.0.6.ebuild b/x11-apps/bitmap/bitmap-1.0.6.ebuild
index 3e883b1f8fb0..5489ab7801aa 100644
--- a/x11-apps/bitmap/bitmap-1.0.6.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.1 2012/03/10 00:13:10 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.2 2012/05/15 14:20:18 aballier Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/sessreg/sessreg-1.0.7.ebuild b/x11-apps/sessreg/sessreg-1.0.7.ebuild
index 3290a2332d23..1c04be20ebfa 100644
--- a/x11-apps/sessreg/sessreg-1.0.7.ebuild
+++ b/x11-apps/sessreg/sessreg-1.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-1.0.7.ebuild,v 1.8 2012/03/03 16:25:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-1.0.7.ebuild,v 1.9 2012/05/15 14:16:11 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
index 1d60fc041a59..bf77538bf957 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.1 2012/03/23 15:29:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.2 2012/05/15 14:20:24 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Controls the keyboard layout of a running X server."
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
diff --git a/x11-apps/smproxy/smproxy-1.0.5.ebuild b/x11-apps/smproxy/smproxy-1.0.5.ebuild
index 26a73bb6a381..b90f405fa6ff 100644
--- a/x11-apps/smproxy/smproxy-1.0.5.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/smproxy-1.0.5.ebuild,v 1.7 2011/10/03 17:54:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/smproxy-1.0.5.ebuild,v 1.8 2012/05/15 14:14:27 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Session Manager Proxy"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-apps/x11perf/x11perf-1.5.4.ebuild b/x11-apps/x11perf/x11perf-1.5.4.ebuild
index 37fc2f192ab3..ca6bafca4759 100644
--- a/x11-apps/x11perf/x11perf-1.5.4.ebuild
+++ b/x11-apps/x11perf/x11perf-1.5.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-1.5.4.ebuild,v 1.7 2011/10/03 17:54:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-1.5.4.ebuild,v 1.8 2012/05/15 14:16:23 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X rendering operation stress test utility"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xbacklight/xbacklight-1.1.2.ebuild b/x11-apps/xbacklight/xbacklight-1.1.2.ebuild
index c0b493afe126..dd4beca4e106 100644
--- a/x11-apps/xbacklight/xbacklight-1.1.2.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.1.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbacklight/xbacklight-1.1.2.ebuild,v 1.7 2011/03/05 17:59:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbacklight/xbacklight-1.1.2.ebuild,v 1.8 2012/05/15 14:12:26 aballier Exp $
 
 EAPI=3
 
 inherit xorg-2
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.2
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
index 46b987ed645b..8809c9b50034 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.1 2012/02/24 15:36:44 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.2 2012/05/15 14:20:25 aballier Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
index d17a2e3fc2d9..23d92bf382f8 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild,v 1.8 2012/03/03 16:26:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild,v 1.9 2012/05/15 14:20:23 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
index e5e2739f7368..8e3b09a9a539 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild,v 1.8 2011/02/14 23:40:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild,v 1.9 2012/05/15 14:20:21 aballier Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/xev-1.2.0.ebuild b/x11-apps/xev/xev-1.2.0.ebuild
index 39d155605181..bc0e843334fa 100644
--- a/x11-apps/xev/xev-1.2.0.ebuild
+++ b/x11-apps/xev/xev-1.2.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/x11-apps/xev/xev-1.2.0.ebuild,v 1.3 2012/03/18 03:57:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-1.2.0.ebuild,v 1.4 2012/05/15 14:20:16 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="print contents of X events"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-interix ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index fe1f3579a0dd..5a33880eee36 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.3.ebuild,v 1.9 2011/02/14 23:41:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.3.ebuild,v 1.10 2012/05/15 14:22:59 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="test program for the XFree86-DGA extension"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
index 7f2d0c7b564e..c70abe25c73a 100644
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.1 2012/03/23 15:34:27 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.2 2012/05/15 14:17:22 aballier Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="Alter a monitor's gamma correction through the X server"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xinput/xinput-1.5.4.ebuild b/x11-apps/xinput/xinput-1.5.4.ebuild
index 76c2ee68b1c1..1193bbf56f8d 100644
--- a/x11-apps/xinput/xinput-1.5.4.ebuild
+++ b/x11-apps/xinput/xinput-1.5.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.4.ebuild,v 1.1 2012/01/01 14:27:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.4.ebuild,v 1.2 2012/05/15 14:14:47 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Utility to set XInput device parameters"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
index 3a9879590cab..64aa4814773f 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.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/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.1 2012/03/23 15:34:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.2 2012/05/15 14:17:20 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="XKB event daemon"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkbutils/xkbutils-1.0.3.ebuild b/x11-apps/xkbutils/xkbutils-1.0.3.ebuild
index f17649e6174e..b9df41bc8204 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.3.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-1.0.3.ebuild,v 1.9 2011/02/14 23:41:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-1.0.3.ebuild,v 1.10 2012/05/15 14:13:22 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbutils application"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/xkill-1.0.3.ebuild b/x11-apps/xkill/xkill-1.0.3.ebuild
index 7f7163ebf567..0b43091e9c8a 100644
--- a/x11-apps/xkill/xkill-1.0.3.ebuild
+++ b/x11-apps/xkill/xkill-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-1.0.3.ebuild,v 1.8 2011/02/14 23:28:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-1.0.3.ebuild,v 1.9 2012/05/15 14:20:25 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
index 571037fe3b89..a75193a9facd 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.1 2012/04/04 12:53:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.2 2012/05/15 14:23:01 aballier Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="list interned atoms defined on server"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb"
diff --git a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
index 0eadcf92b336..5d3f83b918be 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.2.ebuild,v 1.8 2011/08/20 15:50:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.2.ebuild,v 1.9 2012/05/15 14:20:40 aballier Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org xlsclients application"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
index 0d1b2e605248..8447e33fe67b 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.1 2012/04/26 16:41:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.2 2012/05/15 14:21:03 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
index fc73213d42e7..5d447adc7799 100644
--- a/x11-apps/xpr/xpr-1.0.4.ebuild
+++ b/x11-apps/xpr/xpr-1.0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.1 2012/04/04 12:53:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.2 2012/05/15 14:18:20 aballier Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org xpr application"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xrandr/xrandr-1.3.5.ebuild b/x11-apps/xrandr/xrandr-1.3.5.ebuild
index bcaa80fcff23..1b4e25be6fa7 100644
--- a/x11-apps/xrandr/xrandr-1.3.5.ebuild
+++ b/x11-apps/xrandr/xrandr-1.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.5.ebuild,v 1.7 2011/10/03 17:58:09 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.5.ebuild,v 1.8 2012/05/15 14:17:47 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.3
diff --git a/x11-apps/xrefresh/xrefresh-1.0.4.ebuild b/x11-apps/xrefresh/xrefresh-1.0.4.ebuild
index 1a26f7d1fd12..59afce5e9433 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.4.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/xrefresh-1.0.4.ebuild,v 1.8 2011/02/14 18:55:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/xrefresh-1.0.4.ebuild,v 1.9 2012/05/15 14:19:50 aballier Exp $
 
 EAPI=3
 
 inherit xorg-2
 
 DESCRIPTION="refresh all or part of an X screen"
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xsetroot/xsetroot-1.1.0.ebuild b/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
index 6cd82aa41f0b..15591bb9797a 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/xsetroot-1.1.0.ebuild,v 1.9 2011/02/14 23:41:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/xsetroot-1.1.0.ebuild,v 1.10 2012/05/15 14:23:20 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
diff --git a/x11-apps/xvinfo/xvinfo-1.1.1.ebuild b/x11-apps/xvinfo/xvinfo-1.1.1.ebuild
index 9c1796ca1c7c..25116b0e25ee 100644
--- a/x11-apps/xvinfo/xvinfo-1.1.1.ebuild
+++ b/x11-apps/xvinfo/xvinfo-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/xvinfo-1.1.1.ebuild,v 1.7 2011/04/16 17:58:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/xvinfo-1.1.1.ebuild,v 1.8 2012/05/15 14:13:16 aballier Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Print out X-Video extension adaptor information"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libXv
diff --git a/x11-apps/xwd/xwd-1.0.5.ebuild b/x11-apps/xwd/xwd-1.0.5.ebuild
index 0ec2baabad75..7ddf9d51c30e 100644
--- a/x11-apps/xwd/xwd-1.0.5.ebuild
+++ b/x11-apps/xwd/xwd-1.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/x11-apps/xwd/xwd-1.0.5.ebuild,v 1.3 2012/03/18 03:58:50 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-1.0.5.ebuild,v 1.4 2012/05/15 14:18:18 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 # libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
index d911f67d3ac3..8b8e09dbcce8 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.2.ebuild,v 1.8 2011/10/03 17:59:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.2.ebuild,v 1.9 2012/05/15 14:17:49 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="window information utility for X"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
diff --git a/x11-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
index e279338919cc..9c80d31abaef 100644
--- a/x11-apps/xwud/xwud-1.0.4.ebuild
+++ b/x11-apps/xwud/xwud-1.0.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/x11-apps/xwud/xwud-1.0.4.ebuild,v 1.1 2012/04/04 12:53:51 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-1.0.4.ebuild,v 1.2 2012/05/15 14:14:36 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="image displayer for X"
 
-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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
index d3988ebda8f8..ca17d29c7c25 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r2.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-base/xorg-x11/xorg-x11-7.4-r2.ebuild,v 1.1 2012/04/22 07:34:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild,v 1.2 2012/05/15 14:24:01 aballier Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://xorg.freedesktop.org"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 # Server
diff --git a/x11-libs/libfm/libfm-0.1.12.ebuild b/x11-libs/libfm/libfm-0.1.12.ebuild
index cdd00d6737bd..d66a4a9dbfbf 100644
--- a/x11-libs/libfm/libfm-0.1.12.ebuild
+++ b/x11-libs/libfm/libfm-0.1.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/x11-libs/libfm/libfm-0.1.12.ebuild,v 1.10 2012/05/05 03:52:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.12.ebuild,v 1.11 2012/05/15 15:41:35 ssuominen Exp $
 
 EAPI="2"
 inherit eutils
@@ -18,7 +18,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.16:2
 	>=lxde-base/menu-cache-0.3.2"
 RDEPEND="${COMMON_DEPEND}
-	udev? ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] )"
+	udev? ( || ( >=gnome-base/gvfs-1.6.4-r2[gdu,udev] >=gnome-base/gvfs-1.6.4-r2[udisks,udev] ) )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild b/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
index f1b4440e69ae..7b6df04428c3 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.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/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild,v 1.4 2012/05/12 09:42:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild,v 1.5 2012/05/15 15:13:16 pesa Exp $
 
 EAPI=4
 
@@ -12,13 +12,13 @@ KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
 
 DEPEND="
+	~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=]
 	~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
 	~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
 	~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
 	~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
 	~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
 	~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
-	aqua? ( ~x11-libs/qt-assistant-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
 	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
 	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
 	kde? ( media-libs/phonon[aqua=] )
diff --git a/x11-misc/dclock/dclock-2.2.2_p4.ebuild b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
index 9eb0e3dd35b2..c5a5086c4151 100644
--- a/x11-misc/dclock/dclock-2.2.2_p4.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
@@ -1,13 +1,12 @@
-# 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/x11-misc/dclock/dclock-2.2.2_p4.ebuild,v 1.2 2010/09/16 23:18:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dclock/dclock-2.2.2_p4.ebuild,v 1.4 2012/05/15 15:26:39 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Digital clock for the X window system."
-HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+HOMEPAGE="http://packages.qa.debian.org/d/dclock.html"
 SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
 		mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.gz"
 
@@ -17,37 +16,38 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXt
 	x11-libs/libXext
-	app-text/rman"
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
+	app-text/rman
 	x11-misc/imake"
 
-S="${WORKDIR}/${P/_p*/}"
+S=${WORKDIR}/${P/_p*/}
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches/
+	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
 	epatch "${FILESDIR}"/${P}-include.patch
 }
 
 src_configure() {
-	xmkmf || die "xmkmf"
+	xmkmf || die
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "emake"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
+	emake DESTDIR="${D}" install{,.man}
+
 	insinto /usr/share/sounds
-	doins sounds/* || die
+	doins sounds/*
+
 	insinto /usr/share/X11/app-defaults
-	newins Dclock.ad DClock || die
+	newins Dclock.ad DClock
+
 	dodoc README TODO
 }
diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
index fe7c4331b8b1..2fbdd884fafb 100644
--- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
+++ b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
@@ -1,5 +1,5 @@
---- dclock.c.orig	2008-07-08 05:35:18.000000000 +0200
-+++ dclock.c	2010-09-17 00:40:05.000000000 +0200
+--- dclock.c
++++ dclock.c
 @@ -7,6 +7,7 @@
   * manager: *Dclock.seconds: on
   */
diff --git a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
index 7b654b7c0289..0e7c7b2dde33 100644
--- a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
+++ b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild,v 1.2 2012/01/30 12:31:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild,v 1.3 2012/05/15 17:31:17 ssuominen Exp $
 
 EAPI=4
 inherit qt4-r2
 
 DESCRIPTION="A flexible and configurable notification daemon"
-HOMEPAGE="http://drull.org.ru/qtnotifydaemon/ http://sourceforge.net/projects/qtnotifydaemon/"
+HOMEPAGE="http://sourceforge.net/projects/qtnotifydaemon/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
index 8fdd98d264f8..4e3eb3782a38 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild,v 1.4 2012/05/05 04:53:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild,v 1.5 2012/05/15 16:10:36 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils
 
 DESCRIPTION="tool that allows you to tune SiS drivers from X"
-HOMEPAGE="http://www.winischhofer.net/linuxsis630.shtml"
+HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl"
 SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,17 +18,14 @@ RDEPEND="dev-libs/glib:2
 	 x11-libs/gtk+:2
 	 x11-libs/libXrender
 	 x11-libs/libXv
-	 x11-libs/libXxf86vm
-	 x11-proto/xf86vidmodeproto"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+	 x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-xv.patch
-	sed -i 's,/X11R6,,g' configure || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	sed -i -e 's,/X11R6,,g' configure || die
 }
diff --git a/x11-misc/tinymount/Manifest b/x11-misc/tinymount/Manifest
new file mode 100644
index 000000000000..dc23c9b65b7b
--- /dev/null
+++ b/x11-misc/tinymount/Manifest
@@ -0,0 +1 @@
+DIST tinymount-0.2.4.tar.bz2 23617 RMD160 6efeae36ea577f27d78400b5f73a50e1cf8d7c1e SHA1 54ad302194715cdce5ef0d7c7685624b11530aa4 SHA256 d0b3f7855899aa30e260e81f617e366c23ba182e5673a2d364baa2c1c976e9e0
diff --git a/x11-misc/tinymount/metadata.xml b/x11-misc/tinymount/metadata.xml
new file mode 100644
index 000000000000..1a942032b3eb
--- /dev/null
+++ b/x11-misc/tinymount/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<herd>desktop-misc</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>limanski@narod.ru</email>
+		<name>Mike Limansky</name>
+		<description>Both upstream and ebuild author</description>
+	</maintainer>
+	<maintainer>
+		<email>ssuominen@gentoo.org</email>
+		<name>Samuli Suominen</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/tinymount/tinymount-0.2.4.ebuild b/x11-misc/tinymount/tinymount-0.2.4.ebuild
new file mode 100644
index 000000000000..98e98db48fc9
--- /dev/null
+++ b/x11-misc/tinymount/tinymount-0.2.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tinymount/tinymount-0.2.4.ebuild,v 1.2 2012/05/15 11:37:37 ssuominen Exp $
+
+EAPI=4
+
+unset _live_inherits
+
+LANGS="ru"
+
+if [[ ${PV} == *9999* ]]; then
+	_live_inherits="git-2"
+	EGIT_REPO_URI="git://github.com/limansky/${PN}.git"
+else
+	SRC_URI="mirror://github/limansky/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit qt4-r2 ${_live_inherits}
+
+DESCRIPTION="Simple disk mount utility"
+HOMEPAGE="http://github.com/limansky/tinymount"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug libnotify"
+
+COMMON_DEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-dbus:4
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	sys-fs/udisks:0"
+
+src_configure() {
+	local params="PREFIX=/usr"
+	use libnotify && params="${params} CONFIG+=with_libnotify"
+	eqmake4 ${params}
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	local lang
+	for lang in ${LANGS}; do
+		if ! has ${lang} ${LINGUAS}; then
+			rm "${D}"/usr/share/${PN}/${PN}_${lang}.qm || die
+		fi
+	done
+
+	dodoc ChangeLog README.md
+}
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index 381675149288..486cd05c0cec 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,2 +1,3 @@
 DIST touchcal-0.31.tar.gz 85201 RMD160 6e49be8a16d96ab0fe4dcc9df5c69d9ec53c245e SHA1 fb71f685d037b9946702542326c85d16dfd4d5af SHA256 10f639c7a4f806eb793b219e0420c85f2c423033097ce59b0c3e1aa9dbce221f
 DIST touchcal-0.40.tar.gz 88004 RMD160 8f4ece68aa485664657a1586c526c0f732ff7fa8 SHA1 2c9638e7a73d153d0e4c5569a3e18241de4900bb SHA256 f95af1c868862c267774333d2e7fa1ef3b285ef220da5d80773bcd02b0a0a147
+DIST touchcal-0.50.tar.gz 94641 RMD160 02f76284e92ca5cf9b0a78b46027aa78d53d09a3 SHA1 3eb2a6272ade4bc4f519893c3247d94bfb16db1b SHA256 f76d60f14fa24834347c3b1f5ae9f9976baa48ee0408f246ff0e18bb73df34da
diff --git a/x11-misc/touchcal/touchcal-0.50.ebuild b/x11-misc/touchcal/touchcal-0.50.ebuild
new file mode 100644
index 000000000000..f9697e47e1d1
--- /dev/null
+++ b/x11-misc/touchcal/touchcal-0.50.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.50.ebuild,v 1.1 2012/05/15 16:04:10 kensington Exp $
+
+EAPI="4"
+
+DESCRIPTION="Touchscreen calibration utility"
+HOMEPAGE="http://touchcal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index 827c5e568aba..a8d77f9cc532 100644
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4-r1.ebuild,v 1.5 2012/02/19 14:13:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4-r1.ebuild,v 1.6 2012/05/15 15:32:37 hasufell Exp $
 
 EAPI=2
 
 inherit toolchain-funcs
 
 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
-HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
-SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
+HOMEPAGE="http://oldhome.schmorp.de/marc/xcb.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-misc/xcb/xcb-2.4.ebuild b/x11-misc/xcb/xcb-2.4.ebuild
index 07a6e1c9b04a..30b7d13c814f 100644
--- a/x11-misc/xcb/xcb-2.4.ebuild
+++ b/x11-misc/xcb/xcb-2.4.ebuild
@@ -1,13 +1,13 @@
-# 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/x11-misc/xcb/xcb-2.4.ebuild,v 1.13 2010/10/10 21:06:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.14 2012/05/15 15:32:37 hasufell Exp $
 
 EAPI=2
 inherit toolchain-funcs
 
 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
-HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
-SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
+HOMEPAGE="http://oldhome.schmorp.de/marc/xcb.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-terms/root-tail/root-tail-1.2-r2.ebuild b/x11-terms/root-tail/root-tail-1.2-r2.ebuild
index 9071d83f8a59..1447198b6dcc 100644
--- a/x11-terms/root-tail/root-tail-1.2-r2.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r2.ebuild,v 1.14 2012/03/18 18:15:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r2.ebuild,v 1.15 2012/05/15 15:36:23 hasufell Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Terminal to display (multiple) log files on the root window"
-HOMEPAGE="http://www.goof.com/pcg/marc/root-tail.html"
-SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
+HOMEPAGE="http://oldhome.schmorp.de/marc/root-tail.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/root-tail/root-tail-1.2-r3.ebuild b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
index f72c46ab277c..b25e67b8e489 100644
--- a/x11-terms/root-tail/root-tail-1.2-r3.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r3.ebuild,v 1.7 2012/03/18 18:15:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r3.ebuild,v 1.8 2012/05/15 15:36:23 hasufell Exp $
 
 EAPI="2"
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Terminal to display (multiple) log files on the root window"
-HOMEPAGE="http://www.goof.com/pcg/marc/root-tail.html"
-SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
+HOMEPAGE="http://oldhome.schmorp.de/marc/root-tail.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild
index a36eea0619ef..cc91f131e464 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild,v 1.3 2012/05/05 04:10:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r200.ebuild,v 1.5 2012/05/15 14:41:51 ssuominen Exp $
 
 EAPI=4
 MY_PN=gtk-xfce-engine
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.24
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild
index b1abb87cd452..f48bcde99fe3 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild,v 1.4 2012/05/05 04:10:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.0-r300.ebuild,v 1.5 2012/05/15 14:40:10 ssuominen Exp $
 
 EAPI=4
 MY_PN=gtk-xfce-engine
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${MY_PN}/${PV%.*}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.24
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild
index b997755c2451..daaf01cef2fb 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild,v 1.10 2011/03/19 02:08:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/xcursor-themes/xcursor-themes-1.0.3.ebuild,v 1.11 2012/05/15 14:19:15 aballier Exp $
 
 EAPI=3
 
@@ -9,7 +9,7 @@ XORG_MODULE=data/
 inherit xorg-2
 
 DESCRIPTION="X.Org cursor themes: whiteglass, redglass and handhelds"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="